From 9f122a41255d18f04a82d8be3b038a95c2c18d95 Mon Sep 17 00:00:00 2001 From: songhuangfeng123 <shf18767906695@163.com> Date: 星期二, 20 九月 2022 16:26:08 +0800 Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master --- safePlatfrom-out-web/src/main/resources/config/application.yaml | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/safePlatfrom-out-web/src/main/resources/config/application.yaml b/safePlatfrom-out-web/src/main/resources/config/application.yaml index f005f0b..8f11917 100644 --- a/safePlatfrom-out-web/src/main/resources/config/application.yaml +++ b/safePlatfrom-out-web/src/main/resources/config/application.yaml @@ -1,14 +1,16 @@ spring: application: - name: gkhy-safeplatform-out + name: safeplatform-out profiles: -# active: prod active: dev - -mybatis-plus: - mapper-locations: classpath:config/mapper/**/*.xml +# active: guotai-demo +#### test uat guotai-demo guotai-uat +# active: test +# active: uat logging: config: classpath:config/log/log4j2.xml level: - com.gkhy: info \ No newline at end of file + com.gkhy: info + com.atomikos: ERROR + javax.transaction: ERROR -- Gitblit v1.9.2