From d4764bcbb80efc278b7dd35e62112eb4b1335ce9 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 24 三月 2025 10:05:55 +0800
Subject: [PATCH] #
---
src/main/webapp/static/wcs/js/common.js | 2 +-
pom.xml | 2 +-
src/main/resources/license.lic | 0
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 2 +-
src/main/resources/application.yml | 4 ++--
src/main/webapp/static/wms/js/common.js | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6cfb7d7..e53536d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,7 +200,7 @@
</dependencies>
<build>
- <finalName>ynhfwcs</finalName>
+ <finalName>glccwcs</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 67fb125..a245b82 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -233,7 +233,7 @@
*/
private void read() throws InterruptedException {
// 鏇存柊鍏ュ嚭搴撴ā寮�
- updateIoMode();
+// updateIoMode();
ArrayList<Integer> staNos = getStaNo();
int staNoSize = staNos.size();
OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize * 8));
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 182605f..7a29a3e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=glccwcs
+ url: jdbc:sqlserver://192.168.4.107:1433;databasename=glccwcs
username: sa
password: sa@123
mvc:
@@ -37,7 +37,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: czscgkwcs
+ subject: glccwcs
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index e4e7c87..a471aac 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
diff --git a/src/main/webapp/static/wcs/js/common.js b/src/main/webapp/static/wcs/js/common.js
index 4445236..a5e6652 100644
--- a/src/main/webapp/static/wcs/js/common.js
+++ b/src/main/webapp/static/wcs/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/ynhfwcs";
+var baseUrl = "/glccwcs";
// 璧嬪��
function setVal(el, val) {
diff --git a/src/main/webapp/static/wms/js/common.js b/src/main/webapp/static/wms/js/common.js
index c54d688..752aabe 100644
--- a/src/main/webapp/static/wms/js/common.js
+++ b/src/main/webapp/static/wms/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/ynhfwcs";
+var baseUrl = "/glccwcs";
// 璇︽儏绐楀彛-楂樺害
var detailHeight = '80%';
--
Gitblit v1.9.1