|
@@ -9,15 +9,15 @@ import com.koobietech.eas.common.utils.PasswordManager;
|
|
import com.koobietech.eas.dao.constant.JwtType;
|
|
import com.koobietech.eas.dao.constant.JwtType;
|
|
import com.koobietech.eas.dao.constant.UserType;
|
|
import com.koobietech.eas.dao.constant.UserType;
|
|
import com.koobietech.eas.dao.dto.LoginTokenDto;
|
|
import com.koobietech.eas.dao.dto.LoginTokenDto;
|
|
-import com.koobietech.eas.dao.pojo.DepartmentPojo;
|
|
|
|
-import com.koobietech.eas.dao.pojo.UserDetailPojo;
|
|
|
|
import com.koobietech.eas.dao.mapper.AdminLoginMapper;
|
|
import com.koobietech.eas.dao.mapper.AdminLoginMapper;
|
|
import com.koobietech.eas.dao.pojo.AdminPojo;
|
|
import com.koobietech.eas.dao.pojo.AdminPojo;
|
|
|
|
+import com.koobietech.eas.dao.pojo.DepartmentPojo;
|
|
|
|
+import com.koobietech.eas.dao.pojo.UserDetailPojo;
|
|
import com.koobietech.eas.mbg.mapper.EasSysStudentMapper;
|
|
import com.koobietech.eas.mbg.mapper.EasSysStudentMapper;
|
|
import com.koobietech.eas.mbg.model.EasSysStudent;
|
|
import com.koobietech.eas.mbg.model.EasSysStudent;
|
|
import com.koobietech.eas.mbg.model.EasSysStudentExample;
|
|
import com.koobietech.eas.mbg.model.EasSysStudentExample;
|
|
-import com.koobietech.eas.service.EasSysUserLoginRedisService;
|
|
|
|
import com.koobietech.eas.service.EasSysStudentLoginService;
|
|
import com.koobietech.eas.service.EasSysStudentLoginService;
|
|
|
|
+import com.koobietech.eas.service.EasSysUserLoginRedisService;
|
|
import com.koobietech.eas.service.config.EasAuthorityConfig;
|
|
import com.koobietech.eas.service.config.EasAuthorityConfig;
|
|
import org.apache.commons.io.IOUtils;
|
|
import org.apache.commons.io.IOUtils;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
@@ -25,9 +25,8 @@ import org.springframework.security.crypto.password.PasswordEncoder;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
-import java.io.File;
|
|
|
|
-import java.io.FileInputStream;
|
|
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
|
|
+import java.io.InputStream;
|
|
import java.lang.reflect.InvocationTargetException;
|
|
import java.lang.reflect.InvocationTargetException;
|
|
import java.lang.reflect.Method;
|
|
import java.lang.reflect.Method;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
@@ -87,8 +86,10 @@ public class EasSysStudentLoginServiceImpl implements EasSysStudentLoginService
|
|
List<DepartmentPojo> departments = userDetailPojo.getDepartments();
|
|
List<DepartmentPojo> departments = userDetailPojo.getDepartments();
|
|
|
|
|
|
//权限配置文件
|
|
//权限配置文件
|
|
- String absolutePath = new File(jsonFilePath).getAbsolutePath();
|
|
|
|
- FileInputStream archiveFile = fileManager.getArchiveFile(absolutePath);
|
|
|
|
|
|
+ //String absolutePath = new File(jsonFilePath).getAbsolutePath();
|
|
|
|
+ //FileInputStream archiveFile = fileManager.getArchiveFile(absolutePath);
|
|
|
|
+ String absolutePath = "temp/authority.json";
|
|
|
|
+ InputStream archiveFile = this.getClass().getClassLoader().getResourceAsStream(absolutePath);
|
|
String jsonStr = "";
|
|
String jsonStr = "";
|
|
try {
|
|
try {
|
|
jsonStr = IOUtils.toString(archiveFile, "UTF-8");
|
|
jsonStr = IOUtils.toString(archiveFile, "UTF-8");
|