lyhzzz 3 anni fa
parent
commit
7965d7c5df

+ 3 - 3
src/main/java/com/cdf/config/WebAppConfig.java

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

+ 153 - 0
src/main/java/com/cdf/controller/FdkkSceneEditController.java

@@ -0,0 +1,153 @@
+package com.cdf.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.cdf.aop.SysLog;
+import com.cdf.common.ResultCode;
+import com.cdf.common.ResultData;
+import com.cdf.entity.FdkkUser;
+import com.cdf.entity.HotRelation;
+import com.cdf.exception.BusinessException;
+import com.cdf.httpClient.client.FdkkClient;
+import com.cdf.httpClient.request.FdkkHotData;
+import com.cdf.httpClient.request.FdkkHotRequest;
+import com.cdf.httpClient.request.FdkkUploadRequest;
+import com.cdf.httpClient.response.FdkkResponse;
+import com.cdf.service.IFdkkUserService;
+import com.cdf.service.IHotRelationService;
+import com.cdf.util.JwtUtil;
+import com.dtflys.forest.annotation.JSONBody;
+import com.fdkankan.fyun.oss.UploadToOssUtil;
+import com.google.gson.JsonObject;
+import jdk.nashorn.internal.parser.Token;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+
+@RestController
+@RequestMapping("/service/scene/edit")
+public class FdkkSceneEditController {
+
+    @Resource
+    private UploadToOssUtil uploadToOssUtil;
+    @Value("${oss.bucket}")
+    private String bucket;
+    @Value("${fdkk.hot-path}")
+    private String hotPath;
+    @Resource
+    private FdkkClient fdkkClient;
+    @Autowired
+    private IFdkkUserService fdkkUserService;
+    @Autowired
+    private IHotRelationService hotRelationService;
+
+    @PostMapping("/tag/save")
+    @SysLog("/热点新增编辑")
+    public FdkkResponse save(@RequestBody FdkkHotRequest fdkkHotRequest, @RequestHeader String token){
+        Integer userId = JwtUtil.getId(token);
+        FdkkUser fdkkUser = fdkkUserService.getById(userId);
+        FdkkResponse fdkkResponse = fdkkClient.hotSave(fdkkHotRequest, fdkkUser.getToken());
+        if(fdkkResponse.getCode() != 0){
+            throw new BusinessException(fdkkResponse.getCode(),fdkkResponse.getMsg());
+        }
+        List<FdkkHotData> hotDataList = fdkkHotRequest.getHotDataList();
+        for (FdkkHotData fdkkHotData : hotDataList) {
+            List<Integer> relationIds = fdkkHotData.getRelationIds();
+            String sid = fdkkHotData.getSid();
+            Integer type = fdkkHotData.getHotType();
+            HotRelation hotRelation = new HotRelation();
+            hotRelation.setHotId(sid);
+            hotRelation.setHotType(type);
+            hotRelation.setRelationIds(JSONArray.toJSONString(relationIds));
+            hotRelation.setNum(fdkkHotRequest.getNum());
+            hotRelationService.saveOrUpdate(hotRelation);
+        }
+        return fdkkResponse;
+    }
+
+    @PostMapping("/tag/delete")
+    @SysLog("/热点删除")
+    public ResultData delete(@RequestBody FdkkHotRequest fdkkHotRequest, @RequestHeader String token){
+        Integer userId = JwtUtil.getId(token);
+        FdkkUser fdkkUser = fdkkUserService.getById(userId);
+        FdkkResponse fdkkResponse = fdkkClient.hotDelete(fdkkHotRequest, fdkkUser.getToken());
+        if(fdkkResponse.getCode() !=0){
+            throw new BusinessException(fdkkResponse.getCode(),fdkkResponse.getMsg());
+        }
+        hotRelationService.removeByIds(fdkkHotRequest.getSidList());
+        return ResultData.ok();
+    }
+
+
+    @PostMapping("/tag/list")
+    public ResultData list (@RequestParam(required = false) String num,@RequestHeader String token){
+        Integer userId = JwtUtil.getId(token);
+        FdkkUser fdkkUser = fdkkUserService.getById(userId);
+        FdkkResponse fdkkResponse = fdkkClient.hotList(num, fdkkUser.getToken());
+        if(fdkkResponse.getCode() !=0){
+            throw new BusinessException(fdkkResponse.getCode(),fdkkResponse.getMsg());
+        }
+        JSONArray tags = JSONObject.parseObject(JSONObject.toJSONString(fdkkResponse.getData())).getJSONArray("tags");
+        for (Object obj : tags) {
+            JSONObject tag = (JSONObject) obj;
+            String sid = tag.getString("sid");
+            HotRelation hotRelation = hotRelationService.getById(sid);
+            String relationIds = hotRelation.getRelationIds();
+        }
+
+        return ResultData.ok();
+    }
+
+    @PostMapping("publicScene")
+    public ResultData scenePublicScene(@RequestBody FdkkHotRequest fdkkHotRequest ,@RequestHeader String token){
+        Integer userId = JwtUtil.getId(token);
+        FdkkUser fdkkUser = fdkkUserService.getById(userId);
+        FdkkResponse fdkkResponse = fdkkClient.scenePublicScene(fdkkHotRequest.getNum(), fdkkUser.getToken());
+        if(fdkkResponse.getCode() !=0){
+            throw new BusinessException(fdkkResponse.getCode(),fdkkResponse.getMsg());
+        }
+        String content = uploadToOssUtil.getObjectContent(bucket, String.format(hotPath, fdkkHotRequest.getNum()));
+        JSONArray jsonArray = JSONObject.parseArray(content);
+        if(jsonArray == null){
+            return ResultData.ok();
+        }
+        for (Object obj : jsonArray) {
+            JSONObject jsonObject= (JSONObject) obj;
+            String sid = jsonObject.getString("sid");
+            HotRelation hotRelation = hotRelationService.getById(sid);
+            jsonObject.put("hotRelation",hotRelation);
+        }
+        return ResultData.ok();
+    }
+
+    @PostMapping("/upload/files")
+    public ResultData uploadFiles(FdkkUploadRequest fdkkUploadRequest, MultipartFile files,@RequestHeader String token) throws IOException {
+        Integer userId = JwtUtil.getId(token);
+        FdkkUser fdkkUser = fdkkUserService.getById(userId);
+        String path = null;
+        if(files !=null && files.getSize() >0){
+            String fileName = files.getOriginalFilename();
+            // 获取文件后缀
+            String prefix = fileName.substring(fileName.lastIndexOf("."));
+            File newFile = File.createTempFile(UUID.randomUUID().toString() ,prefix);
+            files.transferTo(newFile);
+            path = newFile.getPath();
+        }
+
+        FdkkResponse fdkkResponse = fdkkClient.uploadFiles(fdkkUploadRequest,path,fdkkUser.getToken());
+        if(fdkkResponse.getCode() !=0){
+            throw new BusinessException(fdkkResponse.getCode(),fdkkResponse.getMsg());
+        }
+        return ResultData.ok(fdkkResponse.getMsg(),fdkkResponse.getData());
+    }
+
+}

