🐣发布 4.3.0 正式版

2026-03-18 11:38:49 +08:00 · 2022-09-13 16:31:26 +08:00
parent c5f4dec559
commit ee48cd7d01
223 changed files with 3353 additions and 2325 deletions
--- a/ruoyi/src/main/resources/application-dev.yml
+++ b/ruoyi/src/main/resources/application-dev.yml
@@ -138,6 +138,8 @@ spring:
    ssl: false

 redisson:
+  # redis key前缀
+  keyPrefix:
  # 线程池数量
  threads: 4
  # Netty线程池数量
--- a/ruoyi/src/main/resources/application-prod.yml
+++ b/ruoyi/src/main/resources/application-prod.yml
@@ -5,7 +5,7 @@ spring.servlet.multipart.location: /ruoyi/server/temp
 spring.boot.admin.client:
  # 增加客户端开关
  enabled: true
-  url: http://172.30.0.90:9090/admin
+  url: http://localhost:9090/admin
  instance:
    service-host-type: IP
  username: ruoyi
@@ -16,7 +16,7 @@ xxl.job:
  # 执行器开关
  enabled: true
  # 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。
-  admin-addresses: http://172.30.0.92:9100/xxl-job-admin
+  admin-addresses: http://localhost:9100/xxl-job-admin
  # 执行器通讯TOKEN：非空时启用
  access-token: xxl-job
  executor:
@@ -51,7 +51,7 @@ spring:
          driverClassName: com.mysql.cj.jdbc.Driver
          # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
          # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://172.30.0.36:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
          username: root
          password: root
        # 从库数据源
@@ -63,19 +63,19 @@ spring:
          password:
 #        oracle:
 #          driverClassName: oracle.jdbc.OracleDriver
-#          url: jdbc:oracle:thin:@//172.30.0.36:1521/XE
+#          url: jdbc:oracle:thin:@//localhost:1521/XE
 #          username: ROOT
 #          password: root
 #          druid:
 #            validationQuery: SELECT 1 FROM DUAL
 #        postgres:
 #          driverClassName: org.postgresql.Driver
-#          url: jdbc:postgresql://172.30.0.36:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
+#          url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
 #          username: root
 #          password: root
 #        sqlserver:
 #          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#          url: jdbc:sqlserver://172.30.0.36:1433;DatabaseName=tempdb;SelectMethod=cursor;rewriteBatchedStatements=true
+#          url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;rewriteBatchedStatements=true
 #          username: SA
 #          password: root
      druid:
@@ -128,7 +128,7 @@ spring.datasource.druid:
 spring:
  redis:
    # 地址
-    host: 172.30.0.48
+    host: localhost
    # 端口，默认为6379
    port: 6379
    # 数据库索引
@@ -141,6 +141,8 @@ spring:
    ssl: false

 redisson:
+  # redis key前缀
+  keyPrefix:
  # 线程池数量
  threads: 16
  # Netty线程池数量
--- a/ruoyi/src/main/resources/application.yml
+++ b/ruoyi/src/main/resources/application.yml
@@ -53,6 +53,14 @@ logging:
    org.springframework: warn
  config: classpath:logback.xml

+# 用户配置
+user:
+  password:
+    # 密码最大错误次数
+    maxRetryCount: 5
+    # 密码锁定时间（默认10分钟）
+    lockTime: 10
+
 # Spring配置
 spring:
  application:
@@ -75,10 +83,6 @@ spring:
    restart:
      # 热部署开关
      enabled: true
-  mvc:
-    pathmatch:
-      # 适配 boot 2.6 路由与 springfox 兼容
-      matching-strategy: ANT_PATH_MATCHER
  jackson:
    # 日期格式化
    date-format: yyyy-MM-dd HH:mm:ss
@@ -125,10 +129,8 @@ security:
    - /**/*.js
    # swagger 文档配置
    - /favicon.ico
-    - /doc.html
-    - /swagger-resources/**
-    - /webjars/**
    - /*/api-docs
