bug修复

zd-auth/src/main/java/com/zd/auth/controller/TokenController.java

@@ -183,6 +183,18 @@ public class TokenController {
         String code = RandomUtil.randomNumbers(6);
         redisTemplate.opsForValue().set(key,code,CODE_EXPIRATION,TimeUnit.MINUTES);
         logger.info("========================>{}<=========================",code);
+        String countKey=Constants.DEFAULT_CODE_KEY + "@" + username+"_COUNT";
+        String count = redisTemplate.opsForValue().get(countKey);
+        if (StringUtils.isEmpty(count)){
+            redisTemplate.opsForValue().set(countKey,"1",60,TimeUnit.MINUTES);
+        }else {
+            int i=Integer.parseInt(count);
+            if (i>=5){
+                throw new ServiceException("验证码发送超过限制，请一小时后再试",530);
+            }
+            i++;
+            redisTemplate.opsForValue().set(countKey,i+"",60,TimeUnit.MINUTES);
+        }
         return R.ok(code);
 //        return stockService.sendSydSms(code, 2, null, form.getUsername());
     }
@@ -227,7 +239,7 @@ public class TokenController {
         if (R.FAIL == user.getCode()) {
             throw new ServiceException(user.getMsg());
         }
-        if (StringUtils.isNull(user) || StringUtils.isNull(user.getData())) {
+        if (StringUtils.isNull(user.getData())) {
             return R.fail("登录用户不存在！");
         }
 

zd-common/zd-common-core/src/main/java/com/zd/common/core/constant/Constants.java

@@ -181,5 +181,5 @@ public class Constants {
     /**
      * 手机登录验证码有效期（分钟）
      */
-    public static final long CODE_EXPIRATION = 15;
+    public static final long CODE_EXPIRATION = 5;
 }

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysUserController.java

@@ -19,6 +19,7 @@ import com.zd.common.core.utils.file.ImageUtils;
 import com.zd.common.security.utils.DictUtils;
 import com.zd.system.api.RemoteDeptService;
 import com.zd.system.api.RemoteFileService;
+import com.zd.system.api.chemical.RemoteStockService;
 import com.zd.system.api.domain.*;
 import com.zd.system.api.laboratory.RemoteSubQueryService;
 import com.zd.system.api.model.SimpleUserVO;
@@ -86,6 +87,9 @@ public class SysUserController extends BaseController {
     @Resource
     private RedisTemplate<String, String> redisTemplate;
 
+    @Resource
+    private RemoteStockService stockService;
+
 
     /**
      * 获取用户列表 "system:user:list"
@@ -728,8 +732,7 @@ public class SysUserController extends BaseController {
         String code = RandomUtil.randomNumbers(6);
         redisTemplate.opsForValue().set(key, code, CODE_EXPIRATION, TimeUnit.MINUTES);
         logger.info("========================>{}<=========================", code);
-        return R.ok(code);
-//        return stockService.sendSydSms(code, 2, null, form.getUsername());
+        return stockService.sendSydSms(code, 2, null, phone);
     }
 
     /**