登录

src/main/java/com/dk/oauth/entity/UserWxLogin.java

@@ -1,7 +1,10 @@
 package com.dk.oauth.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.dk.common.infrastructure.handler.IntListTypeHandler;
+import com.dk.common.infrastructure.handler.StringListTypeHandler;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -15,6 +18,8 @@ import java.util.List;
  */
 @Data
 public class UserWxLogin {
+    @ApiModelProperty(value = "用户ID")
+    private String userId;
 
     @NotBlank
     private String userPhone;
@@ -22,7 +27,7 @@ public class UserWxLogin {
     @NotBlank
     private String userName;
 
-    @NotBlank
+
     private String userWxid;
     /**
      * 当前公司

src/main/java/com/dk/oauth/service/impl/AuthAccessTokenServiceImpl.java

@@ -286,6 +286,7 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
             userMapper.insert(userWxLogin);
         } else {
             List<Integer> joinedCps = userLogin.getJoinedCps();
+            userWxLogin.setUserId(userLogin.getUserId());
             if (joinedCps == null) {
                 joinedCps = new ArrayList<>();
                 joinedCps.add(userWxLogin.getCurrentCp());
@@ -298,7 +299,12 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
                 userMapper.updateCpid(userLogin.getUserId(), null, userWxLogin.getJoinedCps());
             }
         }
-        return ResponseResultUtil.success(true);
+
+        Map<String, Object> mapReturn  = new HashMap<>();
+        mapReturn.put("userId",userWxLogin.getUserId());
+        mapReturn.put("userName",userWxLogin.getUserName());
+        mapReturn.put("userPhone",userWxLogin.getUserPhone());
+        return ResponseResultUtil.success(mapReturn);
 
     }
 

src/main/resources/mapper/UserMapper.xml

@@ -80,8 +80,8 @@
     </select>
 
     <insert id="insert">
-        insert into dkic_a.t_wx_user (user_wxid, user_name, user_phone, user_pwd,joined_cps)
-        values (#{userWxid}, #{userName}, #{userPhone}, md5('123'), #{joinedCps,typeHandler=IntListTypeHandler})
+        insert into dkic_a.t_wx_user (user_id,user_wxid, user_name, user_phone, user_pwd,joined_cps)
+        values (#{userId } ::uuid,#{userWxid}, #{userName}, #{userPhone}, md5('123'), #{joinedCps,typeHandler=IntListTypeHandler})
     </insert>
 
     <update id="cleanPhone">