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

2023-08-31 18:30:06 +08:00
parent 9d272406c5 7b59d05950
commit b6fefb5c17
11 changed files with 65 additions and 24 deletions
--- a/sql/youlai_boot.sql
+++ b/sql/youlai_boot.sql
@@ -153,6 +153,16 @@ INSERT INTO `sys_menu` VALUES (85, 6, '0,1,6', '字典数据新增', 4, '', NULL
 INSERT INTO `sys_menu` VALUES (86, 6, '0,1,6', '字典数据编辑', 4, '', NULL, 'sys:dict:edit', 1, 5, '', NULL, '2023-05-21 00:47:36', '2023-05-21 00:47:36');
 INSERT INTO `sys_menu` VALUES (87, 6, '0,1,6', '字典数据删除', 4, '', NULL, 'sys:dict:delete', 1, 6, '', NULL, '2023-05-21 00:48:10', '2023-05-21 00:48:20');
 INSERT INTO `sys_menu` VALUES (88, 2, '0,1,2', '重置密码', 4, '', NULL, 'sys:user:reset_pwd', 1, 4, '', NULL, '2023-05-21 00:49:18', '2023-05-21 00:49:18');
+INSERT INTO `sys_menu` VALUES (89, 0, '0', '功能演示', 2, '/function', 'Layout', NULL, 1, 11, 'menu', '', '2022-10-31 09:18:44', '2022-10-31 09:18:47');
+INSERT INTO `sys_menu` VALUES (90, 89, '0,89', 'Websocket', 1, 'websocket', 'demo/websocket', NULL, 1, 3, '', '', '2022-11-20 23:16:30', '2022-11-20 23:16:32');
+INSERT INTO `sys_menu` VALUES (91, 89, '0,89', '敬请期待...', 2, 'other', 'demo/other', NULL, 1, 4, '', '', '2022-11-20 23:16:30', '2022-11-20 23:16:32');
+INSERT INTO `sys_menu` VALUES (92, 36, '0,36', '标签输入框', 1, 'taginput', 'demo/taginput', NULL, 1, 5, '', '', '2022-11-20 23:16:30', '2022-11-20 23:16:32');
+INSERT INTO `sys_menu` VALUES (93, 36, '0,36', '签名', 1, 'signature', 'demo/signature', NULL, 1, 6, '', '', '2022-11-20 23:16:30', '2022-11-20 23:16:32');
+INSERT INTO `sys_menu` VALUES (94, 36, '0,36', '表格', 1, 'table', 'demo/table', NULL, 1, 7, '', '', '2022-11-20 23:16:30', '2022-11-20 23:16:32');
+INSERT INTO `sys_menu` VALUES (95, 36, '0,36', '字典组件', 1, 'dict-demo', 'demo/dict', NULL, 1, 4, '', '', '2022-11-20 23:16:30', '2022-11-20 23:16:32');
+INSERT INTO `sys_menu` VALUES (96, 89, '0,89', 'Permission', 1, 'permission', 'demo/permission/page', NULL, 1, 1, '', '', '2022-11-20 23:16:30', '2022-11-20 23:16:32');
+INSERT INTO `sys_menu` VALUES (97, 89, '0,89', 'Icons', 1, 'icon-demo', 'demo/icons', NULL, 1, 2, '', '', '2022-11-20 23:16:30', '2022-11-20 23:16:32');
+INSERT INTO `sys_menu` VALUES (102, 26, '0,26', '平台文档(内嵌)', 3, 'internal-doc', 'demo/internal-doc', NULL, 1, 1, 'document', '', '2022-02-18 00:01:40', '2022-02-18 00:01:40');

 -- ----------------------------
 -- Table structure for sys_role
@@ -273,6 +283,18 @@ INSERT INTO `sys_role_menu` VALUES (2, 85);
 INSERT INTO `sys_role_menu` VALUES (2, 86);
 INSERT INTO `sys_role_menu` VALUES (2, 87);
 INSERT INTO `sys_role_menu` VALUES (2, 88);
+INSERT INTO `youlai_boot`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 89);
+INSERT INTO `youlai_boot`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 90);
+INSERT INTO `youlai_boot`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 91);
+INSERT INTO `youlai_boot`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 92);
+INSERT INTO `youlai_boot`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 93);
+INSERT INTO `youlai_boot`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 94);
+INSERT INTO `youlai_boot`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 95);
+INSERT INTO `youlai_boot`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 96);
+INSERT INTO `youlai_boot`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 97);
+INSERT INTO `youlai_boot`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 102);
+
+

 -- ----------------------------
 -- Table structure for sys_user
--- a/src/main/java/com/youlai/system/aspect/DuplicateSubmitAspect.java
+++ b/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
--- a/src/main/java/com/youlai/system/common/annotation/DataPermission.java
+++ b/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)
--- a/src/main/java/com/youlai/system/common/constant/ExcelConstants.java
+++ b/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 {

--- a/src/main/java/com/youlai/system/common/constant/SecurityConstants.java
+++ b/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 {

--- a/src/main/java/com/youlai/system/common/constant/SystemConstants.java
+++ b/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 {

--- a/src/main/java/com/youlai/system/common/enums/DataScopeEnum.java
+++ b/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> {

--- a/src/main/java/com/youlai/system/controller/SysDictController.java
+++ b/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);
--- a/src/main/java/com/youlai/system/security/JwtTokenManager.java
+++ b/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
--- a/src/main/java/com/youlai/system/security/captcha/EasyCaptchaProducer.java
+++ b/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 {
--- a/src/main/resources/application-prod.yml
+++ b/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