获取当前用户接口修改

pom.xml

@@ -48,7 +48,24 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
+        <!--feign(默认集成hystrix熔断器)-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+            <version>2.1.0.RELEASE</version>
+        </dependency>
+        <!--使用security-jwt-->
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-jwt</artifactId>
+        </dependency>
 
+        <!--jwt解析相关-->
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+            <version>0.9.1</version>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

src/main/java/com/unissoft/model/SysUserPO.java

@@ -1,6 +1,7 @@
 package com.unissoft.model;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 
 import java.io.Serializable;
 
@@ -17,40 +18,20 @@ public class SysUserPO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private Integer uId;
-//    用户名
+    //    用户名
     private String uName;
-//    人员名称(姓名)
-    private String personnelName;
-//    人员id必填
-    private Integer personnelId;
-//    电话
-    private String uPhone;
-//    岗位（职务）
-    private String pPost;
-//    用户状态（1：正常，2：异常，3：禁用）
-    private Integer uStatus;
-//    头像地址
-    private String pHeadPortrait;
-//    所属库id
+    //"用于区分登录跳转那个页面（1.分公司领导首页 2.库主任及以上领导首页 3.员工首页）必填项
+    private Integer homeType;
+    //密码
+    private String uPassword;
+    //    所属库id
     private Integer depotId;
-//    所属库名称
-    private String depotName;
-//    仓房id，多个使用‘,’号隔开
+    //    仓房id，多个使用‘,’号隔开
     private String storehouseIds;
-//    仓房名称，多个使用‘,’号隔开
-    private String storehouseNames;
-//    角色id，多个使用‘,’号隔开
+    //    角色id，多个使用‘,’号隔开
     private String roleIds;
-//    角色名称，多个使用‘,’号隔开
+    //    角色名称，多个使用‘,’号隔开
     private String roleName;
