测试版本

cement-business/src/main/java/cn/wise/sc/cement/business/controller/WeiXinController.java

@@ -35,7 +35,10 @@ public class WeiXinController {
         log.debug("code: {}", code);
         log.debug("=============================================");
         try {
-            return weiXinService.getToken(code, "APP");
+            //测试服务器
+            return weiXinService.getTestToken(code);
+            //正式服务器
+//            return weiXinService.getToken(code, "APP");
         } catch (Exception e) {
             log.debug("获取登录token{}", e);
         }
@@ -46,7 +49,10 @@ public class WeiXinController {
     @GetMapping("/getPCToken")
     public BaseResponse getPCToken(String code) {
         try {
-            return weiXinService.getToken(code, "PC");
+            //测试服务器
+            return weiXinService.getTestToken(code);
+            //正式服务器
+//            return weiXinService.getToken(code, "PC");
         } catch (Exception e) {
             log.debug("获取登录token{}", e);
         }
@@ -57,7 +63,6 @@ public class WeiXinController {
     @GetMapping("/getLoginUser")
     public BaseResponse getLoginUser() {
         try {
-
             return weiXinService.getLoginUser();
         } catch (Exception e) {
             log.debug("当前登录用户{}", e);
@@ -124,12 +129,6 @@ public class WeiXinController {
         return s;
     }
 
-
-
-
-
-
-
     @ApiOperation(value = "发送消息")
     @GetMapping("/sendTextMessage")
     public BaseResponse sendTextMessage() {

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/WeiXinService.java

@@ -37,7 +37,43 @@ public class WeiXinService {
     final static String JSAPITICKET = "JSAPITICKET";
 
     /**
-     * 获取登录token
+     * 获取登录token 测试服务器部署
+     *
+     * @param code
+     * @return
+     */
+    public BaseResponse<String> getTestToken(String code) {
+        if (StrUtil.isEmpty(code)) {
+            return BaseResponse.errorMsg("code为必填项!");
+        }
+        System.out.println("==================code===================");
+        System.out.println(code);
+        try {
+            QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
+            wrapper.eq("phone", code);  //暂时用手机号代替code
+            SysUser sysUser = userService.getOne(wrapper);
+            if (sysUser == null) {
+                return BaseResponse.errorMsg("非系统用户不允许登录!");
+            }
+            if (sysUser.getStatus() == 0) {
+                return BaseResponse.errorMsg("用户被禁用!");
+            }
+            if (sysUser.getIsDelete() == 0) {
+                return BaseResponse.errorMsg("用户被删除!");
+            }
+            //生成token,存入redis
+            String token = JwtUtil.createToken(sysUser.getId(), sysUser.getUsername(),
+                    sysUser.getName(), sysUser.getPhone());
+            System.out.println(token);
+            redisUtil.setString(sysUser.getId().toString(), token, 3600);
+            return BaseResponse.okData(token);
+        } catch (Exception e) {
+            return BaseResponse.errorMsg(e.getMessage());
+        }
+    }
+
+    /**
+     * 获取登录token  正式服务器部署
      *
      * @param code
      * @param type PC管理端  APP小程序端
@@ -50,7 +86,7 @@ public class WeiXinService {
         System.out.println("==================code===================");
         System.out.println(code);
         try {
-            /*String accessToken = null;
+            String accessToken = null;
             if (type.equals("PC")) {
                 accessToken = getAccessToken();
             } else if (type.equals("APP")) {
@@ -67,10 +103,9 @@ public class WeiXinService {
             String UserId = jsonObject.getString("UserId");
             System.out.println("==================UserId===================");
             System.out.println(UserId);
-            JSONObject userJson = getUser(accessToken, UserId);*/
+            JSONObject userJson = getUser(accessToken, UserId);
             QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
-//            wrapper.eq("phone", userJson.get("mobile"));
-            wrapper.eq("phone", code);  //暂时用手机号代替code
+            wrapper.eq("phone", userJson.get("mobile"));
             SysUser sysUser = userService.getOne(wrapper);
             if (sysUser == null) {
                 return BaseResponse.errorMsg("非系统用户不允许登录!");
@@ -86,14 +121,15 @@ public class WeiXinService {
                     sysUser.getName(), sysUser.getPhone());
             System.out.println(token);
             redisUtil.setString(sysUser.getId().toString(), token, 3600);
-//            sysUser.setWxId(UserId);
-//            userService.updateById(sysUser);
+            sysUser.setWxId(UserId);
+            userService.updateById(sysUser);
             return BaseResponse.okData(token);
         } catch (Exception e) {
             return BaseResponse.errorMsg(e.getMessage());
         }
     }
 
+
     //获取accessToken信息
     public String getAccessToken() {
         try {