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

src/main/java/com/youlai/system/aspect/DuplicateSubmitAspect.java

@@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit;
  * 处理重复提交的切面
  *
  * @author haoxr
- * @since 2023/05/09
+ * @since 3.0.0
  */
 @Aspect
 @Component

src/main/java/com/youlai/system/common/annotation/DataPermission.java

@@ -5,10 +5,10 @@ import java.lang.annotation.*;
 /**
  * MP数据权限注解
  * <p>
- * https://gitee.com/baomidou/mybatis-plus/issues/I37I90
  *
- * @author <a href="mailto:2256222053@qq.com">zc</a>
- * @since 2021-12-10
+ * @author zc
+ * @link https://gitee.com/baomidou/mybatis-plus/issues/I37I90
+ * @since 2.0.0
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)

src/main/java/com/youlai/system/common/constant/ExcelConstants.java

@@ -4,7 +4,7 @@ package com.youlai.system.common.constant;
  * Excel 常量
  *
  * @author haoxr
- * @since 2023/03/24
+ * @since 3.0.0
  */
 public interface ExcelConstants {
 

src/main/java/com/youlai/system/common/constant/SecurityConstants.java

@@ -4,7 +4,7 @@ package com.youlai.system.common.constant;
  * Security 常量
  *
  * @author haoxr
- * @since 2023/03/24
+ * @since 3.0.0
  */
 public interface SecurityConstants {
 

src/main/java/com/youlai/system/common/constant/SystemConstants.java

@@ -4,7 +4,7 @@ package com.youlai.system.common.constant;
  * 系统常量
  *
  * @author haoxr
- * @since  2022/10/22
+ * @since 1.0.0
  */
 public interface SystemConstants {
 

src/main/java/com/youlai/system/common/enums/DataScopeEnum.java

@@ -7,7 +7,7 @@ import lombok.Getter;
  * 数据权限枚举
  *
  * @author haoxr
- * @since 2022/10/14
+ * @since 2.3.0
  */
 public enum DataScopeEnum implements IBaseEnum<Integer> {
 

src/main/java/com/youlai/system/controller/SysDictController.java

@@ -86,9 +86,9 @@ public class SysDictController {
 
 
     @Operation(summary = "字典下拉列表", security = {@SecurityRequirement(name = "Authorization")})
-    @GetMapping("/options")
+    @GetMapping("/{typeCode}/options")
     public Result<List<Option>> listDictOptions(
-            @Parameter(description ="字典类型编码") @RequestParam String typeCode
+            @Parameter(description ="字典类型编码") @PathVariable String typeCode
     ) {
         List<Option> list = dictService.listDictOptions(typeCode);
         return Result.success(list);

src/main/java/com/youlai/system/security/JwtTokenManager.java

@@ -25,7 +25,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
- * JWT token manager
+ * JWT token 管理器
  *
  * @author haoxr
  * @since 2022/10/22

src/main/java/com/youlai/system/security/captcha/EasyCaptchaProducer.java

@@ -14,7 +14,6 @@ import java.awt.*;
  * @author haoxr
  * @since 2023/03/24
  */
-
 @Component
 @RequiredArgsConstructor
 public class EasyCaptchaProducer {

src/main/resources/application-prod.yml

@@ -48,14 +48,31 @@ auth:
     ttl: 18000
 
 
-# MinIO 分布式文件系统
-minio:
-  endpoint: http://www.youlai.tech:9000
-  access-key: minioadmin
-  secret-key: youlaitech
-  bucket-name: youlai-boot
-  # 自定义域名(非必须)，Nginx配置反向代理转发文件路径
-  custom-domain: https://oss.youlai.tech
+oss:
+  # OSS 类型 (目前支持aliyun、minio)
+  type: minio
+  # MinIO 对象存储服务
+  minio:
+    # 服务Endpoint
+    endpoint: http://www.youlai.tech:9000
+    # 访问凭据
+    access-key: minioadmin
+    # 凭据密钥
+    secret-key: youlaitech
+    # 存储桶名称
+    bucket-name: youlai-boot
+    # (可选)自定义域名，如果配置了域名，生成的文件URL是域名格式，未配置则URL则是IP格式 (eg: https://oss.youlai.tech)
+    custom-domain: https://oss.youlai.tech
+  # 阿里云OSS对象存储服务
+  aliyun:
+    # 服务Endpoint
+    endpoint: oss-cn-hangzhou.aliyuncs.com
+    # 访问凭据
+    access-key-id: your-access-key-id
+    # 凭据密钥
+    access-key-secret: your-access-key-secret
+    # 存储桶名称
+    bucket-name: default
 
 # 接口文档
 springdoc:
@@ -90,8 +107,11 @@ xxl:
       logretentiondays: 30
 
 # 系统配置
-system-config:
-  # 数据权限配置
-  data-permission:
+system:
+  config:
     # 数据权限开关
-    enabled: true
+    data-permission-enabled: true
+    # 定时任务 xxl-job 开关
+    xxl-job-enabled: false
+    # WebSocket 开关
+    websocket-enabled: true