Explorar el Código

fix: 相关配置问题

wuwenyi hace 2 semanas
padre
commit
752c8e3c12

+ 3 - 2
src/main/resources/application-dev.yml

@@ -31,7 +31,7 @@ mybatis-plus:
   mapper-locations: classpath*:/mapper/**/*.xml
   configuration:
     map-underscore-to-camel-case: true
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl  # 去掉,使用默认 SLF4J,只输出 SQL 不输出结果
   global-config:
     db-config:
       id-type: auto
@@ -45,5 +45,6 @@ jwt:
 
 logging:
   level:
-    com.qqflow.engine: debug
     root: info
+    com.qqflow.engine: debug
+    com.qqflow.engine.**.mapper: debug  # MyBatis mapper SQL 语句日志(不输出结果集)

+ 7 - 6
src/main/resources/application-test.yml

@@ -4,11 +4,6 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: qqflowengine
     password: 123456
-  sql:
-    init:
-      mode: always
-      schema-locations: classpath:schema-test.sql
-      data-locations: classpath:data-test.sql
   data:
     redis:
       host: 192.168.1.139
@@ -19,7 +14,7 @@ mybatis-plus:
   mapper-locations: classpath*:/mapper/**/*.xml
   configuration:
     map-underscore-to-camel-case: true
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl  # 去掉,使用默认 SLF4J,只输出 SQL 不输出结果
   global-config:
     db-config:
       id-type: auto
@@ -30,3 +25,9 @@ mybatis-plus:
 jwt:
   secret: qqflow-test-secret-key-2024-min-32chars
   expiration: 86400000
+
+logging:
+  level:
+    root: info
+    com.qqflow.engine: debug
+    com.qqflow.engine.**.mapper: debug  # MyBatis mapper SQL 语句日志(不输出结果集)

+ 4 - 4
src/main/resources/application.yml

@@ -2,6 +2,8 @@ server:
   port: 8080
 
 spring:
+  profiles:
+    active: test
   application:
     name: qqflowengine-backend
   datasource:
@@ -39,7 +41,7 @@ mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
     cache-enabled: true
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
   global-config:
     db-config:
       id-type: auto
@@ -53,6 +55,4 @@ jwt:
   header: Authorization
   prefix: Bearer
 
-logging:
-  level:
-    com.qqflow.engine: debug
+

+ 10 - 10
src/main/resources/schema-dev.sql

