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 | 66 +++++++------------------------- 1 files changed, 15 insertions(+), 51 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 2784ace..4efb527 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,52 +1,16 @@ spring: - application: - name: iot-vmp-vmanager - # 褰卞瓙鏁版嵁瀛樺偍鏂瑰紡锛屾敮鎸乺edis銆乯dbc - database: redis - # 閫氫俊鏂瑰紡锛屾敮鎸乲afka銆乭ttp - communicate: http - redis: - # Redis鏈嶅姟鍣↖P - host: 192.168.1.141 - #绔彛鍙� - port: 6379 - database: 6 - #璁块棶瀵嗙爜,鑻ヤ綘鐨剅edis鏈嶅姟鍣ㄦ病鏈夎缃瘑鐮侊紝灏变笉闇�瑕佺敤瀵嗙爜鍘昏繛鎺� - password: 4767cb971b40a1300fa09b7f87b09d1c - #瓒呮椂鏃堕棿 - timeout: 10000 - datasource: - name: eiot - url: jdbc:mysql://192.168.1.141:3306/eiot?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true - username: root - password: root - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver -server: - port: 18080 -sip: -# ip: 10.200.64.63 - ip: 192.168.1.20 - port: 5060 - # 鏍规嵁鍥芥爣6.1.2涓瀹氾紝domain瀹滈噰鐢↖D缁熶竴缂栫爜鐨勫墠鍗佷綅缂栫爜銆傚浗鏍囬檮褰旸涓畾涔夊墠8浣嶄负涓績缂栫爜锛堢敱鐪佺骇銆佸競绾с�佸尯绾с�佸熀灞傜紪鍙风粍鎴愶紝鍙傜収GB/T 2260-2007锛� - # 鍚庝袱浣嶄负琛屼笟缂栫爜锛屽畾涔夊弬鐓ч檮褰旸.3 - # 3701020049鏍囪瘑灞变笢娴庡崡鍘嗕笅鍖� 淇℃伅琛屼笟鎺ュ叆 - domain: 3701020049 - id: 37010200492000000001 - # 榛樿璁惧璁よ瘉瀵嗙爜锛屽悗缁墿灞曚娇鐢ㄨ澶囧崟鐙瘑鐮� - password: 12345678 -media: -# ip: 10.200.64.88 - ip: 192.168.1.20 - port: 10000 - -# 鑷畾涔変唬鐞嗙浉鍏抽厤缃� -# 浠g悊鐨勬湰鍦拌矾鐢� -proxy: - servlet_url: /media/* - # 瑕佷唬鐞嗙殑鍦板潃 - target_url: http://127.0.0.1:10080 - -auth: #32浣嶅皬鍐檓d5鍔犲瘑锛堥粯璁ゅ瘑鐮佷负admin锛� - username: admin - password: 21232f297a57a5a743894a0e4a801fc3 \ 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