Browse Source

uploadBallScreenVideo

lyhzzz 3 years ago
parent
commit
53d85f018b

+ 1 - 1
src/main/java/com/cdf/controller/back/CdfProductController.java

@@ -23,7 +23,7 @@ public class CdfProductController {
     @RequestMapping("/list")
     @RequestMapping("/list")
     public ResultData getProductList(@RequestBody CdfProductListRequest param){
     public ResultData getProductList(@RequestBody CdfProductListRequest param){
         CdfProductListResponse productList = cdfClient.getProductList(param);
         CdfProductListResponse productList = cdfClient.getProductList(param);
-        if(productList.getSearchResult().getType() != 0 ){
+        if(productList.getSearchResult().getType() == 4 ){
             throw new BusinessException(productList.getSearchResult().getType(),productList.getSearchResult().getDesc());
             throw new BusinessException(productList.getSearchResult().getType(),productList.getSearchResult().getDesc());
         }
         }
         PageInfo pageInfo = PageInfo.PageInfo(param.getPageIndex(), 20L, productList.getCount()*20, productList.getList());
         PageInfo pageInfo = PageInfo.PageInfo(param.getPageIndex(), 20L, productList.getCount()*20, productList.getList());

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

@@ -1,5 +1,7 @@
 package com.cdf.service.impl;
 package com.cdf.service.impl;
 
 
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.cdf.common.ResultCode;
 import com.cdf.common.ResultCode;
@@ -146,7 +148,8 @@ public class FdkkSceneEditService {
         }
         }
         JSONArray hotJson = getHotJson(fdkkHotRequest.getNum());
         JSONArray hotJson = getHotJson(fdkkHotRequest.getNum());
         String path = String.format(hotLocalPath, fdkkHotRequest.getNum())+"/"+"hot.json";
         String path = String.format(hotLocalPath, fdkkHotRequest.getNum())+"/"+"hot.json";
-        FileUtils.writeFile(path, JSONObject.toJSONString(hotJson));
+        String json = JSONUtil.toJsonStr(hotJson);
+        FileUtils.writeFile(path,json );
         uploadToOssUtil.upload(path,String.format(hotCdfPath, fdkkHotRequest.getNum()));
         uploadToOssUtil.upload(path,String.format(hotCdfPath, fdkkHotRequest.getNum()));
     }
     }
 
 

+ 5 - 5
src/main/resources/application-local.yaml

@@ -3,9 +3,9 @@ spring:
     name: druidDataSource
     name: druidDataSource
     type: com.alibaba.druid.pool.DruidDataSource
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
     druid:
-      url: jdbc:mysql://127.0.0.1:3306/cdf_gm?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&allowMultiQueries=true
+      url: jdbc:mysql://3.71.48.65:3306/cdf_gm?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&allowMultiQueries=true
       username: root
       username: root
-      password: 123456
+      password: 4Dage@zhongmian#@168
 logging:
 logging:
   config: classpath:logback-spring.xml
   config: classpath:logback-spring.xml
 mybatis-plus:
 mybatis-plus:
@@ -14,8 +14,8 @@ mybatis-plus:
 
 
 
 
 fdkk:
 fdkk:
-  login-path: http://test.4dkankan.com
-  scene-path: http://v4-test.4dkankan.com
+  login-path: http://eur.4dkankan.com
+  scene-path: http://eur.4dkankan.com
   hot-path: scene_view_data/%s/user/hot.json
   hot-path: scene_view_data/%s/user/hot.json
   hot-cdf-path: cdf/hot/%s/hot.json
   hot-cdf-path: cdf/hot/%s/hot.json
   hot-local-path: D:\temp/%s
   hot-local-path: D:\temp/%s
@@ -25,7 +25,7 @@ fdkk:
 #    type: aws      亚马逊 s3
 #    type: aws      亚马逊 s3
 #    type: local    本地化
 #    type: local    本地化
 upload:
 upload:
-  type: oss
+  type: aws
   file-path: cdf/file/
   file-path: cdf/file/
   bucket: 4dkankan
   bucket: 4dkankan
   query-path: http://4dkankan.oss-cn-shenzhen.aliyuncs.com/     #oss
   query-path: http://4dkankan.oss-cn-shenzhen.aliyuncs.com/     #oss