Merge branch 'system-zyj' of uskycloud/usky-cloud into master

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SendSmsController.java

@@ -42,7 +42,7 @@ public class SendSmsController {
     public ApiResult<Void> noteSending(@RequestParam String phone) {
         DefaultProfile profile = DefaultProfile.getProfile("cn-beijing", "LTAI9WERPIFIlHDg", "p7SQ0rYpraebcdoJ0l3tOtYmmgrR4q");
         String code = String.valueOf(new Random().nextInt(1000000));
-        redisHelper.set("Verify",code);
+        redisHelper.set(phone,code,300,TimeUnit.SECONDS);//key为手机号，value为验证码存储
         IAcsClient client = new DefaultAcsClient(profile);
         SendSmsRequest request = new SendSmsRequest();
         request.setPhoneNumbers(phone);//接收短信的手机号码

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/SysLoginService.java

@@ -156,7 +156,7 @@ public class SysLoginService {
             if (StringUtils.isBlank(verify)) {
                 throw new BusinessException("验证码不能为空");
             }
-            if (!verify.equals(redisHelper.get("Verify"))) {
+            if (!verify.equals(redisHelper.get(phone))) {
                 throw new BusinessException("验证码错误");
             }
             if (StringUtils.isBlank(phone)) {

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/HceCategoryServiceImpl.java

@@ -66,13 +66,17 @@ public class HceCategoryServiceImpl extends AbstractCrudService<HceCategoryMappe
 
     public void add(HceCategory hceCategory){
         LambdaQueryWrapper<HceCategory> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(HceCategory::getStatus,1)
-                .eq(HceCategory::getPid,hceCategory.getPid())
-                .eq(HceCategory::getCategoryName,hceCategory.getCategoryName());
+        queryWrapper.eq(HceCategory::getCategoryName,hceCategory.getCategoryName());
         List<HceCategory> list = this.list(queryWrapper);
         if(list.size() > 0){
             throw new BusinessException("栏目名称重复，请重新填写栏目名称");
         }
+        LambdaQueryWrapper<HceCategory> queryWrapper1 = Wrappers.lambdaQuery();
+        queryWrapper1.eq(HceCategory::getMenuId,hceCategory.getMenuId());
+        List<HceCategory> list1 = this.list(queryWrapper1);
+        if(list1.size() > 0){
+            throw new BusinessException("关联菜单名称重复");
+        }
         hceCategory.setCreatedate(LocalDateTime.now());
         hceCategory.setStatus(1);
         this.save(hceCategory);
@@ -80,14 +84,19 @@ public class HceCategoryServiceImpl extends AbstractCrudService<HceCategoryMappe
 
     public void update(HceCategory hceCategory){
         LambdaQueryWrapper<HceCategory> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(HceCategory::getStatus,1)
-                .eq(HceCategory::getPid,hceCategory.getPid())
-                .eq(HceCategory::getCategoryName,hceCategory.getCategoryName())
+        queryWrapper.eq(HceCategory::getCategoryName,hceCategory.getCategoryName())
                 .ne(HceCategory::getId,hceCategory.getId());
         List<HceCategory> list = this.list(queryWrapper);
         if(list.size() > 0){
             throw new BusinessException("栏目名称重复，请重新填写栏目名称");
         }
+        LambdaQueryWrapper<HceCategory> queryWrapper1 = Wrappers.lambdaQuery();
+        queryWrapper1.eq(HceCategory::getMenuId,hceCategory.getMenuId())
+                .ne(HceCategory::getId,hceCategory.getId());
+        List<HceCategory> list1 = this.list(queryWrapper1);
+        if(list1.size() > 0){
+            throw new BusinessException("关联菜单名称重复");
+        }
         hceCategory.setModifydate(LocalDateTime.now());
         this.updateById(hceCategory);
     }