登录接口生成token

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/hwuser/entity/HwUser.java

@@ -80,4 +80,7 @@ public class HwUser implements Serializable{
 
 	@TableField(exist = false)
 	private String registerTime_end;
+
+	/**登录token校验*/
+	private String userToken;
 }

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/hwuser/mapper/xml/HwUserMapper.xml

@@ -14,6 +14,7 @@
 		a.sys_org_code AS "sysOrgCode",
 		a.register_time AS "registerTime",
 		a.register_from AS "registerFrom",
+		a.user_token as "userToken",
 		bank.card_number AS "hwBankAccount.cardNumber"
 	</sql>
 
@@ -74,6 +75,7 @@
 			authentication_status,
 			sys_org_code,
 			register_time,
+			user_token,
 			register_from
 		) VALUES (
 			#{hwUser.platformCompanyId},
@@ -85,6 +87,7 @@
 			#{hwUser.authenticationStatus},
 			#{hwUser.sysOrgCode},
 			#{hwUser.registerTime},
+			#{hwUser.userToken},
 			#{hwUser.registerFrom}
 		)
 	</insert>
@@ -100,6 +103,7 @@
 			authentication_status = #{authenticationStatus},
 			sys_org_code = #{sysOrgCode},
 			register_time = #{registerTime},
+			user_token = #{userToken},
 			register_from = #{registerFrom}
 		WHERE id = #{id}
 	</update>

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/hwuser/service/impl/HwUserServiceImpl.java

@@ -398,7 +398,6 @@ public class HwUserServiceImpl extends ServiceImpl<HwUserMapper, HwUser> impleme
     public Map<String, Object> getLoginApp(HashMap<String, String> requestMap, HttpServletRequest request) {
         Map<String, Object> returnMap = new HashMap<String, Object>();
         String phone = requestMap.get("phone");
-        String clientId = requestMap.get("client_id");
         HwUser user1 = new HwUser();
         HwUser user = this.getByPhone(phone);
         if (user == null) {
@@ -408,23 +407,22 @@ public class HwUserServiceImpl extends ServiceImpl<HwUserMapper, HwUser> impleme
             user1.setRegisterTime(new Date());
             user1.setRegisterFrom(1);
             hwUserMapper.saveHwUser(user1);
-            //生成token
-//            long t1 = System.currentTimeMillis();
-//            String timestamp = String.valueOf(t1);
-//            String token = Md5Encrypt.md5(user1.getId() + timestamp);
-//            user1.setUserToken(token);
         } else {
             user1 = user;
-//            user1.setLoginTime(new Date());
-//            user1.setUpdateTime(new Date());
         }
+       if(StringUtils.isBlank(user1.getUserToken())){
+           //生成token
+           long t1 = System.currentTimeMillis();
+           String timestamp = String.valueOf(t1);
+           String token = Md5Encrypt.md5(user1.getId() + timestamp);
+           user1.setUserToken(token);
+       }
         //更新用户
         this.updateById(user1);
         user1 = this.getById(user1.getId());
         //清空验证码缓存
         redisUtil.del(phone);
         returnMap.put("userInfo", user1);
-
         return returnMap;
     }
 

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/ordermanager/service/impl/HwOrderServiceImpl.java

@@ -308,7 +308,7 @@ public class HwOrderServiceImpl extends ServiceImpl<HwOrderMapper, HwOrder> impl
             hwOrder.setStatus(2);
             hwOrder.setUpdateTime(new Date());
             hwOrder.setUpdateBy(null);
-            save(hwOrder);
+            updateById(hwOrder);
             HwOrderProcessDetail hwOrderProcessDetail = new HwOrderProcessDetail();
             hwOrderProcessDetail.setOrderId(hwOrder.getId());
             hwOrderProcessDetail.setRequirementId(hwOrder.getRequirementId());

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/util/TokenUtil.java

@@ -38,7 +38,7 @@ public class TokenUtil {
         try {
             HwUser user = iUserService.getById(userId);
             if (user != null) {
-//                return token.equals(user.getUserToken());
+                return token.equals(user.getUserToken());
             }
         } catch (Exception e) {
             e.printStackTrace();