From 68b0d9b52145056045b36028d1d621da1c3f2ea1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期五, 20 九月 2024 15:38:29 +0800
Subject: [PATCH] 登录加密
---
safePlatfrom-out-web/src/main/resources/config/application.yaml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/safePlatfrom-out-web/src/main/resources/config/application.yaml b/safePlatfrom-out-web/src/main/resources/config/application.yaml
index 640b5fb..2df116b 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application.yaml
@@ -4,11 +4,15 @@
profiles:
#active: uat
#### dev out-dev test uat online-uat guotai-demo
+<<<<<<< Updated upstream
active: guotai-prod
+=======
+ #active: guotai-prod
+>>>>>>> Stashed changes
# active: online-uat 线上预发环境
# active: dev 本地开发环境
# active: out-dev 外包对接环境
-# active: test 内网测试环境
+ active: test #内网测试环境
# active: uat 内网预发环境
logging:
--
Gitblit v1.9.2