Procházet zdrojové kódy

1.由于web服务器(青岛)和rds服务器(杭州)不在一个区,网络延时有0.5秒,故数据库改为本机。

tomatozq před 5 roky
rodič
revize
d744b89eee

+ 9 - 7
common/src/main/java/com/jpsoft/smart/modules/base/service/impl/DeviceInfoServiceImpl.java

@@ -88,13 +88,15 @@ public class DeviceInfoServiceImpl implements DeviceInfoService {
 	@Override
 	public void updateByDeviceNo(String deviceNo, String ip) {
 		try{
-		DeviceInfo deviceInfo= deviceInfoDAO.findByDeviceNo(deviceNo);
-		String oldIp = deviceInfo.getIpAddress();
-		if (deviceInfo.getIsAutoUpdate() && !deviceInfo.getIpAddress().equals(ip)){
-			deviceInfo.setIpAddress(ip);
-			deviceInfoDAO.update(deviceInfo);
-			log.warn(deviceNo+"的ip由原来的:"+oldIp+"自动更新为:"+ip);
-		}
+			DeviceInfo deviceInfo= deviceInfoDAO.findByDeviceNo(deviceNo);
+			String oldIp = deviceInfo.getIpAddress();
+
+			if (deviceInfo.getIsAutoUpdate()!=null &&
+			deviceInfo.getIsAutoUpdate() && !deviceInfo.getIpAddress().equals(ip)){
+				deviceInfo.setIpAddress(ip);
+				deviceInfoDAO.update(deviceInfo);
+				log.warn(deviceNo+"的ip由原来的:"+oldIp+"自动更新为:"+ip);
+			}
 		}catch (Exception e){
 			log.error(deviceNo +":" +e.getMessage());
 		}

+ 4 - 0
lapi/src/main/resources/application-test.yml

@@ -6,6 +6,10 @@ spring:
     url: jdbc:log4jdbc:mysql://127.0.0.1:3306/smart-community?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
     username: root
     password: slgo^Root_!Q@W#E)P(O*I
+#  datasource:
+#    url: jdbc:log4jdbc:mysql://hbjpsoft.mysql.rds.aliyuncs.com:3306/smart?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#    username: smart
+#    password: smart_123
   devtools:
     add-properties: false
     restart:

+ 7 - 3
web/src/main/resources/application-production.yml

@@ -5,9 +5,13 @@ server:
 
 spring:
   datasource:
-    url: jdbc:log4jdbc:mysql://hbjpsoft.mysql.rds.aliyuncs.com:3306/smart?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-    username: smart
-    password: smart_123
+    url: jdbc:log4jdbc:mysql://127.0.0.1:3306/smart-community?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    username: root
+    password: slgo^Root_!Q@W#E)P(O*I
+  #  datasource:
+  #    url: jdbc:log4jdbc:mysql://hbjpsoft.mysql.rds.aliyuncs.com:3306/smart?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+  #    username: smart
+  #    password: smart_123
   devtools:
     restart:
       enabled: true