From 8067d0160322c17f0bd9a9a791f4145578590871 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Mon, 20 Jul 2020 14:24:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0-=E6=8E=88=E6=9D=83=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/AuthRedirectController.java | 7 ++++--- .../com/epmet/service/ComponentVerifyTicketService.java | 2 +- .../service/impl/ComponentVerifyTicketServiceImpl.java | 6 +++--- .../java/com/epmet/wxapi/constant/WxMaCodeConstant.java | 3 ++- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/AuthRedirectController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/AuthRedirectController.java index b1b89e380d..d0a413522e 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/AuthRedirectController.java +++ b/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(); } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ComponentVerifyTicketService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ComponentVerifyTicketService.java index 6071409e47..7637f6242e 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ComponentVerifyTicketService.java +++ b/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); } diff --git 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 index c02af51a19..f2b87d0677 100644 --- 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 @@ -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); diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java index d7ba900d81..5cc453ce5e 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java +++ b/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"; /**