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 |   50 +++++++++++++++-----------------------------------
 1 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6314fa4..4efb527 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,36 +1,16 @@
 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
+  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