Merge branch 'server-165' of http://47.111.81.118:3000/uskycloud/usky-modules into fu-dev

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/WeChatController.java

@@ -4,6 +4,8 @@ import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -121,13 +123,16 @@ public class WeChatController {
     public ApiResult<MceMbuser> getPageAuthorization(@RequestParam(value = "openId") String openId)  {
         String http = "https://";
         String code = request.getParameter("code");
-        System.out.println("String openId:  "+openId);
         LOGGER.info("String openId:  "+openId);
 
         if((openId != null) && (openId != "")){
                 LambdaQueryWrapper<MceMbuser> queryWrapper = Wrappers.lambdaQuery();
                 queryWrapper.eq(MceMbuser::getOpenid,openId).last("LIMIT 1");
                 MceMbuser one = mceMbuserService.getOne(queryWrapper);
+                if(one != null){
+                    String accessToken = redisHelper.get("login_openid:"+openId).toString();
+                    one.setAccessToken(accessToken);
+                }
 
                 return ApiResult.success(one);
 //            try{
@@ -199,7 +204,6 @@ public class WeChatController {
 
     }
 
-
     /**
      * 登录并注册
      */

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/MceMbuser.java

@@ -1,6 +1,7 @@
 package com.usky.iot.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -49,6 +50,12 @@ public class MceMbuser implements Serializable {
      */
     private String dingTalkId;
 
+    /**
+     * 平台token
+     */
+    @TableField(exist = false)
+    private String accessToken;
+
     /**
      * 创建人
      */