Merge branch 'master' of https://gitee.com/youlaiorg/youlai-boot into feature/noticews

src/main/java/com/youlai/boot/core/security/filter/CaptchaValidationFilter.java

@@ -2,9 +2,12 @@ package com.youlai.boot.core.security.filter;
 
 import cn.hutool.captcha.generator.CodeGenerator;
 import cn.hutool.core.util.StrUtil;
+import com.youlai.boot.common.constant.RedisConstants;
 import com.youlai.boot.common.constant.SecurityConstants;
+import com.youlai.boot.common.constant.SymbolConstant;
 import com.youlai.boot.common.result.ResultCode;
 import com.youlai.boot.common.util.ResponseUtils;
+import com.youlai.boot.system.service.ConfigService;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;

src/main/java/com/youlai/boot/module/auth/controller/AuthController.java

@@ -1,11 +1,13 @@
 package com.youlai.boot.module.auth.controller;
 
+import com.youlai.boot.common.constant.RedisConstants;
 import com.youlai.boot.common.enums.LogModuleEnum;
 import com.youlai.boot.common.result.Result;
 import com.youlai.boot.module.auth.service.AuthService;
 import com.youlai.boot.system.model.dto.CaptchaResult;
 import com.youlai.boot.system.model.dto.LoginResult;
 import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.system.service.ConfigService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -53,5 +55,4 @@ public class AuthController {
         CaptchaResult captcha = authService.getCaptcha();
         return Result.success(captcha);
     }
-
 }

src/main/resources/templates/codegen/index.vue.vm

@@ -100,7 +100,7 @@
         <el-button
             v-hasPerm="['${moduleName}:${lowerFirstEntityName}:delete']"
             type="danger"
-            :disabled="ids.length === 0"
+            :disabled="removeIds.length === 0"
             @click="handleDelete()"
         ><i-ep-delete />
           删除
@@ -255,7 +255,7 @@
   const dataFormRef = ref(ElForm);
 
   const loading = ref(false);
-  const ids = ref<number[]>([]);
+  const removeIds = ref<number[]>([]);
   const total = ref(0);
 
   const queryParams = reactive<${entityName}PageQuery>({
@@ -308,7 +308,7 @@
 
   /** 行复选框选中记录选中ID集合 */
   function handleSelectionChange(selection: any) {
-    ids.value = selection.map((item: any) => item.id);
+    removeIds.value = selection.map((item: any) => item.id);
   }
 
   /** 打开$!{businessName}弹窗 */
@@ -361,7 +361,7 @@
 
   /** 删除$!{businessName} */
   function handleDelete(id?: number) {
-    const ids = [id || ids.value].join(",");
+    const ids = [id || removeIds.value].join(",");
     if (!ids) {
       ElMessage.warning("请勾选删除项");
       return;