From bac893fb780c72626070fc73c9dbabf74f939453 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 15 Oct 2025 11:30:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=20logger-default.xml=E3=80=81mybatis-default.xml=20?=
 =?UTF-8?q?=E6=96=B9=E4=BE=BF=20junit=E3=80=81mini=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/config/jeesite-core.yml    |  3 +
 .../src/main/resources/config/application.yml | 10 +--
 .../src/main/resources/config/logger-core.xml | 67 -------------------
 .../main/resources/mybatis/mybatis-config.xml | 59 ----------------
 .../main/resources/static/common/common.css   |  5 --
 .../main/resources/static/common/common.js    |  5 --
 .../main/resources/views/include/jslibs.html  |  2 +-
 7 files changed, 10 insertions(+), 141 deletions(-)
 delete mode 100644 web-mini/src/main/resources/config/logger-core.xml
 delete mode 100644 web-mini/src/main/resources/mybatis/mybatis-config.xml
 delete mode 100644 web-mini/src/main/resources/static/common/common.css
 delete mode 100644 web-mini/src/main/resources/static/common/common.js

diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index e4cb86b6..025ad653 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -130,6 +130,9 @@ logging:
 # MyBatis 相关
 mybatis:
 
+  # MyBatis 配置文件
+  #configLocation: /mybatis/mybatis-config.xml
+
   # @MyBatisDao 扫描基础包，如果多个，用“,”分隔
   #scanBasePackage: com.jeesite.modules.**.dao
 
diff --git a/web-mini/src/main/resources/config/application.yml b/web-mini/src/main/resources/config/application.yml
index d4905ab1..5c72a030 100644
--- a/web-mini/src/main/resources/config/application.yml
+++ b/web-mini/src/main/resources/config/application.yml
@@ -99,8 +99,8 @@ spring:
   mvc:
     pathmatch:
       matching-strategy: ANT_PATH_MATCHER
-    
-  # JTA事务
+
+  # JTA XA 事务（spring boot 3）
   jta:
     enabled: false
 
@@ -116,6 +116,9 @@ logging:
 # MyBatis 相关
 mybatis:
 
+  # MyBatis 配置文件
+  configLocation: /mybatis/mybatis-default.xml
+
   # Mapper文件刷新线程
   mapper:
     refresh:
@@ -149,7 +152,6 @@ gen:
 
 # 系统监控（默认开启，可关闭）访问地址如下：
 #   服务监控：http://127.0.0.1:8980/js/a/state/server/index
-#   缓存监控：http://127.0.0.1:8980/js/a/state/cache/index
 state:
   enabled: true
 
@@ -163,7 +165,7 @@ web:
     mobile:
       enabled: false
 
-  # 是否启用核心内置功能的Controller加载
+  # 核心模块的Web功能开启
   core:
     enabled: false
   
