1

src/main/java/com/cdf/config/WebAppConfig.java

@@ -29,15 +29,15 @@ public class WebAppConfig implements WebMvcConfigurer {
 
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
-		registry.addInterceptor(tokenInterceptor).addPathPatterns("/**").excludePathPatterns("/**/login/**");
-		registry.addInterceptor(backUserInterceptor).addPathPatterns("/back/**").excludePathPatterns("/**/login/**");
-		registry.addInterceptor(sceneInterceptor).addPathPatterns("/service/**")
-				.excludePathPatterns("/service/scene/edit/tag/save","/service/scene/edit/tag/delete",
-						"/service/scene/edit/tag/list","/service/scene/edit/tag/getHotJson",
-						"/service/scene/edit/publicScene","/service/scene/edit/upload/files",
-						"/service/scene/getInfo","/service/scene/edit/getAuth",
-						"/service/scene/edit/down/qrCode");
-		WebMvcConfigurer.super.addInterceptors(registry);
+//		registry.addInterceptor(tokenInterceptor).addPathPatterns("/**").excludePathPatterns("/**/login/**");
+//		registry.addInterceptor(backUserInterceptor).addPathPatterns("/back/**").excludePathPatterns("/**/login/**");
+//		registry.addInterceptor(sceneInterceptor).addPathPatterns("/service/**")
+//				.excludePathPatterns("/service/scene/edit/tag/save","/service/scene/edit/tag/delete",
+//						"/service/scene/edit/tag/list","/service/scene/edit/tag/getHotJson",
+//						"/service/scene/edit/publicScene","/service/scene/edit/upload/files",
+//						"/service/scene/getInfo","/service/scene/edit/getAuth",
+//						"/service/scene/edit/down/qrCode");
+//		WebMvcConfigurer.super.addInterceptors(registry);
 	}
 
 	@Override

src/main/java/com/cdf/schedule/ScheduleTask.java

@@ -141,7 +141,7 @@ public class ScheduleTask {
 
     @Scheduled(fixedDelay = 24*60*60*1000, initialDelay = 10*1000)
     public void updateBrand() throws Exception {
-        brandService.updateBrandInfo();
+       // brandService.updateBrandInfo();
     }
 
 }

src/main/java/com/cdf/service/impl/ExcelService.java

@@ -142,7 +142,7 @@ public class ExcelService {
             file.getParentFile().mkdirs();
         }
         log.info("checkFile:{}",localFile);
-        uploadToCdfOssUtil.download(awsKey,localFile);
+        uploadToCdfOssUtil.downFromS3(awsKey,localFile);
         if(!file.exists()){
             throw new BusinessException(ResultCode.UPLOAD_FILE_NO_EXIST);
         }

src/main/java/com/cdf/util/UploadToCdfOssUtil.java

@@ -1041,7 +1041,7 @@ public class UploadToCdfOssUtil {
 			.withRegion(Regions.AP_SOUTHEAST_1)
 			.build();
 		try {
-			GetObjectRequest request  = new GetObjectRequest(this.bucket,objectName);
+			GetObjectRequest request  = new GetObjectRequest(this.s3bucket,objectName);
 			s3.getObject(request,new File(localPath));
 			return true;
 		} catch (Exception e) {

src/main/resources/application-local.yaml

@@ -38,27 +38,27 @@ mybatis-plus:
 
 
 fdkk:
-  login-path: http://test.4dkankan.com
-  scene-path: http://test.4dkankan.com
+  login-path: http://testeur.4dkankan.com
+  scene-path: http://testeur.4dkankan.com
   hot-path: scene_view_data/%s/user/hot.json
   hot-cdf-path: cdf/hot/%s/hot.json
   hot-local-path: /home/cdf/fdkk/%s
-  qr-code-url: http://test.4dkankan.com/index.html?m=
+  qr-code-url: https://zhongmian.4dage.com/index.html?m=
   aws:
     s3key: AKIAWCV5QFZ3ZNELKYUY
     s3secrey: epS5ghyR4LJ7rxk/qJO9ZYh6m9Oz6g5haKDu4yws
-    s3bucket: 4dkankan
+    s3bucket: test-4dkankan
 
 cdf:
   aws:
-    s3key: AKIAWCV5QFZ3ZNELKYUY
-    s3secrey: epS5ghyR4LJ7rxk/qJO9ZYh6m9Oz6g5haKDu4yws
-    s3bucket: 4dkankan
+    s3key: AKIAUI25IY4RAEMUZCOQ
+    s3secrey: CeL0IMH+I0qMxLXBRRs3cbRh9DeVOeTMy8wa60o7
+    s3bucket: 4dage-moderate2
 
 upload:
-  type: oss
+  type: aws
   file-path: cdf/file/
-  query-path: https://4dkk.4dage.com/
+  query-path: https://glp-vr.cdfmembers.com/
 
 oss:
   point: http://oss-cn-shenzhen.aliyuncs.com