Browse Source

1、共享租户、补充租户权限逻辑
2、修复课程分页bug

liyanbo 7 months ago
parent
commit
375e84ac1e
15 changed files with 104 additions and 139 deletions
  1. 3 0
      byzs-course/src/main/java/cn/iocoder/byzs/module/bjdx/controller/admin/course/vo/CoursePageReqVO.java
  2. 3 0
      byzs-course/src/main/java/cn/iocoder/byzs/module/bjdx/controller/admin/courseconfig/vo/CourseConfigPageReqVO.java
  3. 3 0
      byzs-course/src/main/java/cn/iocoder/byzs/module/bjdx/controller/admin/coursequestion/vo/CourseQuestionPageReqVO.java
  4. 1 1
      byzs-course/src/main/java/cn/iocoder/byzs/module/bjdx/controller/admin/questionnaire/QuestionnaireController.java
  5. 3 0
      byzs-course/src/main/java/cn/iocoder/byzs/module/bjdx/controller/admin/questionnaire/vo/ConfigQuestionRespVO.java
  6. 1 0
      byzs-course/src/main/java/cn/iocoder/byzs/module/bjdx/dal/mysql/course/CourseMapper.java
  7. 2 3
      byzs-course/src/main/java/cn/iocoder/byzs/module/bjdx/service/course/CourseServiceImpl.java
  8. 3 0
      byzs-course/src/main/java/cn/iocoder/byzs/module/bjdx/service/questionnaire/QuestionnaireServiceImpl.java
  9. 30 3
      byzs-course/src/main/resources/mapper/course/CourseMapper.xml
  10. 1 1
      byzs-course/src/main/resources/mapper/courseconfig/CourseConfigMapper.xml
  11. 4 3
      byzs-course/src/main/resources/mapper/questionnaire/QuestionnaireMapper.xml
  12. 1 33
      byzs-dependencies/pom.xml
  13. 11 17
      byzs-framework/byzs-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/byzs/framework/tenant/core/security/TenantDataSecurityFilter.java
  14. 28 37
      byzs-server/src/main/resources/application-localProd.yaml
  15. 10 41
      byzs-server/src/main/resources/application.yaml

+ 3 - 0
byzs-course/src/main/java/cn/iocoder/byzs/module/bjdx/controller/admin/course/vo/CoursePageReqVO.java

