微信第三方平台-授权回调修改

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

@@ -10,10 +10,7 @@ import com.epmet.dto.form.RemoveBindFormDTO;
 import com.epmet.dto.result.GoToAuthResultDTO;
 import com.epmet.service.AppLetAuthorizationService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @Author zxc
@@ -32,9 +29,9 @@ public class AppLetAuthorizationController {
      * @author zxc
      */
     @PostMapping("gotoauth")
-    public Result<GoToAuthResultDTO> goToAuth(@LoginUser TokenDto tokenDto, @RequestBody GoToAuthFormDTO formDTO){
+    public Result<GoToAuthResultDTO> goToAuth(@LoginUser TokenDto tokenDto, @RequestBody GoToAuthFormDTO formDTO, @RequestHeader("source")String source){
         ValidatorUtils.validateEntity(formDTO);
-        GoToAuthResultDTO goToAuthResultDTO = appLetAuthorizationService.goToAuth(tokenDto,formDTO);
+        GoToAuthResultDTO goToAuthResultDTO = appLetAuthorizationService.goToAuth(tokenDto,formDTO,source);
         return new Result().ok(goToAuthResultDTO);
     }
 

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

@@ -17,7 +17,7 @@ public interface AppLetAuthorizationService {
      * @param tokenDto
      * @author zxc
      */
-    GoToAuthResultDTO goToAuth(TokenDto tokenDto, GoToAuthFormDTO formDTO);
+    GoToAuthResultDTO goToAuth(TokenDto tokenDto, GoToAuthFormDTO formDTO,String source);
 
     /**
      * @Description  将公众号/小程序从开放平台帐号下解绑

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

@@ -55,12 +55,13 @@ public class AppLetAuthorizationServiceImpl implements AppLetAuthorizationServic
      * @author zxc
      */
     @Override
-    public GoToAuthResultDTO goToAuth(TokenDto tokenDto, GoToAuthFormDTO formDTO) {
+    public GoToAuthResultDTO goToAuth(TokenDto tokenDto, GoToAuthFormDTO formDTO,String source) {
         GoToAuthResultDTO result = new GoToAuthResultDTO();
         String userId = tokenDto.getUserId();
         //获取预授权码
         String preAuthCode = componentVerifyTicketService.preAuthCode();
-        String redirectUrl = WxMaCodeConstant.WEB_URL + formDTO.getClientType();
+//        String redirectUrl = WxMaCodeConstant.WEB_URL + formDTO.getClientType();
+        String redirectUrl = String.format(WxMaCodeConstant.WEB_URL,source,formDTO.getClientType());
         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/wxapi/constant/WxMaCodeConstant.java

@@ -33,7 +33,7 @@ public interface WxMaCodeConstant {
     /**
      * 前端地址 【授权之后的跳转的地址】
      */
-    String  WEB_URL = "https://epmet-cloud.elinkservice.cn/third/mpweb/page/#/info?clientType=";
+    String  WEB_URL = "https://epmet-cloud.elinkservice.cn/third/mpweb/page/%s/#/info?clientType=%s";
 
     /**
      * 授权注册页面扫码授权