@@ -113,9 +113,9 @@ CREATE TABLE IF NOT EXISTS bpm_approval_task (
     KEY idx_task_node (node_id)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
-CREATE INDEX IF NOT EXISTS idx_instance_status_end_definition ON bpm_process_instance(status, end_time, process_definition_id);
-CREATE INDEX IF NOT EXISTS idx_task_status_node_create ON bpm_approval_task(task_status, node_type, create_time);
-CREATE INDEX IF NOT EXISTS idx_task_status_timeout ON bpm_approval_task(task_status, timeout_time);
+CREATE INDEX idx_instance_status_end_definition ON bpm_process_instance(status, end_time, process_definition_id);
+CREATE INDEX idx_task_status_node_create ON bpm_approval_task(task_status, node_type, create_time);
+CREATE INDEX idx_task_status_timeout ON bpm_approval_task(task_status, timeout_time);
 
 CREATE TABLE IF NOT EXISTS bpm_attachment (
     id BIGINT PRIMARY KEY AUTO_INCREMENT,
@@ -157,17 +157,17 @@ CREATE TABLE IF NOT EXISTS bpm_approval_record (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- 兼容已存在的数据库:补充企业微信字段
-ALTER TABLE sys_user ADD COLUMN IF NOT EXISTS wecom_user_id VARCHAR(100) COMMENT '企业微信用户ID';
-ALTER TABLE sys_user ADD COLUMN IF NOT EXISTS wecom_remind_enabled TINYINT DEFAULT 1 COMMENT '是否开启企微提醒:0-否 1-是';
+ALTER TABLE sys_user ADD COLUMN wecom_user_id VARCHAR(100) COMMENT '企业微信用户ID';
+ALTER TABLE sys_user ADD COLUMN wecom_remind_enabled TINYINT DEFAULT 1 COMMENT '是否开启企微提醒:0-否 1-是';
 
 -- 兼容已存在的数据库:补充角色企业微信字段
-ALTER TABLE sys_role ADD COLUMN IF NOT EXISTS wecom_user_id VARCHAR(100) COMMENT '企业微信用户ID';
-ALTER TABLE sys_role ADD COLUMN IF NOT EXISTS wecom_remind_enabled TINYINT DEFAULT 1 COMMENT '是否开启企微提醒:0-否 1-是';
+ALTER TABLE sys_role ADD COLUMN wecom_user_id VARCHAR(100) COMMENT '企业微信用户ID';
+ALTER TABLE sys_role ADD COLUMN wecom_remind_enabled TINYINT DEFAULT 1 COMMENT '是否开启企微提醒:0-否 1-是';
 
 -- 兼容已存在的数据库:补充角色手机号字段及唯一索引
-ALTER TABLE sys_role ADD COLUMN IF NOT EXISTS phone VARCHAR(20) COMMENT '手机号';
-CREATE UNIQUE INDEX IF NOT EXISTS uk_role_phone ON sys_role(phone);
-CREATE UNIQUE INDEX IF NOT EXISTS uk_user_phone ON sys_user(phone);
+ALTER TABLE sys_role ADD COLUMN phone VARCHAR(20) COMMENT '手机号';
+CREATE UNIQUE INDEX uk_role_phone ON sys_role(phone);
+CREATE UNIQUE INDEX uk_user_phone ON sys_user(phone);
 
 -- 通知配置表(预留:供企业微信/邮件/短信等渠道配置读取)
 CREATE TABLE IF NOT EXISTS sys_notification_config (

+ 2 - 2
src/main/resources/schema-mysql.sql

@@ -191,8 +191,8 @@ CREATE TABLE IF NOT EXISTS bpm_attachment (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='流程附件表';
 
 -- 兼容已存在的 MySQL 数据库:补充角色企业微信字段
-ALTER TABLE sys_role ADD COLUMN IF NOT EXISTS wecom_user_id VARCHAR(100) COMMENT '企业微信用户ID';
-ALTER TABLE sys_role ADD COLUMN IF NOT EXISTS wecom_remind_enabled TINYINT DEFAULT 1 COMMENT '是否开启企微提醒:0-否 1-是';
+ALTER TABLE sys_role ADD COLUMN wecom_user_id VARCHAR(100) COMMENT '企业微信用户ID';
+ALTER TABLE sys_role ADD COLUMN wecom_remind_enabled TINYINT DEFAULT 1 COMMENT '是否开启企微提醒:0-否 1-是';
 
 -- ----------------------------
 -- 9. 通知配置表

+ 2 - 2
src/main/resources/schema-test.sql

@@ -151,8 +151,8 @@ CREATE TABLE IF NOT EXISTS bpm_attachment (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='流程附件表';
 
 -- 兼容已存在的数据库:补充企业微信字段
-ALTER TABLE sys_user ADD COLUMN IF NOT EXISTS wecom_user_id VARCHAR(100) COMMENT '企业微信用户ID';
-ALTER TABLE sys_user ADD COLUMN IF NOT EXISTS wecom_remind_enabled TINYINT DEFAULT 1 COMMENT '是否开启企微提醒:0-否 1-是';
+ALTER TABLE sys_user ADD COLUMN wecom_user_id VARCHAR(100) COMMENT '企业微信用户ID';
+ALTER TABLE sys_user ADD COLUMN wecom_remind_enabled TINYINT DEFAULT 1 COMMENT '是否开启企微提醒:0-否 1-是';
 
 -- 通知配置表(预留:供企业微信/邮件/短信等渠道配置读取)
 CREATE TABLE IF NOT EXISTS sys_notification_config (