用户bug修改

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/LoginController.java

@@ -4,7 +4,6 @@ import com.abi.qms.platform.annotation.PassToken;
 import com.abi.qms.platform.dto.req.LoginReq;
 import com.abi.qms.platform.dto.req.ResetPasswordReq;
 import com.abi.qms.platform.dto.req.UpdatePasswordReq;
-import com.abi.qms.platform.dto.res.LoginActivateRes;
 import com.abi.qms.platform.dto.res.LoginRes;
 import com.abi.qms.platform.service.LoginService;
 import com.abi.task.common.api.base.BaseResponse;

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/ResetPasswordReq.java

@@ -16,11 +16,15 @@ import java.io.Serializable;
 @Data
 @ApiModel
 public class ResetPasswordReq implements Serializable {
+
     @NotNull(message = "用户id为空")
     @ApiModelProperty(value = "用户id")
     private Long id;
 
-    @NotEmpty(message = "密码为空")
     @ApiModelProperty(value = "密码")
     private String password;
+
+    @ApiModelProperty(value = "是否重置为默认密码")
+    private Integer isDefaultPassword;
+
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/SaveQrPackageReq.java

@@ -39,7 +39,6 @@ public class SaveQrPackageReq implements Serializable {
 	@ApiModelProperty(value = "预订单号")
 	private String bookingOrder;
 
-	@NotNull(message = "物料为空")
 	@ApiModelProperty(value = "物料id")
 	private Long materialId;
 
@@ -50,7 +49,6 @@ public class SaveQrPackageReq implements Serializable {
 	@ApiModelProperty(value = "二级包材厂id")
 	private Long factoryCoverLevelTwoId;
 
-	@NotNull(message = "啤酒厂为空")
 	@ApiModelProperty(value = "啤酒厂id")
 	private Long factoryBeerId;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/LoginServiceImpl.java

@@ -178,16 +178,30 @@ public class LoginServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> impl
         String token = getToken(userInfo);
         String redisTokenKey = MessageFormat.format("{0}:{1}",TOKEN_KEY,token);
         redisClient.set(redisTokenKey,true,2, TimeUnit.HOURS);
-        redisClient.set(TOKEN_KEY_USER_ID+userInfo.getId(),true,2,TimeUnit.DAYS);
+        redisClient.set(TOKEN_KEY_USER_ID+userInfo.getId(),token,2,TimeUnit.DAYS);
 
         return token;
     }
 
+    /**
+     * 默认密码 123456
+     */
+    private static final String DEFAULT_PASSWORD = "e10adc3949ba59abbe56e057f20f883e";
+
     @Override
     public void resetPassword(ResetPasswordReq req) {
+        //0-校验入参
+        if(req.getPassword()==null && !TrueFalseEnum.TRUE.is(req.getIsDefaultPassword())){
+            throw new BusinessException("密码不能为空");
+        }
+
         UserInfo userInfo = userInfoMapper.selectById(req.getId());
         if (ObjectUtil.isNotEmpty(userInfo)) {
-            userInfo.setPassword(req.getPassword());
+            if(TrueFalseEnum.TRUE.is(req.getIsDefaultPassword())){
+                userInfo.setPassword(DEFAULT_PASSWORD);
+            }else{
+                userInfo.setPassword(req.getPassword());
+            }
             userInfoMapper.updateById(userInfo);
             userUtil.releaseUser();
             //删除redis用户token信息