Browse Source

Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart

dev_shibei_match
wangchao 5 years ago
parent
commit
e93fe29df6
  1. 2
      epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
  2. 2
      epmet-module/epmet-third/epmet-third-server/pom.xml
  3. 13
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java

2
epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-third-server: epmet-third-server:
container_name: epmet-third-server-dev container_name: epmet-third-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.125 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.126
ports: ports:
- "8110:8110" - "8110:8110"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/epmet-third/epmet-third-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 https://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.0.125</version> <version>0.0.126</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>

13
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java

@ -232,11 +232,24 @@ public class CodeController {
return new Result<CodeVersionInfoResultDTO>().ok(result); return new Result<CodeVersionInfoResultDTO>().ok(result);
} }
/**
* 版本回退
* @author zhaoqifeng
* @date 2020/8/13 16:51
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
*/
@PostMapping("speedupaudit") @PostMapping("speedupaudit")
public Result speedUpAudit(@RequestBody CodeCommonFormDTO formDTO) { public Result speedUpAudit(@RequestBody CodeCommonFormDTO formDTO) {
codeService.speedUpAudit(formDTO); codeService.speedUpAudit(formDTO);
return new Result<>(); return new Result<>();
} }
@PostMapping("revertcoderelease")
public Result revertCodeRelease(@RequestBody CodeCommonFormDTO formDTO) {
codeService.revertCodeRelease(formDTO);
return new Result<>();
}
} }

Loading…
Cancel
Save