From 09fe50d59e2f1e2261d376eb49ad6c40301f25b4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 10 五月 2024 16:08:59 +0800
Subject: [PATCH] 修改IP与数据库连接
---
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 26 +++++++++++++-------------
springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java | 12 ++++++------
CanadaMes-ui/src/lang/locales/en-US.json | 2 +-
CanadaMes-ui/src/lang/locales/zh-CN.json | 2 +-
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index 459641e..b094fbf 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -1,6 +1,6 @@
{
"Clear":"Clear",
- "ip":"localhost",
+ "ip":"192.168.10.21",
"Abort":"Abort",
"Mes Connection failed":"Mes Connection failed",
"Plc1 Connection failed":"Plc1 Connection failed",
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index 70b5051..f572c8f 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -1,6 +1,6 @@
{
"Clear":"娓呴櫎",
- "ip":"localhost",
+ "ip":"192.168.10.21",
"Abort":"涓",
"Mes Connection failed":"Mes杩炴帴澶辫触",
"Plc1 Connection failed":"Plc1杩炴帴澶辫触",
diff --git a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
index 91669b8..d5980ad 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -17,20 +17,20 @@
//
System.out.println("鍚姩瀹屾垚");
- // new PlcHold().start();
+ new PlcHold().start();
new Plchome().start();
- // new PlcLayout().start();
- // new Plcalarm().start();
- // new Plcsign().start();
- // new Plcstate().start();
- // new PlcPositioning1().start();
- // new PlcParameter2().start();
- // new PLCAutomaticParameterSetting().start();
- // new PlcManualonePosition().start();
- // new PlcManualonePosition2().start();
- // new PlcServoManualone().start();
- // new PLCManualJog().start();
- // new PlcInteractionState().start();
+ new PlcLayout().start();
+ new Plcalarm().start();
+ new Plcsign().start();
+ new Plcstate().start();
+ new PlcPositioning1().start();
+ new PlcParameter2().start();
+ new PLCAutomaticParameterSetting().start();
+ new PlcManualonePosition().start();
+ new PlcManualonePosition2().start();
+ new PlcServoManualone().start();
+ new PLCManualJog().start();
+ new PlcInteractionState().start();
}
}
\ No newline at end of file
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java b/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java
index 1d984a4..47ff2b3 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java
@@ -466,12 +466,12 @@
public static Connection getConn() throws SQLException {
try {
Connection conn = null;
- conn =
- DriverManager.getConnection("jdbc:mysql://localhost:3306/test?serverTimezone=GMT%2B8&characterEncoding=utf-8",
- "root", "beibo.123/");
- // conn = DriverManager.getConnection(
- // "jdbc:mysql://192.168.102.9:3306/production?serverTimezone=GMT%2B8&characterEncoding=utf-8&useSSL=false",
- // "northglass", "n0rthgla55");
+ // conn =
+ // DriverManager.getConnection("jdbc:mysql://localhost:3306/test?serverTimezone=GMT%2B8&characterEncoding=utf-8",
+ // "root", "beibo.123/");
+ conn = DriverManager.getConnection(
+ "jdbc:mysql://192.168.102.9:3306/production?serverTimezone=GMT%2B8&characterEncoding=utf-8&useSSL=false",
+ "northglass", "n0rthgla55");
return conn;
} catch (Exception e) {
// TODO: handle exception
--
Gitblit v1.8.0