6号服务器

jeecg-module-conn/src/main/java/org/jeecg/modules/watch/PushWatch.java

@@ -34,7 +34,7 @@ import java.util.List;
 
 
 @Component
-@EnableScheduling
+//@EnableScheduling
 public class PushWatch {
     @Autowired
     MongoUtil mongoUtil;

jeecg-module-gather/src/main/java/org/jeecg/modules/watch/DbWatch.java

@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.Calendar;
 
-@EnableScheduling
+//@EnableScheduling
 @EnableAsync
 @Component
 @Slf4j

jeecg-module-gather/src/main/java/org/jeecg/modules/watch/OpcGatherWatch.java

@@ -23,7 +23,7 @@ import java.util.List;
 @Slf4j
 @EnableAsync
 @Component
-@EnableScheduling
+//@EnableScheduling
 public class OpcGatherWatch {
 
     @Autowired

jeecg-module-gather/src/main/java/org/jeecg/modules/watch/modBusGatherWatch.java

@@ -22,7 +22,7 @@ import java.util.List;
 @Slf4j
 @EnableAsync
 @Component
-@EnableScheduling
+//@EnableScheduling
 public class modBusGatherWatch {
 
     @Autowired

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -169,9 +169,9 @@ spring:
           slow-sql-millis: 5000
       datasource:
         master:
-          url: jdbc:mysql://123.57.213.14:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://127.0.0.1:3306/lg?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
-          password: 1qaz2wsx@..
+          password: '@qwe@123'
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:

jeecg-server-cloud/jeecg-cloud-nacos/src/main/java/com/alibaba/nacos/JeecgNacosApplication.java

@@ -32,7 +32,7 @@ public class JeecgNacosApplication {
 //        System.setProperty("nacos.core.auth.default.password", "nacos");
         System.setProperty("server.tomcat.basedir","logs");
         //自定义启动端口号
-        System.setProperty("server.port","8848");
+        System.setProperty("server.port","8849");
         SpringApplication.run(JeecgNacosApplication.class, args);
     }
 

jeecg-server-cloud/jeecg-cloud-nacos/src/main/resources/application-mysql.yml

@@ -13,9 +13,9 @@ spring:
 db:
   num: 1
   password:
-    '0': ${MYSQL-PWD:root}
+    '0': ${MYSQL-PWD:1qaz2wsx@..}
   url:
-    '0': jdbc:mysql://${MYSQL-HOST:jeecg-boot-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:nacos}?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+    '0': jdbc:mysql://${MYSQL-HOST:123.57.213.14}:${MYSQL-PORT:3306}/${MYSQL-DB:nacos}?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
   user:
     '0': ${MYSQL-USER:root}
 management:

pom.xml

@@ -125,6 +125,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<!--集成springmvc框架并实现自动配置 -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
@@ -533,7 +538,7 @@
                 <!--当前环境-->
                 <profile.name>dev</profile.name>
                 <!--Nacos服务地址-->
-                <config.server-addr>jeecg-boot-nacos:8848</config.server-addr>
+                <config.server-addr>jeecg-boot-nacos:8849</config.server-addr>
 				<!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID，不能使用名称,默认为空-->
 				<config.namespace></config.namespace>
 				<!--Nacos配置分组名称-->
@@ -563,7 +568,7 @@
                 <!--当前环境-->
                 <profile.name>test</profile.name>
                 <!--Nacos服务地址-->
-                <config.server-addr>jeecg-boot-nacos:8848</config.server-addr>
+                <config.server-addr>jeecg-boot-nacos:8849</config.server-addr>
 				<!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID，不能使用名称,默认为空-->
 				<config.namespace></config.namespace>
 				<!--Nacos配置分组名称-->
@@ -581,7 +586,7 @@
                 <!--当前环境-->
                 <profile.name>prod</profile.name>
                 <!--Nacos服务地址-->
-                <config.server-addr>jeecg-boot-nacos:8848</config.server-addr>
+                <config.server-addr>jeecg-boot-nacos:8849</config.server-addr>
 				<!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID，不能使用名称,默认为空-->
 				<config.namespace></config.namespace>
 				<!--Nacos配置分组名称-->