|
@@ -6,7 +6,6 @@ import com.qmth.boot.core.solar.model.AppInfo;
|
|
|
import com.qmth.boot.core.solar.model.OrgInfo;
|
|
|
import com.qmth.boot.core.solar.service.SolarService;
|
|
|
import com.qmth.teachcloud.common.bean.result.AppInfoResult;
|
|
|
-import com.qmth.teachcloud.common.config.DictionaryConfig;
|
|
|
import com.qmth.teachcloud.common.contant.SpringContextHolder;
|
|
|
import com.qmth.teachcloud.common.contant.SystemConstant;
|
|
|
import com.qmth.teachcloud.common.entity.BasicSchool;
|
|
@@ -14,10 +13,7 @@ import com.qmth.teachcloud.common.entity.SysOrg;
|
|
|
import com.qmth.teachcloud.common.entity.TSAuth;
|
|
|
import com.qmth.teachcloud.common.enums.AuthEnum;
|
|
|
import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
|
|
|
-import com.qmth.teachcloud.common.enums.UploadFileEnum;
|
|
|
import com.qmth.teachcloud.common.service.*;
|
|
|
-import com.qmth.teachcloud.common.util.FileStoreUtil;
|
|
|
-import org.apache.commons.lang3.StringUtils;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.stereotype.Service;
|
|
@@ -25,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
-import java.io.File;
|
|
|
import java.util.*;
|
|
|
|
|
|
/**
|
|
@@ -54,12 +49,6 @@ public class AuthInfoServiceImpl implements AuthInfoService {
|
|
|
@Resource
|
|
|
BasicSchoolService basicSchoolService;
|
|
|
|
|
|
- @Resource
|
|
|
- FileStoreUtil fileStoreUtil;
|
|
|
-
|
|
|
- @Resource
|
|
|
- DictionaryConfig dictionaryConfig;
|
|
|
-
|
|
|
@Resource
|
|
|
AuthInfoService authInfoService;
|
|
|
|
|
@@ -201,12 +190,6 @@ public class AuthInfoServiceImpl implements AuthInfoService {
|
|
|
orgCodesMap = new HashMap<>();
|
|
|
}
|
|
|
|
|
|
- boolean oss = dictionaryConfig.sysDomain().isOss();
|
|
|
- StringJoiner stringJoiner = new StringJoiner("");
|
|
|
- if (!oss && Objects.nonNull(dictionaryConfig.fssPublicDomain()) && !StringUtils.isBlank(dictionaryConfig.fssPublicDomain().getConfig()) && !dictionaryConfig.fssPublicDomain().getConfig().startsWith(SystemConstant.START_PARENT)) {
|
|
|
- stringJoiner.add(dictionaryConfig.fssPublicDomain().getConfig()).add(File.separator);
|
|
|
- }
|
|
|
- stringJoiner = SystemConstant.getDirName(stringJoiner, UploadFileEnum.FILE, true);
|
|
|
Long expireTime = null;
|
|
|
if (Objects.nonNull(appInfo) && Objects.nonNull(appInfo.getControl())) {
|
|
|
expireTime = Objects.nonNull(appInfo.getControl().getExpireTime()) ? appInfo.getControl().getExpireTime() : -1;
|