Merge branch 'thirdApiStage' into fourthStage

# Conflicts:
#	laws-base/laws-base-core/src/main/java/com/jero/config/filter/csrf/CsrfFilter.java

laws-module-system/src/main/java/com/jero/modules/system/service/ILoginService.java

@@ -113,4 +113,11 @@ public interface ILoginService{
 	 * @return com.jero.common.api.vo.Result<java.lang.String>
 	 */
 	public Result<String> getRSAPublicKey();
+
+	/**
+	 * srms获取token
+	 * @param username 用户名
+	 * @return
+	 */
+	public Result<JSONObject> srmsByToken(String username);
 }

laws-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java

@@ -625,6 +625,8 @@ public class LoginServiceImpl implements ILoginService {
         return result;
     }
 
+
+
     /**
      * 用户信息
      *
@@ -706,4 +708,25 @@ public class LoginServiceImpl implements ILoginService {
         result.setMessage("登录成功");
         return result;
     }
+
+    @Override
+    public Result<JSONObject> srmsByToken(String userName) {
+        // 获取用户信息
+        SysUser sysUser = sysUserService.getUserByName(userName);
+        // 校验用户是否有效
+        Result<JSONObject> result = sysUserService.checkUserIsEffective(sysUser);
+        if(!result.isSuccess()) {
+            return result;
+        }
+        if (checkSysPermission(sysUser.getUsername())) {
+            return Result.error("该用户无权限，请联系管理员");
+        }
+        //用户登录信息
+        userInfo(sysUser, result);
+        //update-begin--Author:wangshuai  Date:20200714  for：登录日志没有记录人员
+        LoginUser loginUser = new LoginUser();
+        BeanUtils.copyProperties(sysUser, loginUser);
+        baseCommonService.addLog(USER_NAME + userName + LOGIN_SUCCEED, CommonConstant.LOG_TYPE_1, null,loginUser);
+        return result;
+    }
 }