lyhzzz 2 years ago
parent
commit
ac2c8502a6

+ 0 - 1
pom.xml

@@ -172,5 +172,4 @@
 
   </build>
 
-
 </project>

+ 0 - 1
src/main/java/com/fdkankan/manage/ManageApplication.java

@@ -1,6 +1,5 @@
 package com.fdkankan.manage;
 
-import com.dtflys.forest.springboot.annotation.ForestScan;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

+ 1 - 0
src/main/java/com/fdkankan/manage/controller/OverallController.java

@@ -10,6 +10,7 @@ import com.fdkankan.manage.httpClient.client.OverallClient;
 import com.fdkankan.manage.httpClient.vo.OverallParam;
 import com.fdkankan.manage.httpClient.vo.OverallVo;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

+ 2 - 2
src/main/java/com/fdkankan/manage/service/impl/AppFileServiceImpl.java

@@ -42,9 +42,9 @@ public class AppFileServiceImpl extends ServiceImpl<IAppFileMapper, AppFile> imp
 
    @Autowired
     private FYunFileServiceInterface fYunFileServiceInterface;
-    @Value("${upload.type}")
+    @Value("${fyun.type}")
     private String ossType;
-    @Value("${oss.prefix.ali}")
+    @Value("${fyun.host}")
     private String prefixAli;
 
     @Override

+ 1 - 1
src/main/java/com/fdkankan/manage/service/impl/CameraServiceImpl.java

@@ -60,7 +60,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     ICompanyService companyService;
     @Autowired
     IExcelService excelService;
-    @Value("${upload.type}")
+    @Value("${fyun.type}")
     private String ossType;
 
     @Override

+ 1 - 1
src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -64,7 +64,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     IIncrementTypeService incrementTypeService;
     @Autowired
     ISceneProEditService sceneProEditService;
-   @Autowired
+    @Autowired
     FYunFileServiceInterface fYunFileServiceInterface;
     @Autowired
     IScenePlusService scenePlusService;

+ 1 - 1
src/main/resources/bootstrap-test.yml

@@ -20,7 +20,7 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-upload-config.yaml
+          - data-id: common-fyun-config.yaml
             group: DEFAULT_GROUP
             refresh: true