k 2 роки тому
батько
коміт
9188582314

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/Test/ModbusTestController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.warewms.Test;
+package com.ruoyi.web.controller.warewms.test;
 
 import com.jwk.spring.boot.autoconfigure.ModbusTcpMasterTemplate;
 import com.jwk.spring.boot.constant.DATA_TYPE_WRAPPER;

+ 3 - 3
ruoyi-admin/src/main/resources/application-dev.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://47.101.169.124:3306/warewms-yonghu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://47.101.169.124:3306/warewms-hualan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: warewms
                 password: warewms123
             # 从库数据源
@@ -65,8 +65,8 @@ testtag:
 # 日志配置
 logging:
     level:
-        com.ruoyi: debug
-        org.springframework: debug
+        com.ruoyi: info
+        org.springframework: info
 
 
 modbus:

+ 6 - 0
ruoyi-admin/src/main/resources/application-prod.yml

@@ -66,3 +66,9 @@ logging:
     level:
         com.ruoyi: info
         org.springframework: info
+
+modbus:
+    tcp-master:
+        open: true
+        host: 127.0.0.1
+        port: 502