From c9da1b0da1178911e383ddcaebecd1e088fa6004 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 05 九月 2023 16:37:07 +0800
Subject: [PATCH] 修改bug

---
 sys/src/main/resources/application-dev.yml |   51 +++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/sys/src/main/resources/application-dev.yml b/sys/src/main/resources/application-dev.yml
index f06d3ad..0599edc 100644
--- a/sys/src/main/resources/application-dev.yml
+++ b/sys/src/main/resources/application-dev.yml
@@ -1,20 +1,50 @@
 swagger:
   enabled: true
 
+# 鏃ュ織閰嶇疆
+logging:
+  config: classpath:logback-spring.xml
+  # 鏃ュ織瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
+  file-location: log
+
+# 鏁版嵁搴撳浠借矾寰�
+backup:
+  # 鏁版嵁搴撳浠借矾寰�+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
+  path: E:/webapp/backup
+  # 鏁版嵁搴撳浠藉ぉ鏁�
+  destiny: 7
+  # 鏁版嵁搴撳浠藉伐鍏疯矾寰�+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
+  mysqldump: E:\JavaCode\WMS\WMS_Admin\src\main\resources
+
+# 鐓х墖瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
+file:
+  path: E:/webapp/images
+  # 涓婁紶鏂囦欢鍏佽鐨勬墿灞曞悕
+  allowed: png,jpg,jpeg,gif
+
+# 榈烽洀绠$悊绯荤粺瀵嗛挜
+login:
+  userID: c8b1aaacec366c24e5d18c7eea9e551b
+  secret: 701C85FCE0F7CFD714C2052D77098DC7f407b0ee79210bcef51787a0eb8ec7a5
+
+# 榈烽洀缃戠粶IP鎴栬�呭煙鍚�
+customer:
+  url: http://114.132.189.42:8011
+
 mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 寮�鍚痬ybatis-plus鏃ュ織
-
-logging:
-  config: classpath:logback-spring.xml
 
 # 鏁版嵁婧愰厤缃�
 spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://localhost:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
-    username: root
+#    url: jdbc:mysql://192.168.110.209:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+#    username: user
+#    password: 123456
+    url: jdbc:mysql://192.168.65.113:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+    username: user
     password: 123456
     druid:
       #   Druid鏁版嵁婧愰厤缃�
@@ -38,21 +68,22 @@
     # redis鏁版嵁搴撶储寮�(榛樿涓�0)锛屾垜浠娇鐢ㄧ储寮曚负3鐨勬暟鎹簱锛岄伩鍏嶅拰鍏朵粬鏁版嵁搴撳啿绐�
     database: 0
     # redis鏈嶅姟鍣ㄥ湴鍧�锛堥粯璁や负localhost锛�
-    host: localhost
+#    host: 192.168.110.209
+    host: 192.168.65.113
     # redis绔彛锛堥粯璁や负6379锛�
-    port: 6380
+    port: 6379
     # redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
     password: null
     # redis杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶆绉掞級
-    timeout: 0
+    timeout: 2000
     # redis杩炴帴姹犻厤缃�
     pool:
       # 鏈�澶у彲鐢ㄨ繛鎺ユ暟锛堥粯璁や负8锛岃礋鏁拌〃绀烘棤闄愶級
-      max-active: 8
+      max-active: 20
       # 鏈�澶х┖闂茶繛鎺ユ暟锛堥粯璁や负8锛岃礋鏁拌〃绀烘棤闄愶級
       max-idle: 8
       # 鏈�灏忕┖闂茶繛鎺ユ暟锛堥粯璁や负0锛岃鍊煎彧鏈変负姝f暟鎵嶆湁鐢級
-      min-idle: 0
+      min-idle: 5
       # 浠庤繛鎺ユ睜涓幏鍙栬繛鎺ユ渶澶х瓑寰呮椂闂达紙榛樿涓�-1锛屽崟浣嶄负姣锛岃礋鏁拌〃绀烘棤闄愶級
       max-wait: -1
 

--
Gitblit v1.9.3