diff --git a/modules/core/src/test/java/config/application.yml b/modules/core/src/test/java/application.yml similarity index 73% rename from modules/core/src/test/java/config/application.yml rename to modules/core/src/test/java/application.yml index c5e7a5cd..d1795b04 100644 --- a/modules/core/src/test/java/config/application.yml +++ b/modules/core/src/test/java/application.yml @@ -1,12 +1,12 @@ -# 产品或项目名称、版本、版权年份 +# 产品或项目名称、软件开发公司名称 productName: JeeSite Demo +companyName: ThinkGem + +# 产品版本、版权年份 productVersion: V4.1 copyrightYear: 2018 -# 软件提供商公司或个人名称 -companyName: ThinkGem - # 数据库连接 jdbc: @@ -20,4 +20,4 @@ jdbc: # 日志配置 logging: - config: classpath:logback.xml + config: classpath:logback-test.xml diff --git a/modules/core/src/test/java/config/j2cache.properties b/modules/core/src/test/java/config/j2cache.properties deleted file mode 100644 index decc9d2c..00000000 --- a/modules/core/src/test/java/config/j2cache.properties +++ /dev/null @@ -1,8 +0,0 @@ -#J2Cache configuration - -j2cache.broadcast = none - -j2cache.L1.provider_class = caffeine -j2cache.L2.provider_class = none - -caffeine.region.default = 10000, 1h \ No newline at end of file diff --git a/modules/core/src/test/java/logback.xml b/modules/core/src/test/java/logback-test.xml similarity index 84% rename from modules/core/src/test/java/logback.xml rename to modules/core/src/test/java/logback-test.xml index b9aef4b4..98aa2446 100644 --- a/modules/core/src/test/java/logback.xml +++ b/modules/core/src/test/java/logback-test.xml @@ -3,7 +3,7 @@ - + diff --git a/web/src/test/java/logback.xml b/web/src/test/java/logback-test.xml similarity index 84% rename from web/src/test/java/logback.xml rename to web/src/test/java/logback-test.xml index b9aef4b4..98aa2446 100644 --- a/web/src/test/java/logback.xml +++ b/web/src/test/java/logback-test.xml @@ -3,7 +3,7 @@ - +