完善

platform-rest/src/main/java/com/platform/rest/controller/upms/SysUserController.java

@@ -11,6 +11,7 @@ import com.platform.common.constant.UpmsRedisKeyConstants;
 import com.platform.common.enums.InitialPasswordEnum;
 import com.platform.common.enums.ResultCode;
 import com.platform.common.model.OauthUser;
+import com.platform.common.model.UserInfo;
 import com.platform.common.util.*;
 import com.platform.common.validation.group.AddGroup;
 import com.platform.common.validation.group.OtherGroup;
@@ -42,7 +43,9 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -470,4 +473,25 @@ public class SysUserController {
     public R selectByIdentityTypeDept(@PathVariable("identityType") Integer identityType) {
         return R.success(sysUserDeptService.selectByUserAndIdentityTypeDept(identityType));
     }
+
+    /**
+     * 保存openid和用戶信息，带着code
+     * 后台再跟进这个code去获取用户openid
+     *
+     * @param openId
+     * @return
+     */
+    @RequestMapping(value = "/bind/{openId}", method = RequestMethod.PUT)
+    public R bind(@PathVariable("openId") String openId) throws IOException {
+        log.info("微信的openId: " + openId);
+        SysUser searchUser = new SysUser();
+        searchUser.setWxOpenId(openId);
+        SysUser sysUser = sysUserService.getModelByModel(searchUser);
+        if (sysUser == null) {
+            UserInfo userInfo = SecurityUtils.getUser().getUserInfo();
+            searchUser.setUserId(userInfo.getUserId());
+            sysUserService.modModelByPrimaryKey(searchUser);
+        }
+        return R.success("微信绑定成功");
+    }
 }

platform-rest/src/main/java/com/platform/rest/controller/wechat/WechatController.java

@@ -133,40 +133,9 @@ public class WechatController {
         JsonOauthAccessTokenResponse wechatResponse = WeChatConnectService.getOauthAccessToken(code);
         String openId = wechatResponse.getOpenid();
         log.info("微信的openId: " + openId);
-        SysUser searchUser = new SysUser();
-        searchUser.setWxOpenId(openId);
-        SysUser sysUser = sysUserService.getModelByModel(searchUser);
-        if (sysUser == null) {
-            String state = nextToken();
-            UserInfo userInfo = SecurityUtils.getUser().getUserInfo();
-            searchUser.setUserId(userInfo.getUserId());
-            sysUserService.modModelByPrimaryKey(searchUser);
-        }
         response.sendRedirect("https://rl.m.litian2017.com/#/pages/setting/wechat-oauth?openId=" + openId);
     }
 
-    /**
-     * 保存openid和用戶信息，带着code
-     * 后台再跟进这个code去获取用户openid
-     *
-     * @param request
-     * @param openId
-     * @return
-     */
-    @RequestMapping(value = "bind", method = RequestMethod.PUT)
-    public R bind(HttpServletRequest request, HttpServletResponse response, @RequestParam String openId) throws IOException {
-        log.info("微信的openId: " + openId);
-        SysUser searchUser = new SysUser();
-        searchUser.setWxOpenId(openId);
-        SysUser sysUser = sysUserService.getModelByModel(searchUser);
-        if (sysUser == null) {
-            UserInfo userInfo = SecurityUtils.getUser().getUserInfo();
-            searchUser.setUserId(userInfo.getUserId());
-            sysUserService.modModelByPrimaryKey(searchUser);
-        }
-        return R.success("微信授权成功");
-    }
-
 //    /**
 //     * 处理微信跳转过来的授权 授权成功后，保存openid到session，然后跳转到登录页面
 //     *

platform-rest/src/main/resources/application-dev.yml

@@ -79,8 +79,7 @@ ignore:
     - /static/**
     - /service/**
     - /ignores/**
-    - /wechat/token
-    - /wechat/redirect
+    - /wechat/**
 upload:
   root-dir: D://data//xian
 

platform-rest/src/main/resources/application-prod.yml

@@ -64,8 +64,7 @@ ignore:
     - /static/**
     - /service/**
     - /ignores/**
-    - /wechat/token
-    - /wechat/redirect
+    - /wechat/**
 upload:
   root-dir: /home/data/sb-base/FileData
 

platform-rest/src/main/resources/application-test.yml

@@ -59,8 +59,7 @@ ignore:
     - /static/**
     - /service/**
     - /ignores/**
-    - /wechat/token
-    - /wechat/redirect
+    - /wechat/**
 upload:
   root-dir: /home/data/XiAnConstructionAsset/FileData