2018.8.31

(1)修改网关接口

src/main/java/com/example/tdl/web/GatewayController.java

@@ -196,16 +196,12 @@ public class GatewayController {
             fb.setMessage(i18n.getMessage(request,"existGateway"));
             return gson.toJson(fb);
         }
-        if (StringUtils.isEmpty(updateGatewayVo.getModelName())){
         updateGatewayVo.setUpdateTime(System.currentTimeMillis());
         int a=gatewayService.updateGateway(updateGatewayVo);
         if (a>0){
+            if (StringUtils.isEmpty(updateGatewayVo.getModelName())){
                 fb.setCode(1);
                 fb.setMessage(i18n.getMessage(request,"updateGatewaySuccess"));
-            }else{
-                fb.setCode(0);
-                fb.setMessage(i18n.getMessage(request,"updateGatewayFailure"));
-            }
             }else {
                 Map<Object,Object> map=new HashMap<>();
                 map.put("SN",updateGatewayVo.getSN());
@@ -222,7 +218,10 @@ public class GatewayController {
                     fb.setMessage(msg.get("msg").toString());
                 }
             }
-
+        }else{
+            fb.setCode(0);
+            fb.setMessage(i18n.getMessage(request,"updateGatewayFailure"));
+        }
         return gson.toJson(fb);
     }
 

src/main/resources/application.properties

-spring.datasource.url=jdbc:mysql://192.168.1.16:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url=jdbc:mysql://47.97.184.225:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username=root
 spring.datasource.password=37774020
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver