Browse Source

epmetuser服务升级

dev_shibei_match
yinzuomei 5 years ago
parent
commit
1ab9ea850e
  1. 2
      epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
  2. 2
      epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
  3. 2
      epmet-user/epmet-user-server/deploy/docker-compose-test.yml
  4. 2
      epmet-user/epmet-user-server/pom.xml
  5. 4
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java

2
epmet-user/epmet-user-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-user-server: epmet-user-server:
container_name: epmet-user-server-dev container_name: epmet-user-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.74 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.75
ports: ports:
- "8087:8087" - "8087:8087"
network_mode: host # 不会创建新的网络 network_mode: host # 不会创建新的网络

2
epmet-user/epmet-user-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-user-server: epmet-user-server:
container_name: epmet-user-server-prod container_name: epmet-user-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.74 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.75
ports: ports:
- "8087:8087" - "8087:8087"
network_mode: host # 不会创建新的网络 network_mode: host # 不会创建新的网络

2
epmet-user/epmet-user-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-user-server: epmet-user-server:
container_name: epmet-user-server-test container_name: epmet-user-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.74 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.75
ports: ports:
- "8087:8087" - "8087:8087"
network_mode: host # 不会创建新的网络 network_mode: host # 不会创建新的网络

2
epmet-user/epmet-user-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.74</version> <version>0.3.75</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-user</artifactId> <artifactId>epmet-user</artifactId>

4
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java

@ -148,9 +148,9 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
@Override @Override
public Result<LatestGridInfoResultDTO> getLatestGridInfoByUserId(String userId) { public Result<LatestGridInfoResultDTO> getLatestGridInfoByUserId(String userId) {
LatestGridInfoResultDTO latestGridInfoResultDTO= baseDao.selectLatestGridInfoByUserId(userId); LatestGridInfoResultDTO latestGridInfoResultDTO= baseDao.selectLatestGridInfoByUserId(userId);
if (null == latestGridInfoResultDTO) { /*if (null == latestGridInfoResultDTO) {
return new Result<LatestGridInfoResultDTO>().ok(new LatestGridInfoResultDTO()); return new Result<LatestGridInfoResultDTO>().ok(new LatestGridInfoResultDTO());
} }*/
return new Result<LatestGridInfoResultDTO>().ok(latestGridInfoResultDTO); return new Result<LatestGridInfoResultDTO>().ok(latestGridInfoResultDTO);
} }

Loading…
Cancel
Save