+    - /*/api-docs/**
    # druid 监控配置
    - /druid/**
    # actuator 监控配置
@@ -183,46 +185,35 @@ mybatis-plus:
 swagger:
  # 是否开启swagger
  enabled: true
-  # 请求前缀
-  pathMapping: /dev-api
-  # 标题
-  title: '标题：${ruoyi.name}后台管理系统_接口文档'
-  # 描述
-  description: '描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...'
-  # 版本
-  version: '版本号: ${ruoyi-vue-plus.version}'
-  # 作者信息
-  contact:
-    name: Lion Li
-    email: crazylionli@163.com
-    url: https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
-  groups:
-    - name: 1.演示案例
-      basePackage: com.ruoyi.demo
-    - name: 2.系统模块
-      basePackage: com.ruoyi.web
-    - name: 3.代码生成模块
-      basePackage: com.ruoyi.generator
+  info:
+    # 标题
+    title: '标题：${ruoyi.name}后台管理系统_接口文档'
+    # 描述
+    description: '描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...'
+    # 版本
+    version: '版本号: ${ruoyi-vue-plus.version}'
+    # 作者信息
+    contact:
+      name: Lion Li
+      email: crazylionli@163.com
+      url: https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
+  components:
+    # 鉴权方式配置
+    security-schemes:
+      apiKey:
+        type: APIKEY
+        in: HEADER
+        name: ${sa-token.token-name}

-knife4j:
-  # 是否开启Knife4j增强模式
-  enable: true
-  # 是否开启生产环境保护策略
-  production: @knife4j.production@
-  basic:
-    enable: true
-    username: ruoyi
-    password: 123456
-  # 前端Ui的个性化配置属性
-  setting:
-    # 默认语言
-    language: zh-CN
-    # 是否显示Footer
-    enableFooter: false
-    # 是否开启动态参数调试功能
-    enableDynamicParameter: true
-    # 是否在每个Debug调试栏后显示刷新变量按钮
-    enableReloadCacheParameter: true
+springdoc:
+  #这里定义了两个分组，可定义多个，也可以不定义
+  group-configs:
+    - group: 1.演示模块
+      packages-to-scan: com.ruoyi.demo
+    - group: 2.系统模块
+      packages-to-scan: com.ruoyi.web
+    - group: 3.代码生成模块
+      packages-to-scan: com.ruoyi.generator

 # 防止XSS攻击
 xss:
@@ -242,26 +233,11 @@ thread-pool:
  # 线程池维护线程所允许的空闲时间
  keepAliveSeconds: 300

--- # redisson 缓存配置
-redisson:
-  cacheGroup:
-    # 用例: @Cacheable(cacheNames="groupId", key="#XXX") 方可使用缓存组配置
-    - groupId: redissonCacheMap
-      # 组过期时间(脚本监控)
-      ttl: 60000
-      # 组最大空闲时间(脚本监控)
-      maxIdleTime: 60000
-      # 组最大长度
-      maxSize: 0
-    - groupId: testCache
-      ttl: 1000
-      maxIdleTime: 500
-
 --- # 分布式锁 lock4j 全局配置
 lock4j:
  # 获取分布式锁超时时间，默认为 3000 毫秒
  acquire-timeout: 3000
-  # 分布式锁的超时时间，默认为 30 毫秒
+  # 分布式锁的超时时间，默认为 30 秒
  expire: 30000

 --- # Actuator 监控端点的配置项
@@ -269,9 +245,9 @@ management:
  endpoints:
    web:
      exposure:
-        # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。
-        # 生产环境不建议放开所有 根据项目需求放开即可
-        include: @endpoints.include@
+        include: '*'
  endpoint:
+    health:
+      show-details: ALWAYS
    logfile:
      external-file: ./logs/sys-console.log
--- a/ruoyi/src/main/resources/i18n/messages.properties
+++ b/ruoyi/src/main/resources/i18n/messages.properties
@@ -5,7 +5,7 @@ user.jcaptcha.expire=验证码已失效
 user.not.exists=对不起, 您的账号：{0} 不存在.
 user.password.not.match=用户不存在/密码错误
 user.password.retry.limit.count=密码输入错误{0}次
-user.password.retry.limit.exceed=密码错误次数过多，帐户锁定{0}分钟
+user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定{1}分钟
 user.password.delete=对不起，您的账号：{0} 已被删除
 user.blocked=对不起，您的账号：{0} 已禁用，请联系管理员
 role.blocked=角色已封禁，请联系管理员
@@ -41,5 +41,5 @@ repeat.submit.message=不允许重复提交，请稍候再试
 rate.limiter.message=访问过于频繁，请稍候再试
 sms.code.not.blank=短信验证码不能为空
 sms.code.retry.limit.count=短信验证码输入错误{0}次
-sms.code.retry.limit.exceed=短信验证码错误次数过多，帐户锁定{0}分钟
+sms.code.retry.limit.exceed=短信验证码输入错误{0}次，帐户锁定{0}分钟
 xcx.code.not.blank=小程序code不能为空
--- a/ruoyi/src/main/resources/i18n/messages_en_US.properties
+++ b/ruoyi/src/main/resources/i18n/messages_en_US.properties
@@ -5,7 +5,7 @@ user.jcaptcha.expire=Captcha invalid
 user.not.exists=Sorry, your account: {0} does not exist
 user.password.not.match=User does not exist/Password error
 user.password.retry.limit.count=Password input error {0} times
-user.password.retry.limit.exceed=Too many password errors, account locked for {0} minutes
+user.password.retry.limit.exceed=Password input error {0} times, account locked for {1} minutes
 user.password.delete=Sorry, your account：{0} has been deleted
 user.blocked=Sorry, your account: {0} has been disabled. Please contact the administrator
 role.blocked=Role disabled，please contact administrators
@@ -41,5 +41,5 @@ repeat.submit.message=Repeat submit is not allowed, please try again later
 rate.limiter.message=Visit too frequently, please try again later
 sms.code.not.blank=Sms code cannot be blank
 sms.code.retry.limit.count=Sms code input error {0} times
-sms.code.retry.limit.exceed=Too many sms code errors, account locked for {0} minutes
+sms.code.retry.limit.exceed=Sms code input error {0} times, account locked for {0} minutes
 xcx.code.not.blank=Mini program code cannot be blank
--- a/ruoyi/src/main/resources/i18n/messages_zh_CN.properties
+++ b/ruoyi/src/main/resources/i18n/messages_zh_CN.properties
@@ -5,7 +5,7 @@ user.jcaptcha.expire=验证码已失效
 user.not.exists=对不起, 您的账号：{0} 不存在.
 user.password.not.match=用户不存在/密码错误
 user.password.retry.limit.count=密码输入错误{0}次
-user.password.retry.limit.exceed=密码错误次数过多，帐户锁定{0}分钟
+user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定{1}分钟
 user.password.delete=对不起，您的账号：{0} 已被删除
 user.blocked=对不起，您的账号：{0} 已禁用，请联系管理员
 role.blocked=角色已封禁，请联系管理员
@@ -41,5 +41,5 @@ repeat.submit.message=不允许重复提交，请稍候再试
 rate.limiter.message=访问过于频繁，请稍候再试
 sms.code.not.blank=短信验证码不能为空
 sms.code.retry.limit.count=短信验证码输入错误{0}次
-sms.code.retry.limit.exceed=短信验证码错误次数过多，帐户锁定{0}分钟
+sms.code.retry.limit.exceed=短信验证码输入错误{0}次，帐户锁定{0}分钟
 xcx.code.not.blank=小程序code不能为空
--- a/ruoyi/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -95,4 +95,11 @@
          and sur.user_id = #{userId}
    </select>

+    <select id="selectMenuPermsByRoleId" parameterType="Long" resultType="String">
+        select distinct m.perms
+        from sys_menu m
+                 left join sys_role_menu rm on m.menu_id = rm.menu_id
+        where m.status = '0' and rm.role_id = #{roleId}
+    </select>
+
 </mapper>
--- a/ruoyi/src/main/resources/vm/java/bo.java.vm
+++ b/ruoyi/src/main/resources/vm/java/bo.java.vm
@@ -2,8 +2,6 @@ package ${packageName}.domain.bo;

 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import javax.validation.constraints.*;
@@ -33,7 +31,6 @@ import com.ruoyi.common.core.domain.TreeEntity;

@Data
@EqualsAndHashCode(callSuper = true)
-@ApiModel("${functionName}业务对象")
 public class ${ClassName}Bo extends ${Entity} {

 #foreach ($column in $columns)
@@ -49,14 +46,11 @@ public class ${ClassName}Bo extends ${Entity} {
 #set($Group="EditGroup.class")
 #end
 #if($column.isRequired == 1)
-    @ApiModelProperty(value = "$column.columnComment", required = true)
 #if($column.javaType == 'String')
    @NotBlank(message = "$column.columnComment不能为空", groups = { $Group })
 #else
    @NotNull(message = "$column.columnComment不能为空", groups = { $Group })
 #end
-#else
-    @ApiModelProperty(value = "$column.columnComment")
 #end
    private $column.javaType $column.javaField;

--- a/ruoyi/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi/src/main/resources/vm/java/controller.java.vm
@@ -27,18 +27,14 @@ import ${packageName}.service.I${ClassName}Service;
 import com.ruoyi.common.core.page.TableDataInfo;
 #elseif($table.tree)
 #end
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiOperation;

 /**
- * ${functionName}Controller
+ * ${functionName}
 *
 * @author ${author}
 * @date ${datetime}
 */
