From 22e1d92a9d8ae6aa257889f882722b8e48648abc Mon Sep 17 00:00:00 2001
From: mk1990 <37614016+mk1990@users.noreply.github.com>
Date: 星期一, 18 四月 2022 09:32:20 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

---
 src/main/resources/application.yml |   37 ++-----------------------------------
 1 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6314fa4..3d7808a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,36 +1,3 @@
 spring:
-    application:
-        name: wvp
-        # 鏁版嵁瀛樺偍鏂瑰紡锛屾殏鍙敮鎸乺edis锛屽悗缁敮鎸乯dbc
-        database: redis
-    redis: 
-        # Redis鏈嶅姟鍣↖P
-        host: 127.0.0.1
-        #绔彛鍙�
-        port: 6379
-        datebase: 0
-        #璁块棶瀵嗙爜,鑻ヤ綘鐨剅edis鏈嶅姟鍣ㄦ病鏈夎缃瘑鐮侊紝灏变笉闇�瑕佺敤瀵嗙爜鍘昏繛鎺�
-        password:
-        #瓒呮椂鏃堕棿
-        timeout: 10000
-    datasource: 
-        name: wcp
-        url: jdbc:mysql://127.0.0.1:3306/wcp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true
-        username: root
-        password: 123456
-        type: com.alibaba.druid.pool.DruidDataSource
-        driver-class-name: com.mysql.jdbc.Driver
-server:
-    port: 8080
-sip:
-    # 鏈湴鏈嶅姟鍦板潃
-    ip: 192.168.0.3
-    server_id: 34020000002000000001
-    port: 5060
-    domain: 34020000
-    # 鏆傛椂浣跨敤缁熶竴瀵嗙爜锛屽悗缁敼涓轰竴鏈轰竴瀵�
-    password: admin
-media:
-    # ZLMediaServer IP
-    ip: 192.168.0.4
-    port: 10000
\ No newline at end of file
+  profiles:
+    active: dev

--
Gitblit v1.8.0