优化代码

java110-core/src/main/java/com/java110/core/base/smo/front/BaseFrontServiceSMO.java

@@ -41,150 +41,7 @@ public class BaseFrontServiceSMO extends BaseServiceSMO {
     private RestTemplate restTemplate;
 
 
-    /**
-     * 查询
-     *
-     * @param pd          页面对象
-     * @param param       传入对象
-     * @param serviceCode 服务编码
-     * @param t           返回类
-     * @param <T>
-     * @return
-     */
-    protected <T> T getForApi(IPageData pd, T param, String serviceCode, Class<T> t) {
 
-        List<T> list = getForApis(pd, param, serviceCode, t);
-        if (list != null && list.size() > 0) {
-            return list.get(0);
-        }
-        return null;
-    }
-
-    /**
-     * 查询
-     *
-     * @param pd          页面对象
-     * @param param       传入对象
-     * @param serviceCode 服务编码
-     * @param t           返回类
-     * @param <T>
-     * @return
-     */
-    protected <T> T postForApi(IPageData pd, T param, String serviceCode, Class<T> t) {
-        List<T> ts = postForApis(pd, param, serviceCode, t);
-
-        if (ts == null || ts.size() < 1) {
-            return null;
-        }
-
-        return ts.get(0);
-    }
-
-    /**
-     * 查询
-     *
-     * @param pd          页面对象
-     * @param param       传入对象
-     * @param serviceCode 服务编码
-     * @param t           返回类
-     * @param <T>
-     * @return
-     */
-    protected <T> List<T> postForApis(IPageData pd, T param, String serviceCode, Class<T> t) {
-
-        String url = URL_API + serviceCode;
-
-
-        ResponseEntity<String> responseEntity = callCenterService(restTemplate, pd, JSONObject.toJSONString(param), url, HttpMethod.POST);
-
-        if (responseEntity.getStatusCode() != HttpStatus.OK) {
-            throw new SMOException("调用" + serviceCode + "失败，" + responseEntity.getBody());
-        }
-
-        JSONObject resultVo = JSONObject.parseObject(responseEntity.getBody());
-
-        if (ResultVo.CODE_MACHINE_OK != resultVo.getInteger("code")) {
-            throw new SMOException(resultVo.getString("msg"));
-        }
-
-        Object bObj = resultVo.get("data");
-        JSONArray datas = null;
-        if (bObj instanceof JSONObject) {
-            datas = new JSONArray();
-            datas.add(bObj);
-        } else {
-            datas = (JSONArray) bObj;
-        }
-        String jsonStr = JSONObject.toJSONString(datas);
-
-        List<T> list = JSONObject.parseArray(jsonStr, t);
-        return list;
-    }
-
-    /**
-     * 查询
-     *
-     * @param pd          页面对象
-     * @param param       传入对象
-     * @param serviceCode 服务编码
-     * @param t           返回类
-     * @param <T>
-     * @return
-     */
-    protected <T> List<T> getForApis(IPageData pd, T param, String serviceCode, Class<T> t) {
-
-        String url = URL_API + serviceCode;
-        if (param != null) {
-            url += mapToUrlParam(BeanConvertUtil.beanCovertMap(param));
-        }
-
-        ResponseEntity<String> responseEntity = callCenterService(restTemplate, pd, "", url, HttpMethod.GET);
-
-        if (responseEntity.getStatusCode() != HttpStatus.OK) {
-            throw new SMOException("调用" + serviceCode + "失败，" + responseEntity.getBody());
-        }
-
-        JSONObject resultVo = JSONObject.parseObject(responseEntity.getBody());
-
-        if (!"0".equals(resultVo.getString("code"))) {
-            throw new SMOException(resultVo.getString("msg"));
-        }
-
-        Object bObj = resultVo.get("data");
-        JSONArray datas = null;
-        if (bObj instanceof JSONObject) {
-            datas = new JSONArray();
-            datas.add(bObj);
-        } else {
-            datas = (JSONArray) bObj;
-        }
-        String jsonStr = JSONObject.toJSONString(datas);
-
-        List<T> list = JSONObject.parseArray(jsonStr, t);
-        return list;
-    }
-
-    protected ResponseEntity<String> callCenterService(RestTemplate restTemplate, IPageData pd, String param, String url, HttpMethod httpMethod) {
-        ResponseEntity<String> responseEntity = null;
-        HttpHeaders header = new HttpHeaders();
-        header.add(CommonConstant.HTTP_APP_ID.toLowerCase(), pd.getAppId());
-        header.add(CommonConstant.HTTP_USER_ID.toLowerCase(), StringUtil.isEmpty(pd.getUserId()) ? CommonConstant.ORDER_DEFAULT_USER_ID : pd.getUserId());
-        header.add(CommonConstant.HTTP_TRANSACTION_ID.toLowerCase(), pd.getTransactionId());
-        header.add(CommonConstant.HTTP_REQ_TIME.toLowerCase(), pd.getRequestTime());
-        header.add(CommonConstant.HTTP_SIGN.toLowerCase(), "");
-        HttpEntity<String> httpEntity = new HttpEntity<String>(param, header);
-        //logger.debug("请求中心服务信息，{}", httpEntity);
-        try {
-            responseEntity = restTemplate.exchange(url, httpMethod, httpEntity, String.class);
-        } catch (HttpStatusCodeException e) { //这里spring 框架 在4XX 或 5XX 时抛出 HttpServerErrorException 异常，需要重新封装一下
-            responseEntity = new ResponseEntity<String>(e.getResponseBodyAsString(), e.getStatusCode());
-        } catch (Exception e) {
-            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
-        } finally {
-            logger.debug("请求地址为,{} 请求中心服务信息，{},中心服务返回信息，{}", url, httpEntity, responseEntity);
-        }
-        return responseEntity;
-    }
 
 
 }