diff --git a/web-mini/src/main/resources/config/logger-core.xml b/web-mini/src/main/resources/config/logger-core.xml
deleted file mode 100644
index a0d63865..00000000
--- a/web-mini/src/main/resources/config/logger-core.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<included>
-	
-	<!-- https://github.com/spring-projects/spring-boot/blob/v2.0.5.RELEASE/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/defaults.xml -->
-	<include resource="org/springframework/boot/logging/logback/defaults.xml" />
-	
-	<logger name="org.springframework.boot.web.embedded" level="INFO" />
-	<logger name="org.apache.catalina.core.StandardEngine" level="INFO" />
-	<logger name="org.apache.fury.serializer.ObjectStreamSerializer" level="ERROR" />
-	<logger name="org.apache.fury.config.FuryBuilder" level="ERROR" />
-	<logger name="ShardingSphere-SQL" level="DEBUG" />
-<!-- 	<logger name="org.apache.ibatis" level="DEBUG" /> -->
-<!-- 	<logger name="org.mybatis.spring" level="DEBUG" /> -->
-<!-- 	<logger name="org.springframework.jdbc" level="DEBUG" /> -->
-	<logger name="org.mybatis.spring.transaction" level="DEBUG" />
-	<logger name="com.atomikos.icatch.config.UserTransactionServiceImp" level="ERROR" />
-	<logger name="com.atomikos.icatch.provider.imp.AssemblerImp" level="ERROR" />
-	<logger name="com.atomikos.jdbc.AbstractDataSourceBean" level="ERROR" />
-	<logger name="com.atomikos.jdbc.AtomikosConnectionProxy" level="ERROR" />
-	<logger name="com.atomikos.recovery.xa.XaResourceRecoveryManager" level="ERROR" />
-	<logger name="org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator" level="DEBUG" />
-<!-- 	<logger name="org.springframework.transaction.support.TransactionSynchronizationManager" level="TRACE" /> -->
-	<logger name="org.springframework.web.servlet.PageNotFound" level="ERROR" />
-	<logger name="org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker" level="ERROR" />
-	<logger name="org.springframework.boot.devtools" level="DEBUG" />
-
-	<logger name="springfox.documentation.spring.web.readers.parameter.ParameterDataTypeReader" level="ERROR" />
-	<logger name="springfox.documentation.schema.property.CachingModelPropertiesProvider" level="ERROR" />
-<!-- 	<logger name="io.swagger" level="DEBUG" /> -->
-<!-- 	<logger name="springfox" level="DEBUG" /> -->
-
-	<logger name="org.flowable.ui.modeler.domain" level="DEBUG" />
-	<logger name="org.flowable.idm.engine.impl.persistence" level="DEBUG" />
-	<logger name="org.flowable.task.service.impl.persistence" level="DEBUG" />
-	<logger name="org.flowable.identitylink.service.impl.persistence" level="DEBUG" />
-	<logger name="org.flowable.variable.service.impl.persistence" level="DEBUG" />
-	<logger name="org.flowable.engine.impl.persistence" level="DEBUG" />
-	<logger name="com.bstek.ureport" level="DEBUG" />
-
-	<logger name="com.jeesite" level="DEBUG" />
-	<logger name="com.jeesite.common.web" level="INFO" />
-	<logger name="com.jeesite.common.i18n" level="INFO" />
-	<logger name="com.jeesite.common.shiro" level="INFO" />
-	<logger name="com.jeesite.common.beetl" level="INFO" />
-	<logger name="com.jeesite.common.cache" level="INFO" />
-	<logger name="com.jeesite.common.j2cache" level="INFO" />
-	<logger name="com.jeesite.common.j2cache.cache.support.caffeine" level="ERROR" />
-	<logger name="com.jeesite.common.mybatis" level="INFO" />
-	<logger name="com.jeesite.common.mybatis.type" level="DEBUG" />
-	<logger name="com.jeesite.common.mybatis.mapper" level="DEBUG" />
-	<logger name="com.jeesite.common.reflect.ReflectUtils" level="INFO" />
-	<logger name="com.jeesite.common.io.FileUtils" level="INFO" />
-	<logger name="com.jeesite.modules.sys.dao.LogDao" level="INFO" />
-	
-	<!-- Production profile
-	<springProfile name="prod">
-		<logger name="org.mybatis.spring.transaction" level="INFO" />
-		<logger name="org.flowable.ui.modeler.domain" level="INFO" />
-		<logger name="org.flowable.idm.engine.impl.persistence" level="INFO" />
-		<logger name="org.flowable.task.service.impl.persistence" level="INFO" />
-		<logger name="org.flowable.identitylink.service.impl.persistence" level="INFO" />
-		<logger name="org.flowable.variable.service.impl.persistence" level="INFO" />
-		<logger name="org.flowable.engine.impl.persistence" level="INFO" />
-		<logger name="com.jeesite" level="INFO" />
-		<logger name="com.jeesite.common.mybatis.mapper" level="INFO" />
-	</springProfile> -->
-	
-</included>
\ No newline at end of file
diff --git a/web-mini/src/main/resources/mybatis/mybatis-config.xml b/web-mini/src/main/resources/mybatis/mybatis-config.xml
deleted file mode 100644
index b1a85c8f..00000000
--- a/web-mini/src/main/resources/mybatis/mybatis-config.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "http://mybatis.org/dtd/mybatis-3-config.dtd">
-<configuration>
-
-	<!-- 全局参数 -->
-	<settings>
-		<!-- 使全局的映射器启用或禁用缓存。 -->
-		<setting name="cacheEnabled" value="true"/>
-		
-		<!-- 全局启用或禁用延迟加载。当禁用时，所有关联对象都会即时加载。 -->
-		<setting name="lazyLoadingEnabled" value="true"/>
-		
-		<!-- 当启用时，有延迟加载属性的对象在被调用时将会完全加载任意属性。否则，每种属性将会按需要加载。 -->
-		<setting name="aggressiveLazyLoading" value="true"/>
-		
-		<!-- 是否允许单条sql 返回多个数据集  (取决于驱动的兼容性) default:true -->
-		<setting name="multipleResultSetsEnabled" value="true"/>
-		
-		<!-- 是否可以使用列的别名 (取决于驱动的兼容性) default:true -->
-		<setting name="useColumnLabel" value="true"/>
-		
-		<!-- 允许JDBC 生成主键。需要驱动器支持。如果设为了true，这个设置将强制使用被生成的主键，有一些驱动器不兼容不过仍然可以执行。  default:false  -->
-		<setting name="useGeneratedKeys" value="false"/>
-		
-		<!-- 指定 MyBatis 如何自动映射 数据基表的列 NONE：不映射　PARTIAL:部分  FULL:全部  -->  
-		<setting name="autoMappingBehavior" value="PARTIAL"/>
-		
-		<!-- 这是默认的执行类型  （SIMPLE: 简单； REUSE: 执行器可能重复使用prepared statements语句；BATCH: 执行器可以重复执行语句和批量更新）  -->
-		<setting name="defaultExecutorType" value="SIMPLE"/>
-		
-		<!-- 使用驼峰命名法转换字段。 -->
-		<setting name="mapUnderscoreToCamelCase" value="true"/>
-		
-		<!-- 设置本地缓存范围 session:就会有数据的共享  statement:语句范围 (这样就不会有数据的共享 ) defalut:session -->
-        <setting name="localCacheScope" value="SESSION"/>
-		
-        <!-- 设置但JDBC类型为空时,某些驱动程序 要指定值,default:OTHER，插入空值时不需要指定类型 -->
-        <setting name="jdbcTypeForNull" value="NULL"/>
-		
-        <!-- 迭代集合的时候如果空值，则忽略而不抛出异常 -->
-        <setting name="nullableOnForEach" value="true"/>
-		
-		<!-- 返回值为Map时，当返回空值字段时，仍然需要返回这个Key -->
-		<setting name="callSettersOnNulls" value="true"/>
-		
-	</settings>
-	
-	<!-- 类型别名 -->
-	<typeAliases>
-		<typeAlias alias="Page" type="com.jeesite.common.entity.Page" /><!--分页  -->
-	</typeAliases>
-	
-	<!-- 插件配置 -->
-	<plugins>
-		<plugin interceptor="com.jeesite.common.mybatis.interceptor.DataSourceInterceptor" />
-		<plugin interceptor="com.jeesite.common.mybatis.interceptor.PaginationInterceptor" />
-    </plugins>
-	
-</configuration>
diff --git a/web-mini/src/main/resources/static/common/common.css b/web-mini/src/main/resources/static/common/common.css
deleted file mode 100644
index f94b7e40..00000000
--- a/web-mini/src/main/resources/static/common/common.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*!
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- * 项目自定义的公共CSS，可覆盖jeesite.css里的样式
- */
diff --git a/web-mini/src/main/resources/static/common/common.js b/web-mini/src/main/resources/static/common/common.js
deleted file mode 100644
index 14bccc01..00000000
--- a/web-mini/src/main/resources/static/common/common.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*!
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- * No deletion without permission, or be held responsible to law.
- * 项目自定义的公共JavaScript，可覆盖jeesite.js里的方法
- */
diff --git a/web-mini/src/main/resources/views/include/jslibs.html b/web-mini/src/main/resources/views/include/jslibs.html
index b8a440bd..55b010ab 100644
--- a/web-mini/src/main/resources/views/include/jslibs.html
+++ b/web-mini/src/main/resources/views/include/jslibs.html
@@ -45,4 +45,4 @@
 <script src="${ctxStatic}/ueditor/1.4/lang/${lang()}/${lang()}.js?${_version}"></script>
 <% } %>
 <script src="${ctxStatic}/common/jeesite.js?${_version}"></script>
-<script src="${ctxStatic}/common/i18n/jeesite_${lang()}.js?${_version}"></script>
+<!--<script src="${ctxStatic}/common/i18n/jeesite_${lang()}.js?${_version}"></script>-->