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

epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-mine-server:
     container_name: resi-mine-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.35
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.36
     ports:
       - "8094:8094"
     network_mode: host # 使用现有网络

epmet-module/resi-mine/resi-mine-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"
          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>
-    <version>0.3.35</version>
+    <version>0.3.36</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-mine</artifactId>

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java

@@ -55,7 +55,7 @@ public class ResiMineGridController {
 	 * @Description 单客户-获取用户最近访问网格
 	 * @Date 2020/8/3
 	 **/
-	@PostMapping("latestgridinfo")
+	@GetMapping("latestgridinfo")
 	public Result<LatestGridInfoResultDTO> latestGridInfo(@LoginUser TokenDto token, @RequestBody LatestGridInfoFormDTO formDTO) {
 		ValidatorUtils.validateEntity(formDTO);
 		formDTO.setUserId(token.getUserId());

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -257,6 +257,6 @@ public interface EpmetUserOpenFeignClient {
      * @Description 单客户-获取用户最近访问网格
      * @Date 2020/8/3
      **/
-    @PostMapping(value = "epmetuser/gridlatest/latestgridinfo")
+    @GetMapping(value = "epmetuser/gridlatest/latestgridinfo")
     Result<LatestGridInfoResultDTO> latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO);
 }

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

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

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"
          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>
-    <version>0.3.104</version>
+    <version>0.3.105</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java

@@ -138,7 +138,7 @@ public class GridLatestController {
      * @Description 单客户-根据客户Id和userId查询用户最后一次访问的网格
      * @Date 2020/8/3
      **/
-    @PostMapping("latestgridinfo")
+    @GetMapping("latestgridinfo")
     public Result<LatestGridInfoResultDTO> latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO){
         return new Result<LatestGridInfoResultDTO>().ok(gridLatestService.latestGridInfo(formDTO));
     }