夏文涛 2 лет назад
Родитель
Сommit
c047f22b82

+ 10 - 4
src/main/java/com/template/controller/WechatScanLoginController.java

@@ -525,6 +525,7 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
             userData.setBsStudentNo(su.getBsStudentNo());
             userData.setXwTeacherCode(su.getXwTeacherCode());
             userData.setBsStaffCode(su.getBsStaffCode());
+            userData.setUserhead(AesUtils.encrypt(String.valueOf(su.getId())));
             userDatas.add(userData);
         }
 
@@ -639,14 +640,19 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
         if (user.isEmpty()) {
             return CommonResult.fail("该用户不存在");
         }
-        user.get(0).setXOpenId(openid);
-        smartUserService.updateSmartUser(user.get(0));
+        for (SmartUser u: user) {
+            u.setXOpenId(openid);
+        }
+
+        smartUserService.saveBatch(user);
         long expired = 1000 * 60 * 60 * 24 * 365;
         String token = JWTUtil.getToken(user.get(0), expired);
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("token", token);
+        for (SmartUser u:user) {
+            u.setUserhead(AesUtils.encrypt(String.valueOf(u.getId())));
+        }
         jsonObject.put("user", user);
-        jsonObject.put("userhead", AesUtils.encrypt(String.valueOf(user.get(0).getId())));
         return CommonResult.ok(jsonObject);
     }
 
@@ -805,6 +811,6 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
         JSONObject result = new JSONObject();
         result.put("phone", purePhoneNumber);
 
-        return CommonResult.ok(result.toString());
+        return CommonResult.ok("200","获取成功",result.toString());
     }
 }

+ 6 - 0
src/main/java/com/template/model/pojo/SmartUser.java

@@ -135,6 +135,12 @@ public class SmartUser implements Serializable {
     @ApiModelProperty(value = "删除失败原因")
     private String deleteReason;
 
+    /**
+     * 请求头
+     */
+    @TableField(exist = false)
+    private String userhead;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")

+ 5 - 0
src/main/java/com/template/model/vo/WechatUserVo.java

@@ -199,4 +199,9 @@ public class WechatUserVo implements Serializable {
      */
     private String bsStaffCode;
 
+    /**
+     * 用户请求头
+     */
+    private String userhead;
+
 }