From 2cf7198a099dac3cee921094b4ccfc50959e5e2b Mon Sep 17 00:00:00 2001
From: yitonglei <ytl653@163.com>
Date: Mon, 18 Jul 2022 09:41:32 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-my.yml     | 59 ++++++++++---------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/renren-admin/src/main/resources/application-my.yml b/renren-admin/src/main/resources/application-my.yml
index 7e8a3ed3..30b08690 100644
--- a/renren-admin/src/main/resources/application-my.yml
+++ b/renren-admin/src/main/resources/application-my.yml
@@ -7,45 +7,50 @@ spring:
       driver-class-name: com.mysql.cj.jdbc.Driver
       url: jdbc:mysql://127.0.0.1:3306/share_platform?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&useSSL=false
       username: root
-      password: 123456
+      password: root
 #      driver-class-name: com.mysql.cj.jdbc.Driver
 #      url: jdbc:mysql://15.2.21.238:3310/share_platform?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&useSSL=false
 #      username: root
 #      password: Hisense2019
       #Hisense2019
 #上传的静态资源配置
-  initial-size: 10
-  max-active: 100
-  min-idle: 10
-  max-wait: 10
-  pool-prepared-statements: true
-  max-pool-prepared-statement-per-connection-size: 20
-  time-between-eviction-runs-millis: 60000
-  min-evictable-idle-time-millis: 300000
-  #Oracle需要打开注释
-  validation-query: SELECT 1
-  test-while-idle: true
-  test-on-borrow: false
-  test-on-return: false
-  stat-view-servlet:
+    initial-size: 10
+    max-active: 100
+    min-idle: 10
+    max-wait: 10
+    pool-prepared-statements: true
+    max-pool-prepared-statement-per-connection-size: 20
+    time-between-eviction-runs-millis: 60000
+    min-evictable-idle-time-millis: 300000
+    #Oracle需要打开注释
+    validation-query: SELECT 1
+    test-while-idle: true
+    test-on-borrow: false
+    test-on-return: false
+    stat-view-servlet:
+      enabled: true
+      url-pattern: /druid/*
+        #login-username: admin
+        #login-password: admin
+    filter:
+      stat:
+        log-slow-sql: true
+        slow-sql-millis: 1000
+        merge-sql: false
+      wall:
+        config:
+          multi-statement-allow: true
+  flyway:
     enabled: true
-    url-pattern: /druid/*
-      #login-username: admin
-      #login-password: admin
-  filter:
-    stat:
-      log-slow-sql: true
-      slow-sql-millis: 1000
-      merge-sql: false
-    wall:
-      config:
-        multi-statement-allow: true
-
+    validate-on-migrate: false
+      # 允许乱序执行
+    out-of-order: true
 #上传的静态资源配置
 resource:
   root_url: 15.2.21.238
   path: /home/yth/files/
   devModelFilePath: /home/yth/files/devModelFile
+  pic-host: 127.0.0.1
 # 大数据部门相关配置
 big_date:
   name: 青岛市大数据发展管理局