From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/resources/application.yml | 76 ++++++++++++++++++++++++++++++++------
1 files changed, 64 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 12eaea8..74c7ea8 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,28 +1,31 @@
server:
port: 8081
+ servlet:
+ context-path: /@pom.build.finalName@
spring:
application:
-# name: @pom.artifactId@
- name:
+ name: @pom.build.finalName@
+ 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=xtyasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=tzskasrs
+ #url: jdbc:sqlserver://192.168.4.15:1433;databasename=tzskasrs
+ #url: jdbc:sqlserver://10.10.10.40:1433;databasename=tzskasrs
username: sa
password: sa@123
mvc:
static-path-pattern: /**
redis:
- host: localhost
+ host: 127.0.0.1
port: 6379
database: 0
# password: xltys1995
+ servlet:
+ multipart:
+ maxFileSize: 100MB
+ maxRequestSize: 100MB
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
@@ -32,10 +35,59 @@
# 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
+
+#License鐩稿叧閰嶇疆
+license:
+ subject: tzskasrs
+ publicAlias: publicCert
+ storePass: public_zhongyang_123456789
+ licensePath: license.lic
+ publicKeysStorePath: publicCerts.keystore
+
+# 涓嬩綅鏈洪厤缃�
+wcs-slave:
+ # 鍙屾繁
+ doubleDeep: true
+ # 鍙屾繁搴撲綅鎺掑彿
+ doubleLocs: 32
+ # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+ groupCount: 2
+ url: http://127.0.0.1:9090/tzskwcs
+
+#鍏ュ簱鏆傚瓨鏁�
+store:
+ bufferCount: 2
+
+erp:
+ db:
+ driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+ ur: jdbc:sqlserver://192.168.1.55:1433;databasename=ufdata_998_2022
+ username: WMS
+ password: Wlzh44338
+
+agv:
+# url: localhost:8080
+# taskCreatePath: /agv/task/create
+# containerMoveInPath: /agv/container/moveIn
+# containerMoveOutPath: /agv/container/moveOut
+# containerArrivedPath: /agv/containerArrived
+ url: 10.10.10.182:9046
+ taskCreatePath: /task/create
+ containerMoveInPath: /expand/api/moveIn/container
+ containerMoveOutPath: /expand/api/moveOut/container
+ containerArrivedPath: /conveyor/containerArrived
+
+u8:
+ url: http://192.168.1.55:8010
+ orderReportPath: /api/RdAudit
+
+agvBasDev:
+ maxWorkNum: 1
+
--
Gitblit v1.9.1