java110-core/src/main/java/com/java110/core/factory/TencentSendMessageFactory.java

@@ -1,17 +1,8 @@
 package com.java110.core.factory;
 
 import com.alibaba.fastjson.JSONObject;
-import com.aliyuncs.CommonRequest;
-import com.aliyuncs.CommonResponse;
-import com.aliyuncs.DefaultAcsClient;
-import com.aliyuncs.IAcsClient;
-import com.aliyuncs.exceptions.ClientException;
-import com.aliyuncs.exceptions.ServerException;
-import com.aliyuncs.http.MethodType;
-import com.aliyuncs.profile.DefaultProfile;
 import com.java110.dto.smsConfig.SmsConfigDto;
 import com.java110.utils.cache.MappingCache;
-import com.java110.utils.factory.ApplicationContextFactory;
 import com.java110.vo.ResultVo;
 import com.tencentcloudapi.common.Credential;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;
@@ -21,9 +12,6 @@ import com.tencentcloudapi.sms.v20190711.models.SendSmsRequest;
 import com.tencentcloudapi.sms.v20190711.models.SendSmsResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.client.RestTemplate;
 
 import java.util.Random;
 /*
@@ -70,7 +58,8 @@ public class TencentSendMessageFactory {
         Random random = new Random();
         String result = "";
         for (int i = 0; i < limit; i++) {
-            result += (random.nextInt(9) + 1);;
+            result += (random.nextInt(9) + 1);
+            ;
         }
         return result;
     }
@@ -102,7 +91,7 @@ public class TencentSendMessageFactory {
             logger.error("发送短信失败", e);
         }
 
-        logger.debug("腾讯短信验证码发送，请求报文" + JSONObject.toJSONString(sendSmsRequest) + ",返回日志" + (sendSmsResponse != null ? sendSmsResponse.toString() : ""));
+        logger.debug("腾讯短信验证码发送，请求报文" + JSONObject.toJSONString(sendSmsRequest) + ",返回日志" + (sendSmsResponse != null ? JSONObject.toJSONString(sendSmsResponse) : ""));
 
 
     }
@@ -120,7 +109,7 @@ public class TencentSendMessageFactory {
         String[] phones = {"+86" + tel};  //发送短信的目标手机号，可填多个。
         sendSmsRequest.setPhoneNumberSet(phones);
         sendSmsRequest.setTemplateID(smsConfigDto.getTemplateCode());  //模版id,见《创建短信签名和模版》小节
-        String[] templateParam = (String[])param;//模版参数，从前往后对应的是模版的{1}、{2}等,见《创建短信签名和模版》小节
+        String[] templateParam = (String[]) param;//模版参数，从前往后对应的是模版的{1}、{2}等,见《创建短信签名和模版》小节
         sendSmsRequest.setTemplateParamSet(templateParam);
         sendSmsRequest.setSign(smsConfigDto.getSignName()); //签名内容，不是填签名id,见《创建短信签名和模版》小节
         SendSmsResponse sendSmsResponse = null;
@@ -132,7 +121,7 @@ public class TencentSendMessageFactory {
 
         logger.debug("腾讯短信验证码发送，请求报文" + JSONObject.toJSONString(sendSmsRequest) + ",返回日志" + (sendSmsResponse != null ? sendSmsResponse.toString() : ""));
 
-        return new ResultVo(ResultVo.CODE_OK,ResultVo.MSG_OK);
+        return new ResultVo(ResultVo.CODE_OK, ResultVo.MSG_OK);
 
     }
 

service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java

@@ -14,17 +14,12 @@ import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.ServiceCodeConstant;
 import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.exception.SMOException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.DateUtil;
-import com.java110.utils.util.StringUtil;
-import com.java110.utils.util.UrlParamToJsonUtil;
+import com.java110.utils.util.*;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
 import org.springframework.web.client.HttpStatusCodeException;
 import org.springframework.web.client.RestTemplate;
 
@@ -34,7 +29,7 @@ public class DefaultAbstractComponentSMO extends AbstractComponentSMO {
 
     private static final Logger logger = LoggerFactory.getLogger(DefaultAbstractComponentSMO.class);
     protected static final String DEFAULT_PAY_ADAPT = "wechatPayAdapt";// 默认微信通用支付
-
+    private static final String URL_API =  "";
     @Autowired
     private IGetCommunityStoreInfoSMO getCommunityStoreInfoSMOImpl;
 
@@ -430,4 +425,128 @@ public class DefaultAbstractComponentSMO extends AbstractComponentSMO {
         return new ComponentValidateResult(storeId, storeTypeCd, "", pd.getUserId(), pd.getUserName());
     }
 
+    /**
+     * 查询
+     *
+     * @param pd          页面对象
+     * @param param       传入对象
+     * @param serviceCode 服务编码
+     * @param t           返回类
+     * @param <T>
+     * @return
+     */
+    protected <T> T getForApi(IPageData pd, T param, String serviceCode, Class<T> t) {
+
+        List<T> list = getForApis(pd, param, serviceCode, t);
+        if (list != null && list.size() > 0) {
+            return list.get(0);
+        }
+        return null;
+    }
+
+    /**
+     * 查询
+     *
+     * @param pd          页面对象
+     * @param param       传入对象
+     * @param serviceCode 服务编码
+     * @param t           返回类
+     * @param <T>
+     * @return
+     */
+    protected <T> T postForApi(IPageData pd, T param, String serviceCode, Class<T> t) {
+        List<T> ts = postForApis(pd, param, serviceCode, t);
+
+        if (ts == null || ts.size() < 1) {
+            return null;
+        }
+
+        return ts.get(0);
+    }
+
+    /**
+     * 查询
+     *
+     * @param pd          页面对象
+     * @param param       传入对象
+     * @param serviceCode 服务编码
+     * @param t           返回类
+     * @param <T>
+     * @return
+     */
+    protected <T> List<T> postForApis(IPageData pd, T param, String serviceCode, Class<T> t) {
+
+        String url = URL_API + serviceCode;
+
+
+        ResponseEntity<String> responseEntity = callCenterService(restTemplate, pd, JSONObject.toJSONString(param), url, HttpMethod.POST);
+
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
+            throw new SMOException("调用" + serviceCode + "失败，" + responseEntity.getBody());
+        }
+
+        JSONObject resultVo = JSONObject.parseObject(responseEntity.getBody());
+
+        if (ResultVo.CODE_MACHINE_OK != resultVo.getInteger("code")) {
+            throw new SMOException(resultVo.getString("msg"));
+        }
+
+        Object bObj = resultVo.get("data");
+        JSONArray datas = null;
+        if (bObj instanceof JSONObject) {
+            datas = new JSONArray();
+            datas.add(bObj);
+        } else {
+            datas = (JSONArray) bObj;
+        }
+        String jsonStr = JSONObject.toJSONString(datas);
+
+        List<T> list = JSONObject.parseArray(jsonStr, t);
+        return list;
+    }
+
+    /**
+     * 查询
+     *
+     * @param pd          页面对象
+     * @param param       传入对象
+     * @param serviceCode 服务编码
+     * @param t           返回类
+     * @param <T>
+     * @return
+     */
+    protected <T> List<T> getForApis(IPageData pd, T param, String serviceCode, Class<T> t) {
+
+        String url = URL_API + serviceCode;
+        if (param != null) {
+            url += mapToUrlParam(BeanConvertUtil.beanCovertMap(param));
+        }
+
+        ResponseEntity<String> responseEntity = callCenterService(restTemplate, pd, "", url, HttpMethod.GET);
+
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
+            throw new SMOException("调用" + serviceCode + "失败，" + responseEntity.getBody());
+        }
+
+        JSONObject resultVo = JSONObject.parseObject(responseEntity.getBody());
+
+        if (!"0".equals(resultVo.getString("code"))) {
+            throw new SMOException(resultVo.getString("msg"));
+        }
+
+        Object bObj = resultVo.get("data");
+        JSONArray datas = null;
+        if (bObj instanceof JSONObject) {
+            datas = new JSONArray();
+            datas.add(bObj);
+        } else {
+            datas = (JSONArray) bObj;
+        }
+        String jsonStr = JSONObject.toJSONString(datas);
+
+        List<T> list = JSONObject.parseArray(jsonStr, t);
+        return list;
+    }
+
+
 }

