Browse Source

Merge remote-tracking branch 'origin/master'

syh 5 năm trước cách đây
mục cha
commit
edd2b6dd06

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouImageController.java

@@ -92,6 +92,7 @@ public class KuaiShouImageController {
         if (!Check.isNull(user)) {
             queryWrapper.eq("login_id", user.getId());
         }
+        queryWrapper.orderByDesc("create_time");
         JSONArray jsonArr = kuaiShouImageService.selectImageList(queryWrapper);
         return jsonArr;
     }

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouVideoController.java

@@ -119,6 +119,7 @@ public class KuaiShouVideoController {
         if (!Check.isNull(user)) {
             queryWrapper.eq("login_id", user.getId());
         }
+        queryWrapper.orderByDesc("create_time");
         Page<KuaiShouVideo> page = new Page<KuaiShouVideo>(pageNo, pageSize);
         IPage<KuaiShouVideo> pageList = kuaiShouVideoService.page(page, queryWrapper);
         result.setSuccess(true);

+ 10 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/entity/KuaiShouCreateAppTemplate.java

@@ -81,6 +81,16 @@ public class KuaiShouCreateAppTemplate {
     @Excel(name = "输入应用下载地址", width = 15)
     @ApiModelProperty(value = "输入应用下载地址")
     private Object url;
+
+
+    /**
+     * url类型 1:淘宝商品短链 2:淘宝商品 itemID
+     */
+    @Excel(name = "上传类型 1:上传文件 2:填写链接", width = 15)
+    @ApiModelProperty(value = "上传类型 1:本地上传 2:url 链接")
+    private Integer uploadType;
+
+
     /**
      * 登录人id
      */

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouCreateServiceImpl.java

@@ -146,7 +146,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                 }
 
                 Map<String, Object> apkMap;
-                if ("1".equals(platform)) {
+                if ("1".equals(platform) && appTemplate.getUploadType() == 1) {
                     apkJson.put("file", appTemplate.getFile());
                     apkMap = kuaishouInterfaceService.appCreate(accountId, accessToken, apkJson);
 

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaishouInterfaceServiceImpl.java

@@ -863,10 +863,10 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
             Map<String, String> header = new HashMap<String, String>();
             header.put("Content-Type", " application/json");
             header.put("Access-Token", accessToken);
-            System.err.println(requestJson);
-            System.err.println(header);
+
             String result = HttpUtils.kuaiShouhttpPostRequest(url, requestJson.toJSONString(), header);
             JSONObject resultJson = JSONObject.parseObject(result);
+            logger.info("快手创建创意返回信息:{}",resultJson);
             if (!Check.isNull(resultJson)) {
                 Integer code = resultJson.getInteger("code");
                 if (code == 0) {