|
@@ -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"));
|