From 652fca264c2468782a2d5a4fbe21a13df448b91a Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 22 八月 2022 15:50:39 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang

---
 safePlatfrom-out-web/src/main/resources/config/application.yaml |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 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..932b998 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: uat
+#    active: guotai-demo
+#### test  uat  guotai-demo
+#    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