@@ -9,6 +9,9 @@ import cn.iocoder.byzs.framework.common.pojo.PageParam;
 @Data
 public class CoursePageReqVO extends PageParam {
 
+    @Schema(description = "租户编号")
+    private Long tenantId;
+
     @Schema(description = "课程id")
     private Long id;
 

+ 3 - 0
byzs-course/src/main/java/cn/iocoder/byzs/module/bjdx/controller/admin/courseconfig/vo/CourseConfigPageReqVO.java

@@ -8,6 +8,9 @@ import cn.iocoder.byzs.framework.common.pojo.PageParam;
 @Data
 public class CourseConfigPageReqVO extends PageParam {
 
+    @Schema(description = "租户编号")
+    private Long tenantId;
+
     @Schema(description = "课程配置id")
     private Integer id;
 

+ 3 - 0
byzs-course/src/main/java/cn/iocoder/byzs/module/bjdx/controller/admin/coursequestion/vo/CourseQuestionPageReqVO.java

@@ -8,6 +8,9 @@ import cn.iocoder.byzs.framework.common.pojo.PageParam;
 @Data
 public class CourseQuestionPageReqVO extends PageParam {
 
+    @Schema(description = "租户编号")
+    private Long tenantId;
+
     @Schema(description = "试题内容")
     private String cqQuestion;
 

+ 1 - 1
byzs-course/src/main/java/cn/iocoder/byzs/module/bjdx/controller/admin/questionnaire/QuestionnaireController.java

@@ -124,7 +124,7 @@ public class QuestionnaireController {
     }
 
     @GetMapping("/addConfigQuest")
-    @Operation(summary = "获得问卷配置的试题")
+    @Operation(summary = "添加问卷配置的试题")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('bjdx:questionnaire:query')")
     public CommonResult<Boolean> addConfigQuest(@Valid ConfigQuestionRespVO configQuestionRespVO) {

+ 3 - 0
byzs-course/src/main/java/cn/iocoder/byzs/module/bjdx/controller/admin/questionnaire/vo/ConfigQuestionRespVO.java

@@ -13,6 +13,9 @@ import java.util.List;
 @ExcelIgnoreUnannotated
 public class ConfigQuestionRespVO {
 
+    @Schema(description = "租户编号")
+    private Long tenantId;
+
     @Schema(description = "问卷id", requiredMode = Schema.RequiredMode.REQUIRED)
     private Long questionnaireId;
 

+ 1 - 0
byzs-course/src/main/java/cn/iocoder/byzs/module/bjdx/dal/mysql/course/CourseMapper.java

@@ -36,4 +36,5 @@ public interface CourseMapper extends BaseMapperX<CourseDO> {
     }
 
     List<CoursePageReqVO> selectCoursePage(CoursePageReqVO reqVO);
+    List<CoursePageReqVO> selectCourseList(CoursePageReqVO reqVO);
 }

+ 2 - 3
byzs-course/src/main/java/cn/iocoder/byzs/module/bjdx/service/course/CourseServiceImpl.java

@@ -135,7 +135,7 @@ public class CourseServiceImpl implements CourseService {
 
     @Override
     public PageResult<CourseRespVO> getCoursePage(CoursePageReqVO pageReqVO) {
-
+        pageReqVO.setPageNo(pageReqVO.getPageNo() - 1);
         List<CoursePageReqVO> coursePageReqVOS = courseMapper.selectCoursePage(pageReqVO);
 
         // 调用服务层方法获取分页结果
@@ -149,10 +149,9 @@ public class CourseServiceImpl implements CourseService {
 
     @Override
     public List<CoursePageReqVO> getCourseList(CoursePageReqVO pageReqVO) {
-        return courseMapper.selectCoursePage(pageReqVO);
+        return courseMapper.selectCourseList(pageReqVO);
     }
 
-
     /**
      * 获得自身的代理对象,解决 AOP 生效问题
      *

+ 3 - 0
byzs-course/src/main/java/cn/iocoder/byzs/module/bjdx/service/questionnaire/QuestionnaireServiceImpl.java

@@ -3,6 +3,7 @@ package cn.iocoder.byzs.module.bjdx.service.questionnaire;
 import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.byzs.framework.common.pojo.PageResult;
 import cn.iocoder.byzs.framework.common.util.object.BeanUtils;
+import cn.iocoder.byzs.framework.tenant.core.context.TenantContextHolder;
 import cn.iocoder.byzs.module.bjdx.controller.admin.questionnaire.vo.ConfigQuestionRespVO;
 import cn.iocoder.byzs.module.bjdx.controller.admin.questionnaire.vo.QuestionnairePageReqVO;
 import cn.iocoder.byzs.module.bjdx.controller.admin.questionnaire.vo.QuestionnaireSaveReqVO;
@@ -115,6 +116,8 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
 
     @Override
     public void addConfigQuest(ConfigQuestionRespVO configQuestionRespVO) {
+        //填充租户id
+        configQuestionRespVO.setTenantId(TenantContextHolder.getRequiredTenantId());
         questionnaireMapper.addConfigQuest(configQuestionRespVO);
     }
 

+ 30 - 3
byzs-course/src/main/resources/mapper/course/CourseMapper.xml

@@ -5,12 +5,12 @@
     <select id="selectCoursePage" parameterType="cn.iocoder.byzs.module.bjdx.controller.admin.course.vo.CoursePageReqVO"
             resultType="cn.iocoder.byzs.module.bjdx.controller.admin.course.vo.CoursePageReqVO">
 
-        SELECT c.id, c.course_name courseName, c.course_image_path courseImagePath, c.course_music_path courseMusicPath, c.course_video_path courseVideoPath, c.course_content_type courseContentType, c.course_author courseAuthor, c.course_teacher courseTeacher, c.course_size courseSize,
-               c.course_time courseTime, c.course_is_inspect courseIsInspect, c.course_label courseLabel, c.course_order courseOrder, c.course_status courseStatus, ct.ct_type courseTypeName
+        SELECT c.tenant_id as tenantId,c.id, c.course_name courseName, c.course_image_path courseImagePath, c.course_music_path courseMusicPath, c.course_video_path courseVideoPath, c.course_content_type courseContentType, c.course_author courseAuthor, c.course_teacher courseTeacher, c.course_size courseSize,
+        c.course_time courseTime, c.course_is_inspect courseIsInspect, c.course_label courseLabel, c.course_order courseOrder, c.course_status courseStatus, ct.ct_type courseTypeName
         FROM bjdx_course c
         LEFT JOIN bjdx_course_type ct ON c.course_type = ct.id
         <where>
-                c.deleted = 0
+            c.deleted = 0
             <if test="courseName != null and courseName != ''">
                 AND c.course_name LIKE CONCAT('%', #{courseName}, '%')
             </if>
@@ -28,6 +28,33 @@
             </if>
         </where>
         ORDER BY ct.ct_type_sort, c.course_order
+        limit #{pageNo}, #{pageSize}
+    </select>
+    <select id="selectCourseList" parameterType="cn.iocoder.byzs.module.bjdx.controller.admin.course.vo.CoursePageReqVO"
+            resultType="cn.iocoder.byzs.module.bjdx.controller.admin.course.vo.CoursePageReqVO">
 
+        SELECT c.tenant_id as tenantId,c.id, c.course_name courseName, c.course_image_path courseImagePath, c.course_music_path courseMusicPath, c.course_video_path courseVideoPath, c.course_content_type courseContentType, c.course_author courseAuthor, c.course_teacher courseTeacher, c.course_size courseSize,
+        c.course_time courseTime, c.course_is_inspect courseIsInspect, c.course_label courseLabel, c.course_order courseOrder, c.course_status courseStatus, ct.ct_type courseTypeName
+        FROM bjdx_course c
+        LEFT JOIN bjdx_course_type ct ON c.course_type = ct.id
+        <where>
+            c.deleted = 0
+            <if test="courseName != null and courseName != ''">
+                AND c.course_name LIKE CONCAT('%', #{courseName}, '%')
+            </if>
+            <if test="courseTeacher!= null and courseTeacher!= ''">
+                AND c.course_teacher LIKE CONCAT('%', #{courseTeacher}, '%')
+            </if>
+            <if test="courseStatus!= null and courseStatus!= ''">
+                AND c.course_status = #{courseStatus}
+            </if>
+            <if test="courseType!= null and courseType!= ''">
+                AND c.course_type = #{courseType}
+            </if>
+            <if test="courseContentType!= null and courseContentType!= ''">
+                AND c.course_content_type = #{courseContentType}
+            </if>
+        </where>
+        ORDER BY ct.ct_type_sort, c.course_order
     </select>
 </mapper>

+ 1 - 1
byzs-course/src/main/resources/mapper/courseconfig/CourseConfigMapper.xml

@@ -4,7 +4,7 @@
 
 
     <select id="selectCourseConfigPage" parameterType="cn.iocoder.byzs.module.bjdx.controller.admin.courseconfig.vo.CourseConfigPageReqVO" resultType="cn.iocoder.byzs.module.bjdx.controller.admin.courseconfig.vo.CourseConfigPageReqVO">
-        SELECT cc.id, cc.cc_course_id as ccCourseId,
+        SELECT cc.id, cc.cc_course_id as ccCourseId,c.tenant_id as tenantId,
                 cc_quest_source as ccQuestSource,
                 cc_quest_content as ccQuestContent,
                 cc_quest_option as ccQuestOption,

+ 4 - 3
byzs-course/src/main/resources/mapper/questionnaire/QuestionnaireMapper.xml

@@ -6,7 +6,7 @@
             parameterType="cn.iocoder.byzs.module.bjdx.controller.admin.questionnaire.vo.ConfigQuestionRespVO"
             resultType="cn.iocoder.byzs.module.bjdx.controller.admin.questionnaire.vo.ConfigQuestionRespVO">
         SELECT
-            cq.id,
+            cq.id,qc.tenant_id as tenantId,
             q.id as questionnaireId,
             cq.cq_quest_type as cqQuestType,
             cq.cq_question as cqQuestion,
@@ -61,11 +61,12 @@
     </select>
 
     <insert id="addConfigQuest" parameterType="cn.iocoder.byzs.module.bjdx.controller.admin.questionnaire.vo.ConfigQuestionRespVO">
-        INSERT INTO bjdx_questionnaire_config (bqc_questionnaire_id, bqc_question_id, bq_order)
+        INSERT INTO bjdx_questionnaire_config (bqc_questionnaire_id, bqc_question_id, bq_order, tenant_id)
         SELECT
             #{questionnaireId},
             q.id,
-            @max_order := @max_order + 1
+            @max_order := @max_order + 1,
+            #{tenantId}
         FROM (
             <!-- 使用foreach直接生成所有ID行,无需单独处理第一个元素 -->
             <foreach collection="questionIds" item="id" index="index" open="" separator="UNION ALL " close="">

+ 1 - 33
byzs-dependencies/pom.xml

@@ -45,8 +45,6 @@
         <podam.version>8.0.2.RELEASE</podam.version>
         <jedis-mock.version>1.1.8</jedis-mock.version>
         <mockito-inline.version>5.2.0</mockito-inline.version>
-        <!-- Bpm 工作流相关 -->
-        <flowable.version>7.0.1</flowable.version>
         <!-- 工具类相关 -->
         <anji-plus-captcha.version>1.4.0</anji-plus-captcha.version>
         <jsoup.version>1.18.3</jsoup.version>
@@ -419,19 +417,6 @@
                 <version>${podam.version}</version>
             </dependency>
 
-            <!-- 工作流相关 -->
-            <dependency>
-                <groupId>org.flowable</groupId>
-                <artifactId>flowable-spring-boot-starter-process</artifactId>
-                <version>${flowable.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.flowable</groupId>
-                <artifactId>flowable-spring-boot-starter-actuator</artifactId>
-                <version>${flowable.version}</version>
-            </dependency>
-            <!-- 工作流相关结束 -->
-
             <!-- 工具类相关 -->
             <dependency>
                 <groupId>cn.iocoder.boot</groupId>
@@ -578,6 +563,7 @@
                 </exclusions>
             </dependency>
 
+            <!--社交平台用户:微信、小程序-->
             <dependency>
                 <groupId>com.github.binarywang</groupId>
                 <artifactId>weixin-java-pay</artifactId>
@@ -594,24 +580,6 @@
                 <version>${weixin-java.version}</version>
             </dependency>
 
-            <!-- 积木报表-->
-            <dependency>
-                <groupId>org.jeecgframework.jimureport</groupId>
-                <artifactId>jimureport-spring-boot3-starter-fastjson2</artifactId>
-                <version>${jimureport.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jeecgframework.jimureport</groupId>
-                <artifactId>jimubi-spring-boot3-starter</artifactId>
-                <version>${jimureport.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.github.jsqlparser</groupId>
-                        <artifactId>jsqlparser</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
             <!-- PF4J -->
             <dependency>
                 <groupId>org.pf4j</groupId>

+ 11 - 17
byzs-framework/byzs-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/byzs/framework/tenant/core/security/TenantDataSecurityFilter.java

@@ -28,23 +28,17 @@ public class TenantDataSecurityFilter extends OncePerRequestFilter {
 
     // 不参与SQL拼接的特定方法路径
     private static final Set<String> EXCLUDED_METHOD_PATHS = new HashSet<>(Arrays.asList(
-            "/system/tenant/get-id-by-name",
-            "/system/auth/login",
-            "/system/auth/logout",
-            "system/captcha/get",
-            "system/auth/get-permission-info",
-            "system/dict-data/simple-list",
-            "/system/user/page",
-            "system/dept/page",
-            "system/role/page",
-            "system/menu/page",
-            "system/param/page",
-            "system/param/simple-list",
-            "system/tenant/page",
-            "system/tenant/page",
-            "system/tenant/create",
-            "/ai/chat/conversation/my-list",
-            "/ai/image/my-page"
+            "/system/",//系统请求
+
+//            "/bjdxWeb/questionnaire/",//问卷试题
+//            "/bjdxReport/progress/",//评估
+
+            "/ai/chat/conversation/my-list",//对话记录
+            "/ai/image/my-page",//绘画记录
+            "/ai/chat/conversation/page",//对话列表
+            "/ai/image/page",//绘画列表
+            "/ai/write/page",//创作列表
+            "/ai/mind-map/page"//思维导图列表
     ));
 
     @Override

+ 28 - 37
byzs-server/src/main/resources/application-localProd.yaml

@@ -123,6 +123,34 @@ spring:
     jdbc: # 使用 JDBC 的 JobStore 的时候,JDBC 的配置
       initialize-schema: NEVER # 是否自动使用 SQL 初始化 Quartz 表结构。这里设置成 never ,我们手动创建表结构。
 
+--- #################### 微信公众号、小程序相关配置 ####################
+wx:
+  mp: # 公众号配置(必填),参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档
+    #    app-id: wx041349c6f39b268b # 测试号(牛希尧提供的)
+    #    secret: 5abee519483bc9f8cb37ce280e814bd0
+    #    app-id: wx5b23ba7a5589ecbb # 测试号(自己的)
+    #    secret: 2a7b3b20c537e52e74afd395eb85f61f
+    app-id: wxf56b1542b9e85f8a # 测试号(Kongdy 提供的)
+    secret: 496379dcef1ba869e9234de8d598cfd3
+    # 存储配置,解决 AccessToken 的跨节点的共享
+    config-storage:
+      type: RedisTemplate # 采用 RedisTemplate 操作 Redis,会自动从 Spring 中获取
+      key-prefix: wx # Redis Key 的前缀
+      http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台
+  miniapp: # 小程序配置(必填),参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md 文档
+    #    appid: wx62056c0d5e8db250 # 测试号(牛希尧提供的)
+    #    secret: 333ae72f41552af1e998fe1f54e1584a
+    #    appid: wx63c280fe3248a3e7 # wenhualian的接口测试号
+    #    secret: 6f270509224a7ae1296bbf1c8cb97aed
+    appid: wxc4598c446f8a9cb3 # 测试号(Kongdy 提供的)
+    secret: 4a1a04e07f6a4a0751b39c3064a92c8b
+    #    appid: wx66186af0759f47c9 # 测试号(puhui 提供的)
+    #    secret: 3218bcbd112cbc614c7264ceb20144ac
+    config-storage:
+      type: RedisTemplate # 采用 RedisTemplate 操作 Redis,会自动从 Spring 中获取
+      key-prefix: wa # Redis Key 的前缀
+      http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台
+
 --- #################### 消息队列相关 ####################
 
 # rocketmq 配置项,对应 RocketMQProperties 配置类
@@ -199,34 +227,6 @@ logging:
 
 debug: false
 
---- #################### 微信公众号、小程序相关配置 ####################
-wx:
-  mp: # 公众号配置(必填),参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档
-#    app-id: wx041349c6f39b268b # 测试号(牛希尧提供的)
-#    secret: 5abee519483bc9f8cb37ce280e814bd0
-#    app-id: wx5b23ba7a5589ecbb # 测试号(自己的)
-#    secret: 2a7b3b20c537e52e74afd395eb85f61f
-    app-id: wxf56b1542b9e85f8a # 测试号(Kongdy 提供的)
-    secret: 496379dcef1ba869e9234de8d598cfd3
-    # 存储配置,解决 AccessToken 的跨节点的共享
-    config-storage:
-      type: RedisTemplate # 采用 RedisTemplate 操作 Redis,会自动从 Spring 中获取
-      key-prefix: wx # Redis Key 的前缀
-      http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台
-  miniapp: # 小程序配置(必填),参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md 文档
-    #    appid: wx62056c0d5e8db250 # 测试号(牛希尧提供的)
-    #    secret: 333ae72f41552af1e998fe1f54e1584a
-#    appid: wx63c280fe3248a3e7 # wenhualian的接口测试号
-#    secret: 6f270509224a7ae1296bbf1c8cb97aed
-    appid: wxc4598c446f8a9cb3 # 测试号(Kongdy 提供的)
-    secret: 4a1a04e07f6a4a0751b39c3064a92c8b
-#    appid: wx66186af0759f47c9 # 测试号(puhui 提供的)
-#    secret: 3218bcbd112cbc614c7264ceb20144ac
-    config-storage:
-      type: RedisTemplate # 采用 RedisTemplate 操作 Redis,会自动从 Spring 中获取
-      key-prefix: wa # Redis Key 的前缀
-      http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台
-
 --- #################### 博雅智算相关配置 ####################
 
 # 博雅智算配置项,设置当前项目所有自定义的配置
@@ -235,10 +235,6 @@ byzs:
     enable: false # 本地环境,暂时关闭图片验证码,方便登录等接口的测试;
   security:
     mock-enable: true
-  pay:
-    order-notify-url: https://yutou.mynatapp.cc/admin-api/pay/notify/order # 支付渠道的【支付】回调地址
-    refund-notify-url: https://yutou.mynatapp.cc/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址
-    transfer-notify-url: https://yutou.mynatapp.cc/admin-api/pay/notify/transfer # 支付渠道的【转账】回调地址
   access-log: # 访问日志的配置项
     enable: false
   demo: false # 关闭演示模式
@@ -274,8 +270,3 @@ justauth:
     type: REDIS
     prefix: 'social_auth_state:' # 缓存前缀,目前只对 Redis 缓存生效,默认 JUSTAUTH::STATE::
     timeout: 24h # 超时时长,目前只对 Redis 缓存生效,默认 3 分钟
-
---- #################### iot相关配置 TODO lyb【IOT】:再瞅瞅 ####################
-pf4j:
-#  pluginsDir: /tmp/
-  pluginsDir: ../plugins

+ 10 - 41
byzs-server/src/main/resources/application.yaml

@@ -3,10 +3,10 @@ spring:
     name: byzs-bjdx
 
   profiles:
-#    active: local
-    active: localProd
-#    active: prodDev
-#    active: prod
+    #    active: local
+#    active: localProd
+      active: prodDev
+#      active: prod
 
   main:
     allow-circular-references: true # 允许循环依赖,因为项目是三层架构,无法避免这个情况。
@@ -55,17 +55,6 @@ knife4j:
   setting:
     language: zh_cn
 
-# 工作流 Flowable 配置
-flowable:
-  # 1. false: 默认值,Flowable 启动时,对比数据库表中保存的版本,如果不匹配。将抛出异常
-  # 2. true: 启动时会对数据库中所有表进行更新操作,如果表存在,不做处理,反之,自动创建表
-  # 3. create_drop: 启动时自动创建表,关闭时自动删除表
-  # 4. drop_create: 启动时,删除旧表,再创建新表
-  database-schema-update: true # 设置为 false,可通过 https://github.com/flowable/flowable-sql 初始化
-  db-history-used: true # flowable6 默认 true 生成信息表,无需手动设置
-  check-process-definitions: false # 设置为 false,禁用 /resources/processes 自动部署 BPMN XML 流程
-  history-level: audit # full:保存历史数据的最高级别,可保存全部流程相关细节,包括流程流转各节点参数
-
 # MyBatis Plus 的配置项
 mybatis-plus:
   configuration:
@@ -73,9 +62,9 @@ mybatis-plus:
   global-config:
     db-config:
       id-type: NONE # “智能”模式,基于 IdTypeEnvironmentPostProcessor + 数据源的类型,自动适配成 AUTO、INPUT 模式。
-#      id-type: AUTO # 自增 ID,适合 MySQL 等直接自增的数据库
-#      id-type: INPUT # 用户输入 ID,适合 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库
-#      id-type: ASSIGN_ID # 分配 ID,默认使用雪花算法。注意,Oracle、PostgreSQL、Kingbase、DB2、H2 数据库时,需要去除实体类上的 @KeySequence 注解
+      #      id-type: AUTO # 自增 ID,适合 MySQL 等直接自增的数据库
+      #      id-type: INPUT # 用户输入 ID,适合 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库
+      #      id-type: ASSIGN_ID # 分配 ID,默认使用雪花算法。注意,Oracle、PostgreSQL、Kingbase、DB2、H2 数据库时,需要去除实体类上的 @KeySequence 注解
       logic-delete-value: 1 # 逻辑已删除值(默认为 1)
       logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
     banner: false # 关闭控制台的 Banner 打印
@@ -231,13 +220,13 @@ byzs:
       model: Baichuan4-Turbo
     midjourney:
       enable: true
-  #    base-url: https://api.holdai.top/mj-relax/mj
+      #    base-url: https://api.holdai.top/mj-relax/mj
       base-url: https://api.holdai.top/mj
       api-key: sk-dZEPiVaNcT3FHhef51996bAa0bC74806BeAb620dA5Da10Bf
       notify-url: http://java.nat300.top/admin-api/ai/image/midjourney/notify
     suno:
       enable: true
-  #    base-url: https://suno-55ishh05u-status2xxs-projects.vercel.app
+      #    base-url: https://suno-55ishh05u-status2xxs-projects.vercel.app
       base-url: http://127.0.0.1:3001
 
 --- #################### 博雅智算相关配置 ####################
@@ -308,24 +297,4 @@ byzs:
     send-frequency: 1m
     send-maximum-quantity-per-day: 10
     begin-code: 9999 # 这里配置 9999 的原因是,测试方便。
-    end-code: 9999 # 这里配置 9999 的原因是,测试方便。
-  trade:
-    order:
-      pay-expire-time: 2h # 支付的过期时间
-      receive-expire-time: 14d # 收货的过期时间
-      comment-expire-time: 7d # 评论的过期时间
-      status-sync-to-wxa-enable: true # 是否同步订单状态到微信小程序
-    express:
-      client: kd_100
-      kd-niao:
-        api-key: cb022f1e-48f1-4c4a-a723-9001ac9676b8
-        business-id: 1809751
-        request-type: 1002 # 免费版 1002;付费版 8001
-      kd100:
-        key: pLXUGAwK5305
-        customer: E77DF18BE109F454A5CD319E44BF5177
-
-debug: false
-# 插件配置
-pf4j:
-  pluginsDir: /Users/anhaohao/code/gitee/ruoyi-vue-pro/plugins # 插件目录
+    end-code: 9999 # 这里配置 9999 的原因是,测试方便。