fix 收藏课程

zhongzheng-api/src/main/java/com/zhongzheng/controller/wx/WxLoginController.java

@@ -48,10 +48,7 @@ public class WxLoginController
     @PostMapping("/testLogin")
     public AjaxResult testLogin(@RequestBody WxLoginBody loginBody)
     {
-        ClientLoginUser loginUser = wxLoginService.test_login();
-        Map<String,Object> map = new HashMap<>();
-        map.put(Constants.TOKEN, loginUser.getToken());
-        map.put("union_id", loginUser.getUser().getUnionId());
+        Map<String,String> map = wxLoginService.test_login();
         return AjaxResult.success(map);
     }
 
@@ -65,10 +62,7 @@ public class WxLoginController
     @PostMapping("/login")
     public AjaxResult login(@RequestBody WxLoginBody loginBody)
     {
-        ClientLoginUser loginUser = wxLoginService.login(loginBody);
-        Map<String,Object> map = new HashMap<>();
-        map.put(Constants.TOKEN, loginUser.getToken());
-        map.put("union_id", loginUser.getUser().getUnionId());
+        Map<String,String> map = wxLoginService.login(loginBody);
         return AjaxResult.success(map);
     }
 

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/WxLoginService.java

@@ -3,6 +3,7 @@ package com.zhongzheng.framework.web.service;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.zhongzheng.common.constant.Constants;
 import com.zhongzheng.common.exception.CustomException;
 
 import com.zhongzheng.common.utils.*;
@@ -21,6 +22,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 登录校验方法
@@ -49,24 +52,29 @@ public class WxLoginService
     @Autowired
     private UserMapper userMapper;
 
-    public ClientLoginUser test_login() {
+    public Map<String,String> test_login() {
         String unionId = "oQ2yp56PgQ-PfwN4vxTZhR5eTpzk";
         User user = iUserService.queryByUnionId(unionId);
         ClientLoginUser loginUser = new ClientLoginUser();
         loginUser.setUser(user);
-        wxTokenService.createToken(loginUser);
-        return loginUser;
+
+        Map<String,String> map = new HashMap<>();
+        map.put(Constants.TOKEN,wxTokenService.createToken(loginUser));
+        map.put("union_id",loginUser.getUser().getUnionId());
+        return map;
     }
 
-    public ClientLoginUser login(WxLoginBody loginBody) {
+    public Map<String,String> login(WxLoginBody loginBody) {
         User user = getWxUnionIdUser(loginBody);
         if(user==null){
             throw new CustomException("登录错误");
         }
         ClientLoginUser loginUser = new ClientLoginUser();
         loginUser.setUser(user);
-        wxTokenService.createToken(loginUser);
-        return loginUser;
+        Map<String,String> map = new HashMap<>();
+        map.put(Constants.TOKEN,wxTokenService.createToken(loginUser));
+        map.put("union_id",loginUser.getUser().getUnionId());
+        return map;
     }
 
     public String refreshToken(String unionId) {
@@ -102,6 +110,7 @@ public class WxLoginService
         bo.setSex(1);
         bo.setStatus(1);
         bo.setRegisterPlat("1");
+        bo.setAvatar("oss/images/avatar/20210623/1624414559368_44562477.png");
         bo.setLastLoginIp(IpUtils.getIpAddr(ServletUtils.getRequest()));
         bo.setLastLoginTime(DateUtils.getNowTime());
         return iUserService.insertByAddBo(bo);

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/WxTokenService.java

@@ -136,11 +136,10 @@ public class WxTokenService
      */
     public String createToken(ClientLoginUser loginUser)
     {
-        String token = IdUtil.fastUUID();
+        String token = IdUtil.simpleUUID()+loginUser.getUser().getUserAccout();
         loginUser.setToken(token);
         setUserAgent(loginUser);
         refreshToken(loginUser);
-
         Map<String, Object> claims = new HashMap<>();
         claims.put(Constants.WX_LOGIN_USER_KEY, token);
         return createToken(claims);

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserAddBo.java

@@ -95,4 +95,6 @@ public class UserAddBo {
     private String lastLoginIp;
     @ApiModelProperty("最后登录时间")
     private Long lastLoginTime;
+    @ApiModelProperty("头像")
+    private String avatar;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserEditBo.java

@@ -136,6 +136,9 @@ public class UserEditBo {
     @ApiModelProperty("邮箱")
     private String email;
 
+    @ApiModelProperty("头像")
+    private String avatar;
+
     public void setNull(){
         this.setTelphone(null);
         this.setIdCard(null);

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/User.java

@@ -135,4 +135,6 @@ private static final long serialVersionUID=1L;
 
     /** 邮箱 */
     private String email;
+
+    private String avatar;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserVo.java

@@ -145,6 +145,10 @@ public class UserVo {
 	@Excel(name = "邮箱")
 	@ApiModelProperty("邮箱")
 	private String email;
+	/** 头像 */
+	@Excel(name = "头像")
+	@ApiModelProperty("头像")
+	private String avatar;
 
 	public void setNull(){
 		this.setOpenId(null);

zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -43,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="oneInchPhotos" column="one_inch_photos"/>
         <result property="politic" column="politic"/>
         <result property="email" column="email"/>
+        <result property="avatar" column="avatar"/>
     </resultMap>