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

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/AuthRedirectController.java

@@ -4,6 +4,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.service.ComponentVerifyTicketService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -26,9 +27,9 @@ public class AuthRedirectController {
      * @param
      * @author zxc
      */
-    @GetMapping("redirect")
-    public Result redirectUri(HttpServletRequest request, HttpServletResponse response){
-        componentVerifyTicketService.redirectUri(request,response);
+    @GetMapping("redirect/{customerId}/{clientType}")
+    public Result redirectUri(HttpServletRequest request, HttpServletResponse response, @PathVariable("customerId")String customerId, @PathVariable("clientType")String clientType){
+        componentVerifyTicketService.redirectUri(request,response,customerId,clientType);
         return new Result();
     }
 

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

@@ -41,6 +41,6 @@ public interface ComponentVerifyTicketService {
      * @param
      * @author zxc
      */
-    void redirectUri(HttpServletRequest request, HttpServletResponse response);
+    void redirectUri(HttpServletRequest request, HttpServletResponse response,String customerId, String clientType);
 
 }

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

@@ -364,7 +364,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void redirectUri(HttpServletRequest request, HttpServletResponse response) {
+    public void redirectUri(HttpServletRequest request, HttpServletResponse response,String customerId, String client) {
         log.info("开始执行回调URL");
         try {
             request.setCharacterEncoding(ModuleConstant.UTF8);
@@ -372,8 +372,8 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }
-        String customerId = request.getParameter(ModuleConstant.CUSTOMER_ID);
-        String client = request.getParameter(ModuleConstant.CLIENT);
+        /*String customerId = request.getParameter(ModuleConstant.CUSTOMER_ID);
+        String client = request.getParameter(ModuleConstant.CLIENT);*/
         String authCode = request.getParameter(ModuleConstant.AUTH_CODE);
         String expiresIn = request.getParameter(ModuleConstant.EXPIRES_IN);
         Date expiresInTime = this.countExpirationTime(expiresIn);

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java

@@ -33,7 +33,8 @@ public interface WxMaCodeConstant {
     /**
      * 反参授权回调url
      */
-    String API_RETURN_REDIRECT_URL = "https://epmet-dev.elinkservice.cn/api/third/redirectauthcode?client=%s&customerId=%s";
+//    String API_RETURN_REDIRECT_URL = "https://epmet-dev.elinkservice.cn/api/third/redirectauthcode?client=%s&customerId=%s";
+    String API_RETURN_REDIRECT_URL = "https://epmet-cloud.elinkservice.cn/api/third/redirectauthcode?client=%s&customerId=%s";
 //    String API_RETURN_REDIRECT_URL = "https://10.10.10.194:8080/api/third/redirectauthcode?client=%s&customerId=%s";
 
     /**