From 2aeea7b010e96f74a52bc4ed5873c41c177a5953 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 27 八月 2020 14:09:57 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 51 +++++++++++++++++++++++++++------------------------
1 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 63be732..ed9f104 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,10 +1,11 @@
server:
port: 9090
+ servlet:
+ context-path: /@pom.build.finalName@
spring:
application:
-# name: @pom.artifactId@
- name:
+ name: @pom.build.finalName@
datasource:
# sql-server
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
@@ -36,31 +37,33 @@
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍫嗗灈鏈�
-# crn[0]:
-# id: 1
-# ip: 192.168.6.9
-# port: 102
-# rack: 0
-# slot: 0
-# # 鍫嗗灈鏈哄叆搴撶珯鐐�
-# crnInStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 5
-# row: 2
-# bay: 1
-# lev: 1
-# # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-# crnOutStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 6
-# row: 1
-# bay: 1
-# lev: 1
+ crn[0]:
+ id: 1
+ ip: 192.168.3.39
+ port: 5015
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=0
+ offset: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 5
+ row: 2
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 6
+ row: 1
+ bay: 1
+ lev: 1
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 192.168.2.125
- port: 102
+ ip: 192.168.3.65
+ port: 6000
rack: 0
slot: 1
# 鍏ュ簱鍙�
--
Gitblit v1.9.1