diff --git a/yudao-admin-server/src/main/resources/application-local.yaml b/yudao-admin-server/src/main/resources/application-local.yaml
index 5fc3e9eca..adc2755a0 100644
--- a/yudao-admin-server/src/main/resources/application-local.yaml
+++ b/yudao-admin-server/src/main/resources/application-local.yaml
@@ -148,6 +148,18 @@ spring:
logging:
file:
name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径
+ level:
+ # 配置自己写的 MyBatis Mapper 打印日志
+ cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql: debug
+ cn.iocoder.yudao.adminserver.modules.infra.dal.mysql: debug
+ cn.iocoder.yudao.adminserver.modules.pay.dal.mysql: debug
+ cn.iocoder.yudao.adminserver.modules.system.dal.mysql: debug
+ cn.iocoder.yudao.adminserver.modules.tool.dal.mysql: debug
+ cn.iocoder.yudao.coreservice.modules.bpm.dal.mysql: debug
+ cn.iocoder.yudao.coreservice.modules.infra.dal.mysql: debug
+ cn.iocoder.yudao.coreservice.modules.pay.dal.mysql: debug
+ cn.iocoder.yudao.coreservice.modules.system.dal.mysql: debug
+ cn.iocoder.yudao.coreservice.modules.tool.dal.mysql: debug
--- #################### 芋道相关配置 ####################
@@ -194,3 +206,4 @@ justauth:
type: REDIS
prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE::
timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟
+
diff --git a/yudao-admin-server/src/main/resources/application.yaml b/yudao-admin-server/src/main/resources/application.yaml
index fdb435e87..bc6abf5f1 100644
--- a/yudao-admin-server/src/main/resources/application.yaml
+++ b/yudao-admin-server/src/main/resources/application.yaml
@@ -35,28 +35,13 @@ spring:
# MyBatis Plus 的配置项
mybatis-plus:
-# 在 mybatis-config/mybatis-config.xml 中设置 TODO jason：看看有没其它解决方案
-# configuration:
-# map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。
-# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 打印日志
+ configuration:
+ map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。
global-config:
db-config:
id-type: AUTO # 自增 ID
logic-delete-value: 1 # 逻辑已删除值(默认为 1)
logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
- mapper-locations: classpath*:mapper/*.xml
- config-location: classpath:mybatis-config/mybatis-config.xml
- configuration-properties:
- prefix: ""
- wildcardEscapeClause: ""
- limitBefore: ""
- limitAfter: "LIMIT #{maxResults} OFFSET #{firstResult}"
- limitBetween: ""
- limitOuterJoinBetween: ""
- limitBeforeNativeQuery: ""
- orderBy: "order by ${orderByColumns}"
- blobType: "BLOB"
- boolValue: "TRUE"
type-aliases-package: ${yudao.info.base-package}.modules.*.dal.dataobject, ${yudao.core-service.base-package}.modules.*.dal.dataobject
--- #################### 芋道相关配置 ####################
diff --git a/yudao-admin-server/src/main/resources/mybatis-config/mybatis-config.xml b/yudao-admin-server/src/main/resources/mybatis-config/mybatis-config.xml
deleted file mode 100644
index d459d9670..000000000
--- a/yudao-admin-server/src/main/resources/mybatis-config/mybatis-config.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/yudao-framework/yudao-spring-boot-starter-activiti/src/main/java/cn/iocoder/yudao/framework/activiti/config/YudaoActivitiConfiguration.java b/yudao-framework/yudao-spring-boot-starter-activiti/src/main/java/cn/iocoder/yudao/framework/activiti/config/YudaoActivitiConfiguration.java
index f65c2a23c..0fbb6c636 100644
--- a/yudao-framework/yudao-spring-boot-starter-activiti/src/main/java/cn/iocoder/yudao/framework/activiti/config/YudaoActivitiConfiguration.java
+++ b/yudao-framework/yudao-spring-boot-starter-activiti/src/main/java/cn/iocoder/yudao/framework/activiti/config/YudaoActivitiConfiguration.java
@@ -4,8 +4,6 @@ import cn.iocoder.yudao.framework.activiti.core.web.ActivitiWebFilter;
import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum;
import org.activiti.image.ProcessDiagramGenerator;
import org.activiti.image.impl.DefaultProcessDiagramGenerator;
-import org.activiti.spring.boot.ProcessEngineConfigurationConfigurer;
-import org.apache.ibatis.session.SqlSessionFactory;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -21,14 +19,6 @@ public class YudaoActivitiConfiguration {
return new DefaultProcessDiagramGenerator();
}
- /**
- * ProcessEngineConfigurationConfigurer 实现类，设置使用 MyBatis SqlSessionFactory
- */
- @Bean
- public ProcessEngineConfigurationConfigurer processEngineConfigurationConfigurer(SqlSessionFactory sqlSessionFactory) {
- return springProcessEngineConfiguration -> springProcessEngineConfiguration.setSqlSessionFactory(sqlSessionFactory);
- }
-
@Bean
public FilterRegistrationBean activitiWebFilter() {
FilterRegistrationBean registrationBean = new FilterRegistrationBean<>();