配置文件修改

teachcloud-exchange-common/src/main/java/com/qmth/teachcloud/exchange/common/service/impl/AuthInfoServiceImpl.java

@@ -3,6 +3,7 @@ package com.qmth.teachcloud.exchange.common.service.impl;
 import com.aventrix.jnanoid.jnanoid.NanoIdUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qmth.boot.core.cache.service.CacheService;
+import com.qmth.boot.core.fss.service.FileService;
 import com.qmth.boot.core.solar.config.SolarProperties;
 import com.qmth.boot.core.solar.model.AppInfo;
 import com.qmth.boot.core.solar.model.OrgInfo;
@@ -20,7 +21,6 @@ import com.qmth.teachcloud.exchange.common.service.BasicSchoolService;
 import com.qmth.teachcloud.exchange.common.service.TSAuthService;
 import com.qmth.teachcloud.exchange.common.util.FileStoreUtil;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -66,6 +66,9 @@ public class AuthInfoServiceImpl implements AuthInfoService {
     @Resource
     CacheService cacheService;
 
+    @Resource
+    FileService fileService;
+
     /**
      * 授权信息初始化
      *
@@ -195,30 +198,30 @@ public class AuthInfoServiceImpl implements AuthInfoService {
             BasicSchool basicSchool = basicSchoolService.getOne(basicSchoolQueryWrapper);
             if (Objects.isNull(basicSchool)) {//不存在则创建学校
                 basicSchool = new BasicSchool(o.getId(), o.getCode(), o.getName(), o.getAccessKey(), o.getAccessSecret());
-//                if (Objects.nonNull(o.getLogo()) && (!o.getLogo().startsWith("https:") || !o.getLogo().startsWith("http"))) {
-                File fileTemp = null;
-                String dirName = null;
-                try {
-                    File fileNew = new File("/Users/king/Downloads/spring.jpg");
-                    fileTemp = File.createTempFile("temp", ".jpg");
-//                        SystemConstant.base64ToImage(o.getLogo(), fileTemp.getPath());
-                    FileUtils.copyInputStreamToFile(new FileInputStream(fileNew), fileTemp);
+                if (Objects.nonNull(o.getLogo()) && (!o.getLogo().startsWith("https:") || !o.getLogo().startsWith("http"))) {
+                    File fileTemp = null;
+                    String dirName = null;
+                    try {
+//                        File fileNew = new File("/Users/king/Downloads/spring.jpg");
+//                        fileTemp = File.createTempFile("temp", ".jpg");
+                        SystemConstant.base64ToImage(o.getLogo(), fileTemp.getPath());
+//                        FileUtils.copyInputStreamToFile(new FileInputStream(fileNew), fileTemp);
 
-                    dirName = stringJoiner.toString() + NanoIdUtils.randomNanoId() + "." + FilenameUtils.getExtension(fileTemp.getPath());
-                    fileStoreUtil.ossUpload(dirName, fileTemp, DigestUtils.md5Hex(new FileInputStream(fileTemp)), UploadFileEnum.FILE.getFssType());
-                } 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);
+                        dirName = stringJoiner.toString() + NanoIdUtils.randomNanoId() + "." + FilenameUtils.getExtension(fileTemp.getPath());
+                        fileStoreUtil.ossUpload(dirName, fileTemp, DigestUtils.md5Hex(new FileInputStream(fileTemp)), UploadFileEnum.FILE.getFssType());
+                    } 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());
                 }
-//                } else {
-//                    basicSchool.setLogo(o.getLogoUrl());
-//                }
                 basicSchoolSet.add(basicSchool);
             } else {
                 basicSchool.setAccessKey(o.getAccessKey());

xjtu-exchange/src/main/resources/application.properties

@@ -27,11 +27,12 @@ db.password=123456789
 #com.qmth.fss.private.server=https://teachcloud-test.oss-cn-shenzhen.aliyuncs.com
 
 com.qmth.fss.public.config=../static/
-com.qmth.fss.public.server=../static
+com.qmth.fss.public.server=/Users/king/git
 #com.qmth.fss.public.server=/static/
 com.qmth.fss.private.config=../static/
-com.qmth.fss.private.server=../static
+com.qmth.fss.private.server=/Users/king/git
 #com.qmth.fss.private.server=/static/
+spring.resources.static-locations=file:${com.qmth.fss.private.server},classpath:/META-INF/resources/,classpath:/resources/
 
 #mysql\u914D\u7F6E
 com.qmth.datasource.url=jdbc:mysql://${db.host}:${db.port}/${db.name}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true