@Validated
-@Api(value = "${functionName}控制器", tags = {"${functionName}管理"})
@RequiredArgsConstructor
@RestController
@RequestMapping("/${moduleName}/${businessName}")
@@ -49,7 +45,6 @@ public class ${ClassName}Controller extends BaseController {
    /**
     * 查询${functionName}列表
     */
-    @ApiOperation("查询${functionName}列表")
    @SaCheckPermission("${permissionPrefix}:list")
    @GetMapping("/list")
 #if($table.crud || $table.sub)
@@ -66,7 +61,6 @@ public class ${ClassName}Controller extends BaseController {
    /**
     * 导出${functionName}列表
     */
-    @ApiOperation("导出${functionName}列表")
    @SaCheckPermission("${permissionPrefix}:export")
    @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
@@ -77,20 +71,19 @@ public class ${ClassName}Controller extends BaseController {

    /**
     * 获取${functionName}详细信息
+     *
+     * @param ${pkColumn.javaField} 主键
     */
-    @ApiOperation("获取${functionName}详细信息")
    @SaCheckPermission("${permissionPrefix}:query")
    @GetMapping("/{${pkColumn.javaField}}")
-    public R<${ClassName}Vo> getInfo(@ApiParam("主键")
-                                     @NotNull(message = "主键不能为空")
-                                     @PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) {
+    public R<${ClassName}Vo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable ${pkColumn.javaType} ${pkColumn.javaField}) {
        return R.ok(i${ClassName}Service.queryById(${pkColumn.javaField}));
    }

    /**
     * 新增${functionName}
     */
-    @ApiOperation("新增${functionName}")
    @SaCheckPermission("${permissionPrefix}:add")
    @Log(title = "${functionName}", businessType = BusinessType.INSERT)
    @RepeatSubmit()
@@ -102,7 +95,6 @@ public class ${ClassName}Controller extends BaseController {
    /**
     * 修改${functionName}
     */
-    @ApiOperation("修改${functionName}")
    @SaCheckPermission("${permissionPrefix}:edit")
    @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
    @RepeatSubmit()
@@ -113,14 +105,14 @@ public class ${ClassName}Controller extends BaseController {

    /**
     * 删除${functionName}
+     *
+     * @param ${pkColumn.javaField}s 主键串
     */
-    @ApiOperation("删除${functionName}")
    @SaCheckPermission("${permissionPrefix}:remove")
    @Log(title = "${functionName}", businessType = BusinessType.DELETE)
    @DeleteMapping("/{${pkColumn.javaField}s}")
-    public R<Void> remove(@ApiParam("主键串")
-                                       @NotEmpty(message = "主键不能为空")
-                                       @PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) {
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) {
        return toAjax(i${ClassName}Service.deleteWithValidByIds(Arrays.asList(${pkColumn.javaField}s), true) ? 1 : 0);
    }
 }
--- a/ruoyi/src/main/resources/vm/java/service.java.vm
+++ b/ruoyi/src/main/resources/vm/java/service.java.vm
@@ -37,7 +37,7 @@ public interface I${ClassName}Service {
    List<${ClassName}Vo> queryList(${ClassName}Bo bo);

    /**
-     * 修改${functionName}
+     * 新增${functionName}
     */
    Boolean insertByBo(${ClassName}Bo bo);

--- a/ruoyi/src/main/resources/vm/java/vo.java.vm
+++ b/ruoyi/src/main/resources/vm/java/vo.java.vm
@@ -7,8 +7,6 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.util.Date;

@@ -21,7 +19,6 @@ import java.util.Date;
 * @date ${datetime}
 */
@Data
-@ApiModel("${functionName}视图对象")
@ExcelIgnoreUnannotated
 public class ${ClassName}Vo {

@@ -47,7 +44,6 @@ public class ${ClassName}Vo {
 #else
    @ExcelProperty(value = "${comment}")
 #end
-    @ApiModelProperty("$column.columnComment")
    private $column.javaType $column.javaField;

 #end
--- a/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
@@ -504,6 +504,7 @@ export default {
        this.loading = false;
        this.getList();
        this.#[[$modal]]#.msgSuccess("删除成功");
+      }).catch(() => {
      }).finally(() => {
        this.loading = false;
      });
--- a/ruoyi/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi/src/main/resources/vm/vue/index.vue.vm
@@ -561,6 +561,7 @@ export default {
        this.loading = false;
        this.getList();
        this.#[[$modal]]#.msgSuccess("删除成功");
+      }).catch(() => {
      }).finally(() => {
        this.loading = false;
      });
--- a/ruoyi/src/main/resources/vm/vue/v3/index-tree.vue.vm
+++ b/ruoyi/src/main/resources/vm/vue/v3/index-tree.vue.vm
@@ -487,6 +487,7 @@ function handleDelete(row) {
    loading.value = false;
    getList();
    proxy.#[[$modal]]#.msgSuccess("删除成功");
+  }).catch(() => {
  }).finally(() => {
    loading.value = false;
  });
--- a/ruoyi/src/main/resources/vm/vue/v3/index.vue.vm
+++ b/ruoyi/src/main/resources/vm/vue/v3/index.vue.vm
@@ -492,8 +492,8 @@ function handleAdd() {
 function handleUpdate(row) {
  loading.value = true
  reset();
-  const ${pkColumn.javaField} = row.${pkColumn.javaField} || ids.value
-  get${BusinessName}(${pkColumn.javaField}).then(response => {
+  const _${pkColumn.javaField} = row.${pkColumn.javaField} || ids.value
+  get${BusinessName}(_${pkColumn.javaField}).then(response => {
    loading.value = false;
    form.value = response.data;
 #foreach ($column in $columns)
@@ -545,14 +545,15 @@ function submitForm() {

 /** 删除按钮操作 */
 function handleDelete(row) {
-  const ${pkColumn.javaField}s = row.${pkColumn.javaField} || ids.value;
+  const _${pkColumn.javaField}s = row.${pkColumn.javaField} || ids.value;
  proxy.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项？').then(function() {
    loading.value = true;
-    return del${BusinessName}(${pkColumn.javaField}s);
+    return del${BusinessName}(_${pkColumn.javaField}s);
  }).then(() => {
    loading.value = true;
    getList();
    proxy.#[[$modal]]#.msgSuccess("删除成功");
+  }).catch(() => {
  }).finally(() => {
    loading.value = false;
  });