登录后生成token3

ch-core/src/main/java/com/wwdz/ch/core/consts/CommConsts.java

@@ -225,4 +225,10 @@ public interface CommConsts {
 	 */
 	public static final List<Long> NOT_SEND_MSG_USERID = Arrays.asList(9357942L, 42273900L, 290775L ,61091901L, 299497L, 61097938L,
 			61113888L, 60652774L, 60684039L, 42192256L, 60652774L, 291997L, 61098908L, 61074146L, 2222222222222L, 6666666666L, CommConsts.SYSTEM_ACCOUNT);
+
+
+	/**
+	 * 乾岛的token前缀标识，用于拦截器的特殊处理
+	 */
+	public static final String QIANDAO_PRE_TOKEN = "qiandao_";
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/config/WebMvcConfiguration.java

@@ -58,6 +58,9 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
 
 						"/wx/userSignIn/testSignIn","/wx/userSignIn/deleteTodayRecord"
 						//下列路径上线注释
+
+						,"/wx/qdUserSignIn/**" , "/wx/qdUserSignInNote/**", "/wx/qdUserSignInTask/**",
+						"/wx/qdHomePage/**", "/wx/qdGiveLikeRecord/**", "/wx/qdSignInTask/**"
 						//"/wx/itemTagQrCode/**"
 						//		,"/wx/itemTagOperate/**", "/wx/openShop/**", "/wx/earnestRecord/**", "/wx/auctionEarnest/**", "/wx/userAccount/**"
 					/*	,"/wx/specialPerformance/**"

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/qiandao/QdUserSignInServiceImpl.java

@@ -98,6 +98,7 @@ public class QdUserSignInServiceImpl implements QdUserSignInService {
             //保存签到笔记
             QdUserSignInNote qdUserSignInNote = new QdUserSignInNote();
             qdUserSignInNote.setTitle(dto.getTitle());
+            qdUserSignInNote.setTaskId(taskId);
             qdUserSignInNote.setUserId(userId);
             qdUserSignInNote.setLikeNum(0);
             qdUserSignInNote.setSignInDate(todayStr);
@@ -159,7 +160,7 @@ public class QdUserSignInServiceImpl implements QdUserSignInService {
             distributionOrder.setItemId(null);
             distributionOrder.setItemNum(1);
             distributionOrder.setDistributionOrderId(distributionOrderId);
-            distributionOrder.setBuyerId(dto.getUserId());
+            distributionOrder.setBuyerId(userId);
             distributionOrder.setBuyerOpenid(dto.getUserOpenId());
             distributionOrder.setPrepayId(prepayId);
             distributionOrder.setShopId(CommConsts.SYSTEM_ACCOUNT.longValue());

ch-wx-api/src/main/java/com/wwdz/ch/wx/interceptor/LoginInterceptor.java

 package com.wwdz.ch.wx.interceptor;
 
 import com.alibaba.fastjson.JSON;
+import com.wwdz.ch.core.consts.CommConsts;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.db.dao.UserDao;
 import com.wwdz.ch.db.domain.Switch;
 import com.wwdz.ch.db.domain.User;
+import com.wwdz.ch.wx.manager.QdUserTokenManager;
 import com.wwdz.ch.wx.manager.UserTokenManager;
 import com.wwdz.ch.wx.service.InviteRecordService;
 import com.wwdz.ch.wx.service.SwitchService;
@@ -30,6 +32,10 @@ public class LoginInterceptor implements HandlerInterceptor {
 
     @Autowired
     private UserTokenManager userTokenManager;
+
+    @Autowired
+    QdUserTokenManager qdUserTokenManager;
+
     @Autowired
     private SwitchService switchService;
     @Autowired
@@ -57,10 +63,16 @@ public class LoginInterceptor implements HandlerInterceptor {
                 return true;
             }
             if (StringUtils.isNotBlank(token)) {
+                if (token.startsWith(CommConsts.QIANDAO_PRE_TOKEN)) {
+                    if (qdUserTokenManager.checkLogin(token)) {
+                        return true;
+                    }
+                } else {
                     if (userTokenManager.checkLogin(token)) {
                         return true;
                     }
                 }
+            }
             Map<Object, Object> map = new HashMap<>();
             map.put("code", 401);
             map.put("success", false);

ch-wx-api/src/main/java/com/wwdz/ch/wx/manager/QdUserTokenManager.java

 package com.wwdz.ch.wx.manager;
 
 import com.google.gson.Gson;
+import com.wwdz.ch.core.consts.CommConsts;
 import com.wwdz.ch.core.util.CharUtil;
 import com.wwdz.ch.wx.dao.UserToken;
 import com.wwdz.ch.wx.util.RedisUtil;
@@ -75,6 +76,7 @@ public class QdUserTokenManager {
 	public UserToken generateToken(Long id, String token) {
 		UserToken userToken = null;
 		token = CharUtil.getRandomString(32);
+		token = CommConsts.QIANDAO_PRE_TOKEN + token;
 		String key = TOKEN_PREFIX + token;
 		LocalDateTime update = LocalDateTime.now();
 		LocalDateTime expire = update.plusDays(100);

ch-wx-api/src/main/java/com/wwdz/ch/wx/manager/UserTokenManager.java

 package com.wwdz.ch.wx.manager;
 
 import com.google.gson.Gson;
+import com.wwdz.ch.core.consts.CommConsts;
 import com.wwdz.ch.core.util.CharUtil;
 import com.wwdz.ch.wx.dao.UserToken;
 import com.wwdz.ch.wx.util.RedisUtil;
@@ -50,6 +51,7 @@ public class UserTokenManager {
 	}
 
 	public boolean checkLogin(String token) {
+
 		String key = TOKEN_PREFIX + token;
 		Object tokenObj = redisUtil.get(key);
 		if (Objects.isNull(tokenObj)) {
@@ -72,6 +74,10 @@ public class UserTokenManager {
 		return StringUtils.equals(token, idToken);
 	}
 
+
+
+
+
 	public UserToken generateToken(Long id, String token) {
 		UserToken userToken = null;
 

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/qiandao/QdUserSignInController.java

@@ -32,8 +32,8 @@ public class QdUserSignInController {
     QdUserSignInService qdUserSignInService;
 
     @ApiOperation(value = "乾岛签到")
-    @PostMapping("/loginRegCaptcha")
-    public Object registerCaptcha(@RequestBody QdUserSignInRequestDto dto) {
+    @PostMapping("/signIn")
+    public Object signIn(@RequestBody QdUserSignInRequestDto dto) {
         logger.info("【请求开始】乾岛签到,请求参数:{}", JSON.toJSONString(dto));
         if (dto.getUserId() == null || dto.getTaskId() == null) {
             return Result.failed(ResultCode.PARAM_ERROR);