fix import

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/ServletUtils.java

@@ -25,13 +25,13 @@ public class ServletUtils
     public static String getEncoded(String tag)
     {
         String time = String.valueOf(System.currentTimeMillis()/1000);
-        return tag+Integer.valueOf(time.substring(1))+(int)((Math.random()*10));
+        return tag+Integer.valueOf(time.substring(1))+(int)((Math.random()*100));
     }
     //导入生成编号使用
     public static String getImportEncoded(String tag)
     {
         String time = String.valueOf(System.currentTimeMillis()/1000);
-        return tag+Integer.valueOf(time.substring(2));
+        return tag+Integer.valueOf(time.substring(2))+(int)((Math.random()*100));
     }
     /**
      * 获取String参数

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

@@ -847,11 +847,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         LambdaQueryWrapper<User> queryWrapper =new LambdaQueryWrapper<User>();
         User user = getOne(new LambdaQueryWrapper<User>().eq(User::getUserId, bo.getUserId()));
         if(Validator.isEmpty(user)){
-            throw new BaseException("用户不存在");
+            throw new BaseException("用户信息错误");
         }
         if (!SecurityUtils.matchesPassword(bo.getOldPwd(),user.getPassword() ))
         {
-            throw new BaseException("密码错误");
+            throw new BaseException("用户信息错误");
         }
         if (Validator.isEmpty(bo.getNewPwd()))
         {
@@ -993,6 +993,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if(!code.equals(bo.getCode())){
             throw new CustomException("验证码错误");
         }
+        redisCache.deleteObject(key);
         User user = getOne(new LambdaQueryWrapper<User>()
                 .eq(User::getTelphone,bo.getTel()).last("limit 1"));
         if(Validator.isEmpty(user)){
@@ -1016,6 +1017,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if(!code.equals(bo.getCode())){
             throw new CustomException("验证码错误");
         }
+        redisCache.deleteObject(key);
         User user = getOne(new LambdaQueryWrapper<User>()
                 .eq(User::getTelphone,bo.getTel()).last("limit 1"));
         if(Validator.isEmpty(user)){
@@ -1048,6 +1050,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if(!code.equals(bo.getCode())){
             throw new CustomException("验证码错误");
         }
+        redisCache.deleteObject(key);
         User user = getOne(new LambdaQueryWrapper<User>()
                 .eq(User::getTelphone,bo.getTel()).last("limit 1"));
         if(Validator.isNotEmpty(user)){
@@ -1102,7 +1105,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }
         if (!SecurityUtils.matchesPassword(password,user.getPassword()))
         {
-            throw new BaseException("密码错误");
+            throw new BaseException("用户信息错误");
         }
         //如果活动分销码变动
         if (StringUtils.isNotBlank(bo.getShareActivityCode())){