|
@@ -13,11 +13,13 @@ 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.LocalCatalogEnum;
|
|
|
import com.qmth.teachcloud.common.enums.UploadFileEnum;
|
|
|
import com.qmth.teachcloud.common.service.*;
|
|
|
import com.qmth.teachcloud.common.util.FileStoreUtil;
|
|
|
import org.apache.commons.codec.digest.DigestUtils;
|
|
|
import org.apache.commons.io.FilenameUtils;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.stereotype.Service;
|
|
@@ -168,7 +170,12 @@ public class AuthInfoServiceImpl implements AuthInfoService {
|
|
|
orgCodesMap = new HashMap<>();
|
|
|
}
|
|
|
|
|
|
- StringJoiner stringJoiner = SystemConstant.getDirName(UploadFileEnum.FILE, true);
|
|
|
+ boolean oss = dictionaryConfig.sysDomain().isOss();
|
|
|
+ StringJoiner stringJoiner = new StringJoiner("");
|
|
|
+ if (!oss && Objects.nonNull(dictionaryConfig.fssLocalFileDomain()) && !StringUtils.isBlank(dictionaryConfig.fssLocalFileDomain().getConfig())) {
|
|
|
+ stringJoiner.add(dictionaryConfig.fssLocalFileDomain().getConfig()).add(File.separator);
|
|
|
+ }
|
|
|
+ stringJoiner = SystemConstant.getDirName(stringJoiner, UploadFileEnum.FILE, true);
|
|
|
for (OrgInfo o : orgInfoList) {
|
|
|
orgCodesMap.put(o.getCode(), o.getCode());
|
|
|
if (authEnum == AuthEnum.OFF_LINE) {
|
|
@@ -195,16 +202,19 @@ public class AuthInfoServiceImpl implements AuthInfoService {
|
|
|
|
|
|
|
|
|
dirName = stringJoiner.toString() + SystemConstant.getNanoId() + "." + FilenameUtils.getExtension(fileTemp.getPath());
|
|
|
- fileStoreUtil.ossUpload(dirName, fileTemp, DigestUtils.md5Hex(new FileInputStream(fileTemp)), UploadFileEnum.FILE.getFssType());
|
|
|
+ String jpgFileMd5 = DigestUtils.md5Hex(new FileInputStream(fileTemp));
|
|
|
+ if (!oss && Objects.nonNull(dictionaryConfig.fssLocalFileDomain()) && !StringUtils.isBlank(dictionaryConfig.fssLocalFileDomain().getServer())) {
|
|
|
+ fileStoreUtil.localUpload(dirName, new FileInputStream(fileTemp), jpgFileMd5, LocalCatalogEnum.LOCAL_FILE);
|
|
|
+ } else {
|
|
|
+ fileStoreUtil.ossUpload(dirName, fileTemp, jpgFileMd5, UploadFileEnum.FILE.getFssType());
|
|
|
+ }
|
|
|
+ basicSchool.setLogo(dirName);
|
|
|
} catch (Exception e) {
|
|
|
log.error(SystemConstant.LOG_ERROR, e);
|
|
|
} finally {
|
|
|
if (Objects.nonNull(fileTemp)) {
|
|
|
fileTemp.delete();
|
|
|
}
|
|
|
- if (Objects.nonNull(dirName)) {
|
|
|
- basicSchool.setLogo(dictionaryConfig.fssPublicDomain().getServer() + File.separator + dirName);
|
|
|
- }
|
|
|
}
|
|
|
} else {
|
|
|
basicSchool.setLogo(o.getLogoUrl());
|