+ 43 - 0
src/main/java/com/cdf/controller/HotController.java

@@ -0,0 +1,43 @@
+package com.cdf.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.cdf.common.ResultCode;
+import com.cdf.common.ResultData;
+import com.cdf.entity.HotRelation;
+import com.cdf.exception.BusinessException;
+import com.cdf.request.HotTypeRequest;
+import com.cdf.service.IHotRelationService;
+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;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/back")
+public class HotController {
+
+    @Autowired
+    private IHotRelationService hotRelationService;
+
+    @PostMapping("/getByHotType")
+    public ResultData getByHotType(@RequestBody HotTypeRequest hotTypeRequest){
+        if(hotTypeRequest.getHotType() == null){
+            throw new BusinessException(ResultCode.PARAM_MISS);
+        }
+        return ResultData.ok();
+    }
+
+    @PostMapping("/getBySid")
+    public ResultData getBySid(@RequestBody HotTypeRequest hotTypeRequest){
+        if(hotTypeRequest.getSid() == null){
+            throw new BusinessException(ResultCode.PARAM_MISS);
+        }
+        HotRelation hotRelation = hotRelationService.getById(hotTypeRequest.getSid());
+        if(hotRelation == null){
+
+        }
+        hotRelation.getRelationIds();
+        return ResultData.ok();
+    }
+}

+ 0 - 93
src/main/java/com/cdf/controller/HotSpotController.java

@@ -1,93 +0,0 @@
-package com.cdf.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.cdf.aop.SysLog;
-import com.cdf.common.ResultData;
-import com.cdf.entity.FdkkUser;
-import com.cdf.entity.HotRelation;
-import com.cdf.exception.BusinessException;
-import com.cdf.httpClient.client.FdkkClient;
-import com.cdf.httpClient.request.FdkkHotData;
-import com.cdf.httpClient.request.FdkkHotRequest;
-import com.cdf.httpClient.response.FdkkResponse;
-import com.cdf.service.IFdkkUserService;
-import com.cdf.service.IHotRelationService;
-import com.cdf.util.JwtUtil;
-import com.fdkankan.fyun.oss.UploadToOssUtil;
-import jdk.nashorn.internal.parser.Token;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@RestController
-@RequestMapping("/hotSpot")
-public class HotSpotController {
-
-    @Resource
-    private UploadToOssUtil uploadToOssUtil;
-    @Value("${oss.bucket}")
-    private String bucket;
-    @Value("${fdkk.hot-path}")
-    private String hotPath;
-    @Resource
-    private FdkkClient fdkkClient;
-    @Autowired
-    private IFdkkUserService fdkkUserService;
-    @Autowired
-    private IHotRelationService hotRelationService;
-
-    @PostMapping("/save")
-    @SysLog("/热点新增编辑")
-    public FdkkResponse save(@RequestBody FdkkHotRequest fdkkHotRequest, @RequestHeader String token){
-        Integer userId = JwtUtil.getId(token);
-        FdkkUser fdkkUser = fdkkUserService.getById(userId);
-        FdkkResponse fdkkResponse = fdkkClient.hotSave(fdkkHotRequest, fdkkUser.getToken());
-        if(fdkkResponse.getCode() != 0){
-            throw new BusinessException(fdkkResponse.getCode(),fdkkResponse.getMsg());
-        }
-        List<FdkkHotData> hotDataList = fdkkHotRequest.getHotDataList();
-        for (FdkkHotData fdkkHotData : hotDataList) {
-            List<Integer> relationIds = fdkkHotData.getRelationIds();
-            String sid = fdkkHotData.getSid();
-            Integer type = fdkkHotData.getHotType();
-            HotRelation hotRelation = new HotRelation();
-            hotRelation.setHotId(sid);
-            hotRelation.setHotType(type);
-            hotRelation.setRelationIds(JSONArray.toJSONString(relationIds));
-            hotRelation.setNum(fdkkHotRequest.getNum());
-            hotRelationService.saveOrUpdate(hotRelation);
-        }
-        return fdkkResponse;
-    }
-
-    @PostMapping("/delete")
-    @SysLog("/热点删除")
-    public ResultData delete(@RequestBody FdkkHotRequest fdkkHotRequest, @RequestHeader String token){
-        FdkkResponse fdkkResponse = fdkkClient.hotDelete(fdkkHotRequest, token);
-        if(fdkkResponse.getCode() ==0){
-            hotRelationService.removeByIds(fdkkHotRequest.getSidList());
-        }
-        return ResultData.ok();
-    }
-
-
-    @GetMapping("/list")
-    public ResultData list (@RequestParam(required = false) String num){
-        String content = uploadToOssUtil.getObjectContent(bucket, String.format(hotPath, num));
-        JSONArray jsonArray = JSONObject.parseArray(content);
-        if(jsonArray == null){
-            return ResultData.ok();
-        }
-        for (Object obj : jsonArray) {
-            JSONObject jsonObject= (JSONObject) obj;
-            String sid = jsonObject.getString("sid");
-            HotRelation hotRelation = hotRelationService.getById(sid);
-            jsonObject.put("hotRelation",hotRelation);
-        }
-        return ResultData.ok(jsonArray);
-    }
-}

+ 41 - 2
src/main/java/com/cdf/controller/SceneBackController.java

@@ -1,9 +1,48 @@
 package com.cdf.controller;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.alibaba.fastjson.JSONObject;
+import com.cdf.common.PageInfo;
+import com.cdf.common.ResultCode;
+import com.cdf.common.ResultData;
+import com.cdf.entity.FdkkUser;
+import com.cdf.entity.User;
+import com.cdf.exception.BusinessException;
+import com.cdf.httpClient.client.FdkkClient;
+import com.cdf.httpClient.request.FdkkSceneRequest;
+import com.cdf.httpClient.response.FdkkResponse;
+import com.cdf.service.IFdkkUserService;
+import com.cdf.service.IUserService;
+import com.cdf.util.JwtUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
 
 @RestController
 @RequestMapping("/back/scene")
 public class SceneBackController {
+
+    @Resource
+    private FdkkClient fdkkClient;
+    @Autowired
+    private IFdkkUserService fdkkUserService;
+    @Autowired
+    private IUserService userService;
+
+    @PostMapping("/list")
+    public ResultData list (@RequestBody FdkkSceneRequest param, @RequestHeader String token ){
+        Integer userId = JwtUtil.getId(token);
+        User user = userService.getById(userId);
+        if(user == null || user.getFdkkUserId() == null){
+            throw new BusinessException(ResultCode.USER_NOT_EXIST);
+        }
+        FdkkUser fdkkUser = fdkkUserService.getById(user.getFdkkUserId());
+        FdkkResponse fdkkResponse = fdkkClient.sceneList(param, fdkkUser.getToken());
+        if(fdkkResponse.getCode() != ResultCode.SUCCESS.code){
+            throw new BusinessException(fdkkResponse.getCode(),fdkkResponse.getMsg());
+        }
+        JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(fdkkResponse.getData())).getJSONObject("pageInfo");
+        PageInfo pageInfo = PageInfo.PageInfo(jsonObject.getLong("pageNum"), jsonObject.getLong("pageSize"), jsonObject.getLong("total"), jsonObject.getJSONArray("list"));
+        return ResultData.ok(pageInfo);
+    }
 }

+ 1 - 1
src/main/java/com/cdf/controller/ShopBackController.java

