Merge remote-tracking branch 'origin/dev_thirdplatform' into dev

5 years ago · c8c3daaab4
5 changed files with 33 additions and 11 deletions
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ThirdRunTimeInfoConstant.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ThirdRunTimeInfoConstant.java
@ -84,4 +84,23 @@ public interface ThirdRunTimeInfoConstant {

    String REFRESH_AUTH_ACCESS_TOKEN = "查询到新的 授权方【access_token】";

+    String INFO_TYPE = "》》》》》》》》》》infoType = %s《《《《《《《《《《《《《《";
+
+    String COMPONENT_VERIFY_TICKET = "============================接收的票据为：%s===========================";
+
+    String AUTH_STATUS = "----------------------------授权成功------------------------------------";
+
+    String REMOVE_AUTH = "============================取消授权====================================";
+
+    String UPDATE_AUTH = "----------------------------变更授权------------------------------------";
+
+    String COMPONENT_ACCESS_TOKEN = "**********************************获取【component_access_token】请求参数componentVerifyTicket为：%s*************************************";
+
+    String EXIST_UPCOMING_EXPIRED = "===============================查询到即将过期的 ComponentAccessToken=================================";
+
+    String BEGIN_DELETE_INSERT_AUTH_CODE = "**************************************开始删除旧的AuthCode并保存新的AuthCode******************************************";
+
+    String BEGIN_CREATE_OPEN = "============================开始执行绑定开放平台账号===================================";
+
+    String CODE_AUDIT_RESULT = "----------------------------------代码审核结果即将插入，需要插入的内容为：%s-----------------------------------------";
 }
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/AppLetAuthorizationServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/AppLetAuthorizationServiceImpl.java
@ -62,7 +62,6 @@ public class AppLetAuthorizationServiceImpl implements AppLetAuthorizationServic
    public GoToAuthResultDTO goToAuth(TokenDto tokenDto, GoToAuthFormDTO formDTO) {
        GoToAuthResultDTO result = new GoToAuthResultDTO();
        String userId = tokenDto.getUserId();
-        String customerId = paCustomerAgencyDao.getCustomerIdByUserId(userId);
        //获取预授权码
        String preAuthCode = componentVerifyTicketService.preAuthCode();
        String redirectUrl = WxMaCodeConstant.WEB_URL + formDTO.getClientType();
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
@ -14,7 +14,6 @@ import com.epmet.dao.*;
 import com.epmet.dto.PaCustomerUserAgencyDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
-import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.mpaes.WXBizMsgCrypt;
 import com.epmet.mpaes.WXXmlToMapUtil;
 import com.epmet.redis.RedisThird;
@ -77,8 +76,6 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
    @Autowired
    private BusinessInfoDao businessInfoDao;
    @Autowired
-    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
-    @Autowired
    private AuthResultRecordDao authResultRecordDao;
    @Autowired
    private PaCustomerUserAgencyDao paCustomerUserAgencyDao;
@ -112,6 +109,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
            String nonce = request.getParameter(ModuleConstant.NONCE);
            String encryptType = request.getParameter(ModuleConstant.ENCRYPT_TYPE);
            String signature = request.getParameter(ModuleConstant.SIGNATURE);
+            log.info(String.format(ThirdRunTimeInfoConstant.VERIFY_TICKET,msgSignature,timeStamp,nonce,encryptType,signature));
            // 从请求中读取整个post数据
            InputStream inputStream;
            String postData = null;
@ -123,9 +121,11 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
            // 将xml转为map
            Map<String, String> result = WXXmlToMapUtil.xmlToMap(msg);
            String infotype = result.get(ModuleConstant.INFO_TYPE);
+            log.info(String.format(ThirdRunTimeInfoConstant.INFO_TYPE,infotype));
            switch (infotype){
                case ModuleConstant.TICKET_UNDERLINE_KEY:   //接收票据 【component_verify_ticket】
                    String ComponentVerifyTicket = result.get(ModuleConstant.TICKET_KEY);
+                    log.info(String.format(COMPONENT_VERIFY_TICKET));
                    // 缓存 ticket
                    redisThird.setComponentVerifyTicket(ComponentVerifyTicket);
                    // 存数据库
@ -139,15 +139,18 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
                    break;
                case ModuleConstant.AUTHORIZED: //授权成功
                    this.disposeAuthResult(result);
+                    log.info(AUTH_STATUS);
                    break;
                case ModuleConstant.UNAUTHORIZED://用户取消授权
                    //todo 取消授权
                    String authorizerAppId = result.get(ModuleConstant.AUTHORIZER_APP_ID_HUMP);
                    customerMpDao.updateAuthorizationFlag(authorizerAppId);
                    this.disposeAuthResult(result);
+                    log.info(REMOVE_AUTH);
                    break;
                case ModuleConstant.UPDATE_AUTHORIZED://授权变更
                    this.disposeAuthResult(result);
+                    log.info(UPDATE_AUTH);
                    break;
            }
        } catch (Exception e) {
@ -195,11 +198,13 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
        //距离超时时间小于15分钟的数量
        Integer tokenCount = componentAccessTokenDao.selectWillOverTokenCount();
        if ((tokenCount > NumConstant.ZERO && accessTokenCountFlag.equals(ModuleConstant.ACCOUNT_TOKEN_FLAG_TWO)) || accessTokenCountFlag.equals(ModuleConstant.ACCOUNT_TOKEN_FLAG_ONE)) {
+            log.info(String.format(EXIST_UPCOMING_EXPIRED));
            String componentVerifyTicket = redisThird.getComponentVerifyTicket();
            JSONObject jsonObject = new JSONObject();
            jsonObject.put(ModuleConstant.COMPONENT_APPID, componentAppId);
            jsonObject.put(ModuleConstant.COMPONENT_APPSECRET, appSecret);
            jsonObject.put(ModuleConstant.TICKET_UNDERLINE_KEY, componentVerifyTicket);
+            log.info(String.format(ThirdRunTimeInfoConstant.COMPONENT_ACCESS_TOKEN,componentVerifyTicket));
            String post = HttpClientManager.getInstance().sendPostByJSON(WxMaCodeConstant.API_COMPONENT_TOKEN_URL, JSON.toJSONString(jsonObject)).getData();
            Map hashMap = JSON.parseObject(post, Map.class);
            if (!hashMap.containsKey(ModuleConstant.ERR_MSG)) {
@ -389,7 +394,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
        formDTO.setExpiresInTime(expiresInTime);
        formDTO.setClientType(clientType);
        formDTO.setCustomerId(customerId);
-        log.info(formDTO.toString());
+        log.info(ThirdRunTimeInfoConstant.BEGIN_DELETE_INSERT_AUTH_CODE);
        authCodeDao.deleteCustomerAuthCode(customerId,clientType);
        authCodeDao.insertRedirectAuthCode(formDTO);
        //authCode存缓存
@ -523,6 +528,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
    }

    public void createAndBindOpenAccount(String customerId,String authAppId,String clientType){
+        log.info(ThirdRunTimeInfoConstant.BEGIN_CREATE_OPEN);
        Map<String, Object> authorizerRefreshToken = redisThird.getAuthorizerRefreshToken(customerId + ThirdRedisKeyConstant.COLON + clientType);
        String authorizerAccessToken = authorizerRefreshToken.get("authorizerAccessToken").toString();
        JSONObject bindInfoForm = new JSONObject();
@ -531,7 +537,6 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
        Map<String,Object> bindInfo = JSON.parseObject(bindResult, Map.class);
        boolean bindStatus = bindInfo.containsKey(ModuleConstant.OPEN_APP_ID);
        if (bindStatus != true) {
-            log.info(CREATE_AND_BIND_SUCCESS);
            Integer authCount = customerMpDao.selectAuthCount(customerId);
            String openPlatformId = null;
            if (authCount > 0) {
@ -655,11 +660,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
     * @author zxc
     */
    public String getLoginUserCustomerId(TokenDto tokenDto){
-        /*LoginUserDetailsFormDTO dto = new LoginUserDetailsFormDTO();
-        BeanUtils.copyProperties(tokenDto,dto);
-        LoginUserDetailsResultDTO data = epmetUserOpenFeignClient.getLoginUserDetails(dto).getData();*/
        PaCustomerUserAgencyDTO result = paCustomerUserAgencyDao.selectByUserId(tokenDto.getUserId());
-//        return data.getCustomerId();
        return result.getCustomerId();
    }

--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java
@ -174,7 +174,7 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
        PaUserEntity paUserEntity = paUserDao.selectById(formDTO.getUserId());

        //3.手机号不为空说明是同一个微信用户用第二个手机号注册，手机为空说明当前微信用户用第一个手机号注册
-        if(null != paUserEntity.getPhone() && StringUtils.isNotBlank(paUserEntity.getPhone())){
+        if(StringUtils.isNotBlank(paUserEntity.getPhone())){
            //手机号不为空说明是同一个微信用户用第二个手机号注册，新增user和user_wechat表数据
            //3-1.user表新增数据
            PaUserEntity userEntity = new PaUserEntity();
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java
@ -68,6 +68,7 @@ public class WarrantServiceImpl implements WarrantService {
    @Transactional(rollbackFor = Exception.class)
    @Override
    public String acceptMessageAndEvent(HttpServletRequest request, String appId, HttpServletResponse response)throws IOException, DocumentException, AesException {
+        log.info("消息与事件接收URL【代码审核结果】开始执行......");
        log.info("appId："+ appId);
        request.setCharacterEncoding(ModuleConstant.UTF8);
        String msgSignature = request.getParameter(ModuleConstant.MSG_SIGNATURE);
@ -109,6 +110,7 @@ public class WarrantServiceImpl implements WarrantService {
            codeAuditRecord.setAuthAppId(authAppId);
            codeAuditRecord.setTemplateId(templateId);
            //插入 代码审核 记录
+            log.info(String.format(ThirdRunTimeInfoConstant.CODE_AUDIT_RESULT,xml));
            codeAuditRecordDao.insertCodeAuditRecord(codeAuditRecord);
            // 修改 code_audit_result 中的代码审核结果
            String event = codeAuditRecord.getEvent();
@ -134,6 +136,7 @@ public class WarrantServiceImpl implements WarrantService {
            messagePushTextFormDTO.setWeChatCreateTime(date);
            messagePushTextDao.insertMessageText(messagePushTextFormDTO);
        }
+        log.info("消息与事件接收URL【代码审核结果】结束......");
        return ModuleConstant.SUCCESS;
    }
 }