From 967e12a05e1a1cb0c595a379c55c5ecc71dd03a9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 22 九月 2023 09:08:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect into dev

---
 server/company/src/main/resources/application.yml |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/server/company/src/main/resources/application.yml b/server/company/src/main/resources/application.yml
index ee9d370..6e685b9 100644
--- a/server/company/src/main/resources/application.yml
+++ b/server/company/src/main/resources/application.yml
@@ -5,13 +5,13 @@
   env: development
 #  env: production
 server:
-  port: 10012
+  port: 10022
 
 spring:
-#  application:
+#  application:git
 #    name: doumeemes
   profiles:
-    active: dev
+    active: pro
 
   # JSON杩斿洖閰嶇疆
   jackson:
@@ -31,7 +31,6 @@
     map-underscore-to-camel-case: true
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
-
 # 缂撳瓨鍐呭璁剧疆
 cache:
   session:
@@ -47,7 +46,6 @@
   smart: true
   # 鎺掗櫎璺熻釜鐨刄RL姝e垯
   exclude-patterns: .+/list[a-zA-Z0-9\-\_]*$, .+/tree[a-zA-Z0-9\-\_]*$, .+/page[a-zA-Z0-9\-\_]*$, .+/all[a-zA-Z0-9\-\_]*$, /swagger-resources.*
-
 
 # 鏃ュ織閰嶇疆
 logback:

--
Gitblit v1.9.3