@@ -47,7 +47,7 @@ public class ShopBackController {
         if(param.getDeptId() !=null){
             wrapper.eq(Shop::getDeptId,param.getDeptId());
         }
-        Page<Shop> page = shopService.page(new Page<>(param.getPage(), param.getPageSize()), wrapper);
+        Page<Shop> page = shopService.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
         List<ShopVo> pageVo = new ArrayList<>();
         for (Shop shop : page.getRecords()) {
             ShopVo shopVo = new ShopVo();

+ 1 - 1
src/main/java/com/cdf/controller/SysRoleController.java

@@ -44,7 +44,7 @@ public class SysRoleController {
 
     @PostMapping("/list")
     public ResultData list(@RequestBody RoleRequest param){
-        return ResultData.ok(PageInfo.PageInfo(roleService.page(new Page<>(param.getPage(),param.getPageSize()))));
+        return ResultData.ok(PageInfo.PageInfo(roleService.page(new Page<>(param.getPageNum(),param.getPageSize()))));
     }
 
     @PostMapping("/saveRoleMenu")

+ 22 - 0
src/main/java/com/cdf/controller/TestController.java

@@ -0,0 +1,22 @@
+package com.cdf.controller;
+
+import com.cdf.common.ResultData;
+import com.fdkankan.fyun.oss.UploadToOssUtil;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+
+@RestController
+public class TestController {
+
+    @Resource
+    UploadToOssUtil uploadToOssUtil;
+
+    @RequestMapping("/test")
+    public ResultData test(){
+        uploadToOssUtil.uploadAws("C:\\Users\\Admin\\Desktop\\124.png","testyh/124.png");
+        return ResultData.ok();
+    }
+}

+ 1 - 1
src/main/java/com/cdf/controller/VideoBackController.java

@@ -30,7 +30,7 @@ public class VideoBackController {
 
     @PostMapping("/list")
     public ResultData list (@RequestBody BaseRequest param){
-        Page<Video> page = videoService.page(new Page<>(param.getPage(), param.getPageSize()));
+        Page<Video> page = videoService.page(new Page<>(param.getPageNum(), param.getPageSize()));
         return ResultData.ok(PageInfo.PageInfo(page));
     }
     @PostMapping("/delete")

+ 30 - 1
src/main/java/com/cdf/httpClient/client/FdkkClient.java

@@ -3,10 +3,15 @@ package com.cdf.httpClient.client;
 import com.alibaba.fastjson.JSONObject;
 import com.cdf.httpClient.request.FdkkHotRequest;
 import com.cdf.httpClient.request.FdkkLoginRequest;
+import com.cdf.httpClient.request.FdkkSceneRequest;
+import com.cdf.httpClient.request.FdkkUploadRequest;
 import com.cdf.httpClient.response.FdkkResponse;
 import com.dtflys.forest.annotation.*;
 import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
+import java.nio.file.Files;
 import java.util.Map;
 
 /**
@@ -27,6 +32,12 @@ public interface FdkkClient {
     @Address(source = FdkkLoginAddressSource.class)
     FdkkResponse checkToken(@Header("token")  String token);
     /**
+     * 获取场景列表
+     */
+    @Post("/api/user/scene/newList")
+    @Address(source = FdkkLoginAddressSource.class)
+    FdkkResponse sceneList(@JSONBody FdkkSceneRequest fdkkSceneRequest ,@Header("token")  String token);
+    /**
      * 添加热点
      */
     @Post("/service/scene/edit/tag/save")
@@ -38,7 +49,24 @@ public interface FdkkClient {
     @Post("/service/scene/edit/tag/delete")
     @Address(source = FdkkSceneAddressSource.class)
     FdkkResponse hotDelete(@JSONBody FdkkHotRequest fdkkHotRequest, @Header("token")  String token);
-
+    /**
+     * 获取热点列表
+     */
+    @Post("/service/scene/edit/tag/list")
+    @Address(source = FdkkSceneAddressSource.class)
+    FdkkResponse hotList(@Query String num, @Header("token")  String token);
+    /**
+     * 场景发布
+     */
+    @Post("/service/scene/edit/publicScene")
+    @Address(source = FdkkSceneAddressSource.class)
+    FdkkResponse scenePublicScene(@JSONBody String num, @Header("token")  String token);
+    /**
+     * 文件上传
+     */
+    @Post("/service/scene/edit/upload/files")
+    @Address(source = FdkkSceneAddressSource.class)
+    FdkkResponse uploadFiles(@Query FdkkUploadRequest fdkkUploadRequest, @DataFile("files") String files, @Header("token")String token);
 
     @Post("{url}")
     @Address(source = FdkkSceneAddressSource.class)
@@ -49,4 +77,5 @@ public interface FdkkClient {
     @Address(source = FdkkSceneAddressSource.class)
     JSONObject sendGet(@Var("url") String url, @Query Map<String,String> param, @Header("token")  String token);
 
+
 }

+ 20 - 0
src/main/java/com/cdf/httpClient/request/FdkkSceneRequest.java

@@ -0,0 +1,20 @@
+package com.cdf.httpClient.request;
+
+import lombok.Data;
+
+@Data
+public class FdkkSceneRequest {
+    private Integer cameraId;
+    private Integer cameraType;
+    private Integer folderId;
+    private Integer folderType;
+    private Boolean isSetData = true;
+    private String keywordType = "sceneName" ;
+    private Integer pageNum = 1;
+    private Integer pageSize = 10;
+    private String sceneSource = "3";
+    private Integer sceneType ;
+    private String searchKey;
+    private String startTime;
+    private String endTime;
+}

+ 14 - 0
src/main/java/com/cdf/httpClient/request/FdkkUploadRequest.java

@@ -0,0 +1,14 @@
+package com.cdf.httpClient.request;
+
+import com.dtflys.forest.annotation.DataFile;
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+@Data
+public class FdkkUploadRequest {
+    private String base64;
+    private String num;
+    private Integer type = 1;
+    private String fileName;
+    private String bizType;
+}

+ 1 - 1
src/main/java/com/cdf/request/BaseRequest.java

@@ -5,7 +5,7 @@ import lombok.Data;
 @Data
 public class BaseRequest {
     private Integer id;
-    private Integer page = 1;
+    private Integer pageNum = 1;
     private Integer pageSize = 10;
     private String startTime;
     private String endTime;

+ 9 - 0
src/main/java/com/cdf/request/HotTypeRequest.java

@@ -0,0 +1,9 @@
+package com.cdf.request;
+
+import lombok.Data;
+
+@Data
+public class HotTypeRequest extends BaseRequest{
+    private Integer hotType;    //0商品,1优惠劵,2第三方跳转,3瀑布流
+    private String sid;
+}

+ 1 - 1
src/main/java/com/cdf/service/impl/LogServiceImpl.java

@@ -23,7 +23,7 @@ public class LogServiceImpl extends ServiceImpl<ILogMapper, Log> implements ILog
 
     @Override
     public PageInfo<LogVo> getPageByParam(LogRequest param) {
-        Page<LogVo> page = getBaseMapper().getPageByParam(new Page<>(param.getPage(),param.getPageSize()),param);
+        Page<LogVo> page = getBaseMapper().getPageByParam(new Page<>(param.getPageNum(),param.getPageSize()),param);
         return PageInfo.PageInfo(page);
     }
 }

+ 1 - 1
src/main/java/com/cdf/service/impl/UserServiceImpl.java

@@ -23,7 +23,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
 
     @Override
     public PageInfo<UserVo> getPageByParam(UserRequest param) {
-        Page<UserVo> page = getBaseMapper().getPageByParam(new Page<>(param.getPage(),param.getPageSize()),param);
+        Page<UserVo> page = getBaseMapper().getPageByParam(new Page<>(param.getPageNum(),param.getPageSize()),param);
         return PageInfo.PageInfo(page);
     }
 }

+ 4 - 4
src/main/resources/application.yaml

@@ -31,13 +31,13 @@ fdkk:
   scene-path: http://v4-test.4dkankan.com
   hot-path: scene_view_data/%s/user/hot.json
 #    type: oss      阿里云 oss
-#    type: aws      亚马逊
+#    type: aws      亚马逊 s3
 #    type: local    本地化
 upload:
-  type: oss
+  type: aws
   file-path: cdf/file/
-  query-path: http://4dkankan.oss-cn-shenzhen.aliyuncs.com/
-
+  #query-path: http://4dkankan.oss-cn-shenzhen.aliyuncs.com/     #oss
+  query-path: https://eurs3.4dkankan.com/
 oss:
   point: http://oss-cn-shenzhen.aliyuncs.com
   key: LTAIUrvuHqj8pvry