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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ <% } %> - +