ZengTao
2024-05-10 09fe50d59e2f1e2261d376eb49ad6c40301f25b4
修改IP与数据库连接
4个文件已修改
42 ■■■■ 已修改文件
CanadaMes-ui/src/lang/locales/en-US.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/lang/locales/zh-CN.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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",
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连接失败",
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();
         
    }
}
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