EMPT / location · 提交

转到一个项目

作者 朱兆平
提交 2a5ebce33641eb8a2099bab4a5d83d2383f542fd 1 个父辈 4fc0a6b0

docker部署

内嵌 并排对比
正在显示 5 个修改的文件 包含 23 行增加 和 3 行删除
@@ -31,3 +31,5 @@ build/ @@ -31,3 +31,5 @@ build/
31 31
32 ### VS Code ### 32 ### VS Code ###
33 .vscode/ 33 .vscode/
  34 +### Docker ###
  35 +docker/*.jar
  1 +{
  2 + "AttachStdin" : true,
  3 + "OpenStdin" : true,
  4 + "Image" : "",
  5 + "Volumes" : { },
  6 + "ExposedPorts" : { },
  7 + "HostConfig" : {
  8 + "Binds" : [ ],
  9 + "NetworkMode" : "host"
  10 + },
  11 + "_comment" : ""
  12 +}
@@ -10,6 +10,10 @@ public class Location { @@ -10,6 +10,10 @@ public class Location {
10 10
11 private String adrname; 11 private String adrname;
12 12
  13 + private String eeid;
  14 +
  15 + private String wmid;
  16 +
13 private Integer parent; 17 private Integer parent;
14 18
15 private Integer type; 19 private Integer type;
@@ -104,8 +104,8 @@ eureka: @@ -104,8 +104,8 @@ eureka:
104 #eureka服务器页面中status的请求路径 104 #eureka服务器页面中status的请求路径
105 status-page-url: http://${docker.server.ip}:${server.port}/ 105 status-page-url: http://${docker.server.ip}:${server.port}/
106 prefer-ip-address: true 106 prefer-ip-address: true
107 - instance-id: ${docker.server.ip}:${server.port}  
108 - hostname: ${spring.cloud.client.ip-address} 107 + instance-id: ${spring.cloud.client.ip-address}:${server.port}
  108 +# hostname: ${spring.cloud.client.ip-address}
109 lease-renewal-interval-in-seconds: 15 109 lease-renewal-interval-in-seconds: 15
110 lease-expiration-duration-in-seconds: 45 110 lease-expiration-duration-in-seconds: 45
111 client: 111 client:
@@ -3,13 +3,15 @@ @@ -3,13 +3,15 @@
3 <mapper namespace="com.sunyo.energy.location.dao.LocationMapper" > 3 <mapper namespace="com.sunyo.energy.location.dao.LocationMapper" >
4 <resultMap id="BaseResultMap" type="com.sunyo.energy.location.model.Location" > 4 <resultMap id="BaseResultMap" type="com.sunyo.energy.location.model.Location" >
5 <id column="id" property="id" jdbcType="INTEGER" /> 5 <id column="id" property="id" jdbcType="INTEGER" />
  6 + <id column="wm_id" property="wmid" jdbcType="VARCHAR" />
  7 + <id column="ee_id" property="eeid" jdbcType="VARCHAR" />
6 <result column="adrName" property="adrname" jdbcType="VARCHAR" /> 8 <result column="adrName" property="adrname" jdbcType="VARCHAR" />
7 <result column="parent" property="parent" jdbcType="INTEGER" /> 9 <result column="parent" property="parent" jdbcType="INTEGER" />
8 <result column="type" property="type" jdbcType="INTEGER" /> 10 <result column="type" property="type" jdbcType="INTEGER" />
9 <collection property="children" select="selectAll" column="id"></collection> 11 <collection property="children" select="selectAll" column="id"></collection>
10 </resultMap> 12 </resultMap>
11 <sql id="Base_Column_List" > 13 <sql id="Base_Column_List" >
12 - id, adrName, parent, type 14 + id, adrName, parent, type, wm_id, ee_id
13 </sql> 15 </sql>
14 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" > 16 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
15 select 17 select