From 62226f7b8b147a47f0351c6894957802e17fc6c7 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 3 Jun 2020 10:10:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.gov-access=E5=88=A0=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E6=95=88=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/controller/AccessController.java    | 43 +++++++++----------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessController.java
index 8a68bec452..487c854dd9 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessController.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessController.java
@@ -1,16 +1,13 @@
 package com.epmet.controller;
 
-import com.epmet.commons.tools.security.dto.GovTokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.LoginUserInfoResultDTO;
 import com.epmet.dto.result.RoleOpeScopeResultDTO;
 import com.epmet.service.AccessService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 import java.util.Set;
 
@@ -46,26 +43,26 @@ public class AccessController {
         return new Result();
     }
 
-    /**
-     * 从缓存中查询用户信息(DataFilterAspect中用到)
-     * @return
-     */
-    @PostMapping("loginuserinfo")
-    public Result<LoginUserInfoResultDTO> getLoginUserInfo(@RequestBody StaffPermCacheFormDTO dto) {
-        ValidatorUtils.validateEntity(dto, StaffPermCacheFormDTO.GetStaffCurrPermissions.class);
-        GovTokenDto govTokenDto = accessService.getUserDetails(dto.getApp(), dto.getClient(), dto.getStaffId());
-        LoginUserInfoResultDTO resultDTO = null;
-        if (govTokenDto != null) {
-            resultDTO = new LoginUserInfoResultDTO();
-            resultDTO.setRoleIdList(govTokenDto.getRoleIdList());
-            //resultDTO.setGridId(govTokenDto.getGridId());
-            resultDTO.setOrgIdPath(govTokenDto.getOrgIdPath());
-            resultDTO.setGridIdList(govTokenDto.getGridIdList());
-            resultDTO.setDeptIdList(govTokenDto.getDeptIdList());
-            resultDTO.setUserId(govTokenDto.getUserId());
-        }
-        return new Result<LoginUserInfoResultDTO>().ok(resultDTO);
-    }
+    ///**
+    // * 从缓存中查询用户信息(DataFilterAspect中用到)
+    // * @return
+    // */
+    //@PostMapping("loginuserinfo")
+    //public Result<LoginUserInfoResultDTO> getLoginUserInfo(@RequestBody StaffPermCacheFormDTO dto) {
+    //    ValidatorUtils.validateEntity(dto, StaffPermCacheFormDTO.GetStaffCurrPermissions.class);
+    //    GovTokenDto govTokenDto = accessService.getUserDetails(dto.getApp(), dto.getClient(), dto.getStaffId());
+    //    LoginUserInfoResultDTO resultDTO = null;
+    //    if (govTokenDto != null) {
+    //        resultDTO = new LoginUserInfoResultDTO();
+    //        resultDTO.setRoleIdList(govTokenDto.getRoleIdList());
+    //        //resultDTO.setGridId(govTokenDto.getGridId());
+    //        resultDTO.setOrgIdPath(govTokenDto.getOrgIdPath());
+    //        resultDTO.setGridIdList(govTokenDto.getGridIdList());
+    //        resultDTO.setDeptIdList(govTokenDto.getDeptIdList());
+    //        resultDTO.setUserId(govTokenDto.getUserId());
+    //    }
+    //    return new Result<LoginUserInfoResultDTO>().ok(resultDTO);
+    //}
 
     /**
      * 查询角色的操作key对应操作范围列表(缓存)

From d0ff40e6998a04ca8ce19d2854e3e2fd065f73df Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 3 Jun 2020 10:11:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +-
 epmet-user/epmet-user-server/pom.xml                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
index 4d0c51854b..6d258a8771 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
+++ b/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.54
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.55
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index 61df77a965..482d837c19 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/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.54</version>
+    <version>0.3.55</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>