From 07985b76c6b837c975d47baea261217414864b24 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 16 二月 2022 14:32:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 2 +-
src/main/resources/application.yml | 31 +++++++++++++++++--------------
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index fc718eb..a1c6215 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -134,7 +134,7 @@
staProtocol.setSiteId(siteId);
station.put(siteId, staProtocol);
}
- staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2)); // 鐩爣绔�
+ staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2)); // 鐩爣绔�
}
}
Thread.sleep(50);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8c59dcd..7d7e6f9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,9 +8,12 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://47.97.1.152:51433;databasename=xgmasrs
+# url: jdbc:sqlserver://47.97.1.152:51433;databasename=xgmasrs
+# username: sa
+# password: Zoneyung@zy56$
+ url: jdbc:sqlserver://localhost:1433;databasename=xgmasrs
username: sa
- password: Zoneyung@zy56$
+ password: sa@123
mvc:
static-path-pattern: /**
redis:
@@ -47,8 +50,8 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.10.10
- port: 102
+ ip: 10.10.10.10
+ port: 8888
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
@@ -69,8 +72,8 @@
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 192.168.10.20
- port: 102
+ ip: 10.10.10.13
+ port: 8888
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
@@ -91,8 +94,8 @@
# 鍫嗗灈鏈�3
crn[2]:
id: 3
- ip: 192.168.10.20
- port: 102
+ ip: 10.10.10.16
+ port: 8888
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
@@ -113,8 +116,8 @@
# 鍫嗗灈鏈�4
crn[3]:
id: 4
- ip: 192.168.10.20
- port: 102
+ ip: 10.10.10.19
+ port: 8888
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
@@ -135,8 +138,8 @@
# 鍫嗗灈鏈�5
crn[4]:
id: 5
- ip: 192.168.10.20
- port: 102
+ ip: 10.10.10.22
+ port: 8888
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
@@ -157,10 +160,10 @@
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 192.168.10.100
+ ip: 10.10.10.50
port: 102
rack: 0
- slot: 1
+ slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
staNo: 176
--
Gitblit v1.9.1