Merge branch 'master' of https://git.steerinfo.com/XTEMS/xt-ems-api

pom.xml

@@ -110,7 +110,7 @@
 		<dependency>
 		<groupId>com.mosalc</groupId>
 		<artifactId>mswebservice</artifactId>
-		<version>1.0</version>
+		<version>1.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.axis2</groupId>

src/main/java/com/steerinfo/ems/emswaterrealtime/service/impl/EmsWaterRealtimeServiceImpl.java

@@ -197,14 +197,12 @@ public class EmsWaterRealtimeServiceImpl extends BaseServiceImpl<EmsWaterRealtim
             // Update
             SetUpdateValue(stub,sql);
         }
-
         // Close
         SetCloseConnSample(stub);
     } catch (AxisFault e) {
         // TODO Auto-generated catch block
         e.printStackTrace();
     }
-
     }
 
     private static void SetOpenConnSample(MswebserviceStub stub) {
@@ -240,7 +238,6 @@ public class EmsWaterRealtimeServiceImpl extends BaseServiceImpl<EmsWaterRealtim
             userInfo.setComText(sql);
             MswebserviceStub.WSQueryExecute query = new MswebserviceStub.WSQueryExecute();
             query.setUserInfo(userInfo);
-
             queryData = stub.wSQueryExecute(query);
             //System.out.println(queryData.getData());
 

src/main/resources/bootstrap.yml

@@ -34,7 +34,7 @@ server:
 eureka:
   client:
     serviceUrl:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.90.238}:${EUREKA_PORT:8086}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.90.225}:${EUREKA_PORT:8086}/eureka/
     metadata-map:
       cluster: ribbon
   instance: