外来人员

huimv-admin/src/main/java/com/huimv/admin/common/token/TokenSign.java

@@ -27,7 +27,7 @@ public class TokenSign {
      *
      * @return
      */
-    public static String sign(String userName, Integer id, String farmIds, String workId) {
+    public static String sign(String userName, Integer id, String farmIds, String workId,Integer userType) {
 
         String JwtToken = Jwts.builder()
                 //头部信息
@@ -40,6 +40,7 @@ public class TokenSign {
                 //token主体部分,存储用户信息
                 .claim("userName", userName)
                 .claim("id", id)
+                .claim("type", userType)
                 .claim("farmIds", farmIds)
                 .claim("workId", workId)
                 .signWith(SignatureAlgorithm.HS256, APP_SECRET)

huimv-admin/src/main/java/com/huimv/admin/controller/LoginController.java

@@ -99,7 +99,7 @@ public class LoginController {
             accessToken.setCreated(new Date());
             accessToken.setAccountName(accountName);
             accessToken.setFarmId(accountEntity.getFarmIds());
-            String token = TokenSign.sign(accountName,id,accountEntity.getFarmIds(),null);
+            String token = TokenSign.sign(accountName,id,accountEntity.getFarmIds(),null,null);
             accessToken.setToken(token);
 
             accessToken.setId(id);
@@ -120,7 +120,7 @@ public class LoginController {
     //测试-token
     @PostMapping(value = "/getToken")
     public String getToken(HttpServletRequest req)  {
-        String token =  TokenSign.sign("superadmin",1,null,null);
+        String token =  TokenSign.sign("superadmin",1,null,null,null);
         return  token;
     }
 
@@ -139,7 +139,7 @@ public class LoginController {
             accessToken.setFarmId(data.getFarmIds());
             accessToken.setType(data.getType());
             accessToken.setId(data.getId());
-            String token = TokenSign.sign(accountName,data.getId(),data.getFarmIds(),data.getWorkLocationId());
+            String token = TokenSign.sign(accountName,data.getId(),data.getFarmIds(),data.getWorkLocationId(),data.getType());
             accessToken.setToken(token);
             Integer lastFarmId = data.getLastFarmId();
             if (ObjectUtil.isEmpty(lastFarmId)){
@@ -179,7 +179,7 @@ public class LoginController {
             accessToken.setFarmId("25");
             accessToken.setType(7);
             accessToken.setId(one1.getId());
-            String token = TokenSign.sign(remark, one1.getId(), one1.getFarmIds(), null);
+            String token = TokenSign.sign(remark, one1.getId(), one1.getFarmIds(), null,7);
             accessToken.setToken(token);
         } else {
             accessToken.setAccountName(one.getUserName());
@@ -187,7 +187,7 @@ public class LoginController {
             accessToken.setFarmId("25");
             accessToken.setType(7);
             accessToken.setId(one.getId());
-            String token = TokenSign.sign(remark, one.getId(), one.getFarmIds(), one.getWorkLocationId());
+            String token = TokenSign.sign(remark, one.getId(), one.getFarmIds(), one.getWorkLocationId(),7);
             accessToken.setToken(token);
         }
         return new Result(ResultCode.SUCCESS,accessToken);