瀏覽代碼

添加执行同步脚本命令

lyhzzz 3 年之前
父節點
當前提交
2cabebfd94

+ 4 - 1
src/main/java/com/cdf/controller/api/CdfProductApiController.java

@@ -27,7 +27,10 @@ public class CdfProductApiController {
                             @RequestParam(required = false) String skuId,
                             @RequestParam(required = false) Integer num){
         JSONObject jsonObject = cdfClient.inCat(accessToken, new CdfInCatRequest(skuId, num));
-        return ResultData.ok(jsonObject);
+        if(jsonObject.get("success")==null || !jsonObject.getBoolean("success")){
+            return ResultData.error(jsonObject.getString("msg"));
+        }
+        return ResultData.ok(jsonObject.get("totalNum"));
     }
     @GetMapping("/getProductInfo")
     public ResultData getProductInfo(@RequestParam(required = false) String productId){

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

@@ -48,10 +48,12 @@ public class TestController {
     public ResultData getProductById(@RequestParam(required = false) String productId){
         return ResultData.ok(cdfClient.getProductById(productId));
     }
+
     @RequestMapping("/test/getProductList")
     public ResultData getProductList(@RequestBody CdfProductListRequest param){
         return ResultData.ok(cdfClient.getProductList(param));
     }
+
     @RequestMapping("/test/getCatNum")
     public ResultData getCatNum(@RequestParam(required = false) String accessToken){
         return ResultData.ok(cdfClient.getCatNum(accessToken));
@@ -82,6 +84,7 @@ public class TestController {
         this.commonExport(request,response,"店铺列表",list,ShopVo.class);
 
     }
+
     @PostMapping("uploadExcel")
     public ResultData uploadExcel(@RequestParam(required = false) MultipartFile file) throws IOException {
         List<HashMap<Integer, String>> excelRowList = ExcelUtil.getExcelRowList(file);
@@ -96,7 +99,6 @@ public class TestController {
         return ResultData.ok();
     }
 
-
     public void commonExport(HttpServletRequest request, HttpServletResponse response, String name, List<?> result, Class<?> clazz) throws Exception {
         response.setContentType("application/vnd.ms-excel");
         response.setCharacterEncoding("utf-8");

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

@@ -158,7 +158,7 @@ public class FdkkSceneEditService {
             throw new BusinessException(fdkkResponse.getCode(),fdkkResponse.getMsg());
         }
         writeHotJson(fdkkHotRequest.getNum());
-        ReadCmdLine.callShellByExec("aws s3 sync s3://4dkankan/cdf s3://4dage-moderate2/cdf --profile user1");
+        //ReadCmdLine.callShellByExec("aws s3 sync s3://4dkankan/cdf s3://4dage-moderate2/cdf --profile user1");
     }
 
     public void writeHotJson(String num) throws IOException {