service-api/src/main/java/com/java110/api/smo/login/impl/OwnerAppLoginSMOImpl.java

@@ -2,6 +2,7 @@ package com.java110.api.smo.login.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.api.smo.DefaultAbstractComponentSMO;
 import com.java110.core.base.smo.front.AbstractFrontServiceSMO;
 import com.java110.core.context.IPageData;
 import com.java110.core.context.PageData;
@@ -42,7 +43,7 @@ import java.util.UUID;
  * wx登录
  */
 @Service("ownerAppLoginSMOImpl")
-public class OwnerAppLoginSMOImpl extends AbstractFrontServiceSMO implements IOwnerAppLoginSMO {
+public class OwnerAppLoginSMOImpl extends DefaultAbstractComponentSMO implements IOwnerAppLoginSMO {
 
     private final static Logger logger = LoggerFactory.getLogger(OwnerAppLoginSMOImpl.class);
 

service-api/src/main/java/com/java110/api/smo/login/impl/OwnerAppRegisterSMOImpl.java

@@ -1,6 +1,7 @@
 package com.java110.api.smo.login.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.api.smo.DefaultAbstractComponentSMO;
 import com.java110.core.base.smo.front.AbstractFrontServiceSMO;
 import com.java110.core.context.IPageData;
 import com.java110.core.context.PageData;
@@ -26,7 +27,7 @@ import java.util.List;
  * wx登录
  */
 @Service("ownerAppRegisterSMOImpl")
-public class OwnerAppRegisterSMOImpl extends AbstractFrontServiceSMO implements IOwnerAppRegisterSMO {
+public class OwnerAppRegisterSMOImpl extends DefaultAbstractComponentSMO implements IOwnerAppRegisterSMO {
 
     private final static Logger logger = LoggerFactory.getLogger(OwnerAppRegisterSMOImpl.class);
 

service-api/src/main/java/com/java110/api/smo/staff/impl/StaffAuthSMOImpl.java

@@ -2,6 +2,7 @@ package com.java110.api.smo.staff.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.api.smo.DefaultAbstractComponentSMO;
 import com.java110.core.base.smo.front.AbstractFrontServiceSMO;
 import com.java110.core.context.IPageData;
 import com.java110.core.context.PageData;
@@ -36,7 +37,7 @@ import java.util.List;
  * wx登录
  */
 @Service("staffAuthSMOImpl")
-public class StaffAuthSMOImpl extends AbstractFrontServiceSMO implements IStaffAuthSMO {
+public class StaffAuthSMOImpl extends DefaultAbstractComponentSMO implements IStaffAuthSMO {
 
     private final static Logger logger = LoggerFactory.getLogger(StaffAuthSMOImpl.class);
 

service-api/src/main/java/com/java110/api/smo/wechatGateway/impl/WechatGatewaySMOImpl.java

@@ -2,6 +2,7 @@ package com.java110.api.smo.wechatGateway.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.api.smo.DefaultAbstractComponentSMO;
 import com.java110.core.base.smo.front.AbstractFrontServiceSMO;
 import com.java110.core.context.IPageData;
 import com.java110.core.factory.WechatFactory;
@@ -34,7 +35,7 @@ import java.util.List;
  * wx登录
  */
 @Service("wechatGatewaySMOImpl")
-public class WechatGatewaySMOImpl extends AbstractFrontServiceSMO implements IWechatGatewaySMO {
+public class WechatGatewaySMOImpl extends DefaultAbstractComponentSMO implements IWechatGatewaySMO {
 
     private final static Logger logger = LoggerFactory.getLogger(WechatGatewaySMOImpl.class);