登录

cloud-platform-base/platform-core/src/main/java/com/huimv/core/consts/SpringSecurityConstant.java

@@ -52,6 +52,7 @@ public interface SpringSecurityConstant {
             //后端的
             "/",
             "/login",
+            "/login001",
             "/logout",
             "/oauth/**",
 

cloud-platform-base/platform-core/src/main/java/com/huimv/core/pojo/response/ResponseData.java

@@ -63,6 +63,16 @@ public class ResponseData {
      */
     private Object data;
 
+    /**
+     * 响应牧场名称
+     */
+    private String farmName;
+
+    /**
+     * 响应牧场id
+     */
+    private Integer farmId;
+
     public ResponseData() {
     }
 

cloud-platform-base/platform-system/src/main/java/com/huimv/sys/modular/auth/controller/SysLoginController.java

@@ -90,9 +90,7 @@ public class SysLoginController {
      /*   if (ConstantContextHolder.getTenantOpenFlag()) {
             authService.cacheTenantInfo(tenantCode);
         }*/
-        String token = authService.login(account, password);
-        System.out.println("token="+token);
-        return new SuccessResponseData(token);
+        return authService.login(account, password);
     }
 
 
@@ -105,8 +103,8 @@ public class SysLoginController {
         String password = dict.getStr("password");
         String tenantCode = dict.getStr("tenantCode");
 
-        String token = authService.login(account, password);
-        return new SuccessResponseData(token);
+
+        return authService.login(account, password);
     }
 
 

cloud-platform-base/platform-system/src/main/java/com/huimv/sys/modular/auth/service/AuthService.java

@@ -24,6 +24,8 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
  */
 package com.huimv.sys.modular.auth.service;
 
+import com.huimv.core.pojo.response.ResponseData;
+import com.huimv.core.pojo.response.SuccessResponseData;
 import com.huimv.sys.modular.user.entity.SysUser;
 import org.springframework.security.core.Authentication;
 import com.huimv.core.pojo.login.SysLoginUser;
@@ -47,7 +49,7 @@ public interface AuthService {
      * @author xuyuxiang
      * @date 2020/3/11 15:57
      */
-    String login(String account, String password);
+    SuccessResponseData login(String account, String password);
 
     /**
      * 根据已有用户信息登录

cloud-platform-base/platform-system/src/main/java/com/huimv/sys/modular/auth/service/impl/AuthServiceImpl.java

@@ -30,6 +30,8 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
+import com.huimv.core.pojo.response.ResponseData;
+import com.huimv.core.pojo.response.SuccessResponseData;
 import com.huimv.sys.core.cache.UserCache;
 import com.huimv.sys.core.enums.LogSuccessStatusEnum;
 import com.huimv.sys.core.jwt.JwtPayLoad;
@@ -86,7 +88,7 @@ public class AuthServiceImpl implements AuthService, UserDetailsService {
     private UserCache userCache;
 
     @Override
-    public String login(String account, String password) {
+    public SuccessResponseData login(String account, String password) {
 
         if (ObjectUtil.hasEmpty(account, password)) {
             LogManager.me().executeLoginLog(account, LogSuccessStatusEnum.FAIL.getCode(), AuthExceptionEnum.ACCOUNT_PWD_EMPTY.getMessage());
@@ -109,7 +111,11 @@ public class AuthServiceImpl implements AuthService, UserDetailsService {
             throw new AuthException(AuthExceptionEnum.ACCOUNT_PWD_ERROR);
         }
 
-        return doLogin(sysUser);
+        SuccessResponseData successResponseData = new SuccessResponseData(doLogin(sysUser));
+        successResponseData.setFarmId(sysUser.getFarmId());
+        successResponseData.setFarmName(sysUser.getFarmName());
+
+        return successResponseData;
     }
 
 

cloud-platform-base/platform-system/src/main/java/com/huimv/sys/modular/user/entity/SysUser.java

@@ -133,4 +133,9 @@ public class SysUser extends BaseEntity {
     private Integer status;
 
 
+    private Integer farmId;
+
+    private String farmName;
+
+
 }