docker部署

@@ -31,3 +31,5 @@ build/
 
 ### VS Code ###
 .vscode/
+### Docker ###
+docker/*.jar
\ No newline at end of file

+{
+  "AttachStdin" : true,
+  "OpenStdin" : true,
+  "Image" : "",
+  "Volumes" : { },
+  "ExposedPorts" : { },
+  "HostConfig" : {
+    "Binds" : [ ],
+    "NetworkMode" : "host"
+  },
+  "_comment" : ""
+}
\ No newline at end of file

@@ -10,6 +10,10 @@ public class Location {
 
     private String adrname;
 
+    private String eeid;
+
+    private String wmid;
+
     private Integer parent;
 
     private Integer type;

@@ -104,8 +104,8 @@ eureka:
     #eureka服务器页面中status的请求路径
     status-page-url:  http://${docker.server.ip}:${server.port}/
     prefer-ip-address: true
-    instance-id:  ${docker.server.ip}:${server.port}
-    hostname: ${spring.cloud.client.ip-address}
+    instance-id:  ${spring.cloud.client.ip-address}:${server.port}
+#    hostname: ${spring.cloud.client.ip-address}
     lease-renewal-interval-in-seconds: 15
     lease-expiration-duration-in-seconds: 45
   client:

@@ -3,13 +3,15 @@
 <mapper namespace="com.sunyo.energy.location.dao.LocationMapper" >
   <resultMap id="BaseResultMap" type="com.sunyo.energy.location.model.Location" >
     <id column="id" property="id" jdbcType="INTEGER" />
+    <id column="wm_id" property="wmid" jdbcType="VARCHAR" />
+    <id column="ee_id" property="eeid" jdbcType="VARCHAR" />
     <result column="adrName" property="adrname" jdbcType="VARCHAR" />
     <result column="parent" property="parent" jdbcType="INTEGER" />
     <result column="type" property="type" jdbcType="INTEGER" />
     <collection property="children" select="selectAll" column="id"></collection>
   </resultMap>
   <sql id="Base_Column_List" >
-    id, adrName, parent, type
+    id, adrName, parent, type, wm_id, ee_id
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select