From 2c3f6417a35d0a2d79f3b751b7a5a8edbb0bcc84 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 21 三月 2023 17:55:44 +0800
Subject: [PATCH] 修复添加zlm节点使用默认值的问题 #781

---
 src/main/resources/application.yml |   67 +++++++--------------------------
 1 files changed, 15 insertions(+), 52 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5a752e5..4efb527 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,53 +1,16 @@
 spring:
-    application:
-        name: iot-vmp-vmanager
-        # 褰卞瓙鏁版嵁瀛樺偍鏂瑰紡锛屾敮鎸乺edis銆乯dbc,鏆備笉鏀寔mysql
-        database: redis
-        # 閫氫俊鏂瑰紡锛屾敮鎸乲afka銆乭ttp
-        communicate: http
-    redis:
-        # Redis鏈嶅姟鍣↖P
-        host: 127.0.0.1
-        #绔彛鍙�
-        port: 6379
-        database: 6
-        #璁块棶瀵嗙爜,鑻ヤ綘鐨剅edis鏈嶅姟鍣ㄦ病鏈夎缃瘑鐮侊紝灏变笉闇�瑕佺敤瀵嗙爜鍘昏繛鎺�
-        password:
-        #瓒呮椂鏃堕棿
-        timeout: 10000
-    datasource: 
-        name: eiot
-        url: jdbc:mysql://127.0.0.1:3306/eiot?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true
-        username:
-        password:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driver-class-name: com.mysql.jdbc.Driver
-server:
-    port: 18080
-sip:
-    ip: 192.168.1.44
-    port: 5060
-    # 鏍规嵁鍥芥爣6.1.2涓瀹氾紝domain瀹滈噰鐢↖D缁熶竴缂栫爜鐨勫墠鍗佷綅缂栫爜銆傚浗鏍囬檮褰旸涓畾涔夊墠8浣嶄负涓績缂栫爜锛堢敱鐪佺骇銆佸競绾с�佸尯绾с�佸熀灞傜紪鍙风粍鎴愶紝鍙傜収GB/T 2260-2007锛�
-    # 鍚庝袱浣嶄负琛屼笟缂栫爜锛屽畾涔夊弬鐓ч檮褰旸.3
-    # 3701020049鏍囪瘑灞变笢娴庡崡鍘嗕笅鍖� 淇℃伅琛屼笟鎺ュ叆
-    domain: 3402000000
-    id: 34020000002000000001
-    # 榛樿璁惧璁よ瘉瀵嗙爜锛屽悗缁墿灞曚娇鐢ㄨ澶囧崟鐙瘑鐮�
-    password: 12345678
-
-auth: #32浣嶅皬鍐檓d5鍔犲瘑锛堥粯璁ゅ瘑鐮佷负admin锛�
-    username: admin
-    password: 21232f297a57a5a743894a0e4a801fc3
-
-media: #zlm鏈嶅姟鍣ㄧ殑ip涓巋ttp绔彛, 閲嶇偣: 杩欐槸http绔彛
-    ip: 192.168.1.44
-    wanIp:
-    port: 80
-    secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc
-    streamNoneReaderDelayMS:  1800000  # 鏃犱汉瑙傜湅澶氫箙鑷姩鍏抽棴娴�
-    closeWaitRTPInfo: false # 寮哄埗鍏抽棴绛夊緟鏀跺埌娴佺紪鐮佷俊鎭悗鍦ㄨ繑鍥�, 璁句负true鍙互蹇�熸墦寮�鎾斁绐楀彛, 璁句负false淇濊瘉杩斿洖鍚庢祦灏卞彲浠ユ挱鏀�
-    rtp: # 鍚敤udp澶氱鍙fā寮�
-        enable: true
-        udpPortRange: 30000,30500 # 绔彛鑼冨洿
-
-
+  application:
+    name: wvp
+  profiles:
+    active: local
+  # flayway鐩稿叧閰嶇疆
+  flyway:
+    enabled: true   #鏄惁鍚敤flyway(榛樿true)
+    locations: classpath:db/migration   #杩欎釜璺緞鎸囩殑鏄痜ly鐗堟湰鎺у埗鐨剆ql璇彞瀛樻斁鐨勮矾寰�,鍙互澶氫釜锛屽彲浠ョ粰姣忎釜鐜浣跨敤涓嶅悓浣嶇疆,姣斿classpath:db/migration,classpath:test/db/migration
+    baseline-on-migrate: true   #寮�鍚嚜鍔ㄥ垱寤篺lyway鍏冩暟鎹〃鏍囪瘑 榛樿: false
+    # 涓� baseline-on-migrate: true 鎼厤浣跨敤,灏嗗綋鍓嶆暟鎹簱鍒濆鐗堟湰璁剧疆涓�0
+    baseline-version: 0
+    clean-disabled: true    #绂佹flyway鎵ц娓呯悊
+    # 鍋囧宸茬粡鎵ц浜嗙増鏈�1鍜岀増鏈�3锛屽鏋滃鍔犱簡涓�涓増鏈�2锛屼笅闈㈣繖涓�夐」灏嗕細鍏佽鎵ц鐗堟湰2鐨勮剼鏈�
+    out-of-order: true
+    table: flyway_schema_history_${spring.application.name}  #鐢ㄤ簬璁板綍鎵�鏈夌殑鐗堟湰鍙樺寲璁板綍
\ No newline at end of file

--
Gitblit v1.8.0