温红权 3 jaren geleden
bovenliggende
commit
038c025369

+ 2 - 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/ResourceController.java

@@ -5,19 +5,15 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Arrays;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.collection.CollUtil;
-import com.ruoyi.common.core.domain.GetwayUser;
+import com.ruoyi.common.core.domain.GatewayUser;
 import lombok.RequiredArgsConstructor;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
 
-import org.apache.logging.log4j.Logger;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
@@ -59,7 +55,7 @@ public class ResourceController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('zhdd:resource:list')")
     @GetMapping("/list")
     public TableDataInfo<ResourceVo> list(@Validated(QueryGroup.class) ResourceBo bo) {
-        GetwayUser user =  getGateWayUser();
+        GatewayUser user =  getGateWayUser();
         return iResourceService.queryPageList(bo);
     }
 

+ 3 - 3
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

@@ -4,7 +4,7 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.json.JSONObject;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.GetwayUser;
+import com.ruoyi.common.core.domain.GatewayUser;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -120,7 +120,7 @@ public class BaseController
         return getLoginUser().getUsername();
     }
 
-    public GetwayUser getGateWayUser(){
+    public GatewayUser getGateWayUser(){
         try {
 
             ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
@@ -129,7 +129,7 @@ public class BaseController
             userStr = URLDecoder.decode(userStr, "UTF-8");
             JSONObject userJsonObject = new JSONObject(userStr);
             JSONObject principalObject = userJsonObject.getJSONObject("principal");
-            GetwayUser userDTO = new GetwayUser();
+            GatewayUser userDTO = new GatewayUser();
             userDTO.setUserId(userJsonObject.getStr("id"));
             userDTO.setUsername(principalObject.getStr("userName"));
             userDTO.setOrgId(principalObject.getStr("orgId"));

+ 1 - 1
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/GetwayUser.java → ruoyi-common/src/main/java/com/ruoyi/common/core/domain/GatewayUser.java

@@ -7,7 +7,7 @@ import java.util.List;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class GetwayUser {
+public class GatewayUser {
     //用户ID
     private String userId;
     //用户名