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

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/AppLetAuthorizationServiceImpl.java

@@ -39,7 +39,8 @@ public class AppLetAuthorizationServiceImpl implements AppLetAuthorizationServic
         String customerId = paCustomerAgencyDao.getCustomerIdByUserId(userId);
         //获取预授权码
         String preAuthCode = componentVerifyTicketService.preAuthCode();
-        String redirectUrl = String.format(WxMaCodeConstant.API_RETURN_REDIRECT_URL, customerId,formDTO.getClientType());
+//        String redirectUrl = String.format(WxMaCodeConstant.API_RETURN_REDIRECT_URL, customerId,formDTO.getClientType());
+        String redirectUrl = WxMaCodeConstant.WEB_URL;
         String authUrl = String.format(WxMaCodeConstant.API_AUTH_REGISTER_URL, componentAppId, preAuthCode, redirectUrl);
         result.setUrl(authUrl);
         return result;

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java

@@ -398,7 +398,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
         //authCode存缓存
         redisThird.setAuthCode(formDTO);
         log.info("回调结束");
-        response.sendRedirect(WxMaCodeConstant.WEB_URL);
+//        response.sendRedirect(WxMaCodeConstant.WEB_URL);
     }
 
     /**