-//    所属公司id
-    private Integer companyId;
-//    所属公司名称
-    private String companyName;
-//    所属部门id
-    private Integer departmentId;
-//    所属部门名称
-    private String departmentName;
 
     public Integer getuId() {
         return uId;
@@ -68,52 +49,20 @@ public class SysUserPO implements Serializable {
         this.uName = uName;
     }
 
-    public String getPersonnelName() {
-        return personnelName;
+    public Integer getHomeType() {
+        return homeType;
     }
 
-    public void setPersonnelName(String personnelName) {
-        this.personnelName = personnelName;
+    public void setHomeType(Integer homeType) {
+        this.homeType = homeType;
     }
 
-    public Integer getPersonnelId() {
-        return personnelId;
+    public String getuPassword() {
+        return uPassword;
     }
 
-    public void setPersonnelId(Integer personnelId) {
-        this.personnelId = personnelId;
-    }
-
-    public String getuPhone() {
-        return uPhone;
-    }
-
-    public void setuPhone(String uPhone) {
-        this.uPhone = uPhone;
-    }
-
-    public String getpPost() {
-        return pPost;
-    }
-
-    public void setpPost(String pPost) {
-        this.pPost = pPost;
-    }
-
-    public Integer getuStatus() {
-        return uStatus;
-    }
-
-    public void setuStatus(Integer uStatus) {
-        this.uStatus = uStatus;
-    }
-
-    public String getpHeadPortrait() {
-        return pHeadPortrait;
-    }
-
-    public void setpHeadPortrait(String pHeadPortrait) {
-        this.pHeadPortrait = pHeadPortrait;
+    public void setuPassword(String uPassword) {
+        this.uPassword = uPassword;
     }
 
     public Integer getDepotId() {
@@ -124,14 +73,6 @@ public class SysUserPO implements Serializable {
         this.depotId = depotId;
     }
 
-    public String getDepotName() {
-        return depotName;
-    }
-
-    public void setDepotName(String depotName) {
-        this.depotName = depotName;
-    }
-
     public String getStorehouseIds() {
         return storehouseIds;
     }
@@ -140,14 +81,6 @@ public class SysUserPO implements Serializable {
         this.storehouseIds = storehouseIds;
     }
 
-    public String getStorehouseNames() {
-        return storehouseNames;
-    }
-
-    public void setStorehouseNames(String storehouseNames) {
-        this.storehouseNames = storehouseNames;
-    }
-
     public String getRoleIds() {
         return roleIds;
     }
@@ -164,59 +97,17 @@ public class SysUserPO implements Serializable {
         this.roleName = roleName;
     }
 
-    public Integer getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(Integer companyId) {
-        this.companyId = companyId;
-    }
-
-    public String getCompanyName() {
-        return companyName;
-    }
-
-    public void setCompanyName(String companyName) {
-        this.companyName = companyName;
-    }
-
-    public Integer getDepartmentId() {
-        return departmentId;
-    }
-
-    public void setDepartmentId(Integer departmentId) {
-        this.departmentId = departmentId;
-    }
-
-    public String getDepartmentName() {
-        return departmentName;
-    }
-
-    public void setDepartmentName(String departmentName) {
-        this.departmentName = departmentName;
-    }
-
     @Override
     public String toString() {
         return "SysUserPO{" +
                 "uId=" + uId +
                 ", uName='" + uName + '\'' +
-                ", personnelName='" + personnelName + '\'' +
-                ", personnelId=" + personnelId +
-                ", uPhone='" + uPhone + '\'' +
-                ", pPost='" + pPost + '\'' +
-                ", uStatus=" + uStatus +
-                ", pHeadPortrait='" + pHeadPortrait + '\'' +
+                ", homeType=" + homeType +
+                ", uPassword='" + uPassword + '\'' +
                 ", depotId=" + depotId +
-                ", depotName='" + depotName + '\'' +
                 ", storehouseIds='" + storehouseIds + '\'' +
-                ", storehouseNames='" + storehouseNames + '\'' +
                 ", roleIds='" + roleIds + '\'' +
                 ", roleName='" + roleName + '\'' +
-                ", companyId=" + companyId +
-                ", companyName='" + companyName + '\'' +
-                ", departmentId=" + departmentId +
-                ", departmentName='" + departmentName + '\'' +
                 '}';
     }
 }

src/main/java/com/unissoft/utils/HttpUtil.java

@@ -1,24 +0,0 @@
-package com.unissoft.utils;
-
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * 文件描述
- *
- * @author tongxi.xia
- * @date 2020年12月12日 12:40
- */
-public class HttpUtil {
-
-    public static HttpServletRequest getRequest() {
-        return ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-    }
-
-    public static HttpServletResponse getResponse() {
-        return ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse();
-    }
-}

src/main/java/com/unissoft/utils/UserUtils.java

@@ -1,8 +1,17 @@
 package com.unissoft.utils;
 
-import com.unissoft.MyConstant;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.unissoft.model.SysUserPO;
+import org.springframework.security.jwt.Jwt;
+import org.springframework.security.jwt.JwtHelper;
 import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
 
 /**
  * 文件描述
@@ -14,9 +23,19 @@ import org.springframework.stereotype.Component;
 public class UserUtils {
 
     public static SysUserPO getCurrUserInfo() {
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        HttpServletRequest request = attributes.getRequest();
         SysUserPO loginUser = null;
-        if (HttpUtil.getRequest().getSession().getAttribute(MyConstant.LOGIN_USER) != null) {
-            loginUser = (SysUserPO) HttpUtil.getRequest().getSession().getAttribute(MyConstant.LOGIN_USER);
+        if (request != null && !StringUtils.isEmpty(request.getHeader("Authorization"))) {
+            // 只携带token
+            String authorization = request.getHeader("Authorization").replace("bearer ","");
+            System.out.println(authorization);
+            Jwt decode = JwtHelper.decode(authorization);
+            String claims = decode.getClaims();
+            JSONObject jsonObject = JSON.parseObject(claims);
+            Map<String, String> jsonMap = JSONObject.toJavaObject(jsonObject, Map.class);
+            JSONObject user = JSON.parseObject(jsonMap.get("user_name"));
+            loginUser = JSONObject.toJavaObject(user, SysUserPO.class);
         }
         return loginUser;
     }