From 7d7090b098add475808ffdebebff8b4e2a3b98ff Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期六, 06 八月 2022 12:58:12 +0800
Subject: [PATCH] Merge branch 'hylyasrs' of http://47.97.1.152:5880/r/zy-asrs into hylyasrs
---
src/main/resources/application.yml | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d27d9a4..da1af6a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8081
+ port: 8088
servlet:
context-path: /@pom.build.finalName@
@@ -9,14 +9,8 @@
jmx:
enabled: false
datasource:
- # mysql
-# driver-class-name: com.mysql.jdbc.Driver
-# url: jdbc:mysql://127.0.0.1:3306/cool?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-# username: root
-# password: xltys1995
- # sql-server
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=jsasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=hylyasrs
username: sa
password: sa@123
mvc:
@@ -28,7 +22,7 @@
# password: xltys1995
servlet:
multipart:
- maxFileSize: 10MB
+ maxFileSize: 100MB
maxRequestSize: 100MB
mybatis-plus:
@@ -39,10 +33,19 @@
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
logging:
- path: /stock/out/logs
+ path: /stock/out/@pom.build.finalName@/logs
super:
pwd: xltys1995
swagger:
- enable: false
\ No newline at end of file
+ enable: false
+
+# 涓嬩綅鏈洪厤缃�
+wcs-slave:
+ # 鍙屾繁
+ doubleDeep: true
+ # 鍙屾繁搴撲綅鎺掑彿
+ doubleLocs: 1,4,5,8,9,12,13,16
+ # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+ groupCount: 4
\ No newline at end of file
--
Gitblit v1.9.1