Merge branch 'dev-xym-add-sort-take' of Server/long-article-manage into master

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/dto/ArticleSortRequest.java

@@ -2,6 +2,7 @@ package com.tzld.piaoquan.longarticle.model.dto;
 
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 import lombok.experimental.Accessors;
 
 import java.util.List;
@@ -9,6 +10,7 @@ import java.util.List;
 @Getter
 @Setter
 @Accessors(chain = true)
+@ToString
 public class ArticleSortRequest {
     private String accountId;
     private String accountName;

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/remote/impl/MatchServiceImpl.java

@@ -31,7 +31,7 @@ public class MatchServiceImpl implements MatchService {
                 return MatchRequestStatusEnum.SUCCESS.getStatusCode();
             } else if (code == 1) {
                 if ("params check error".equals(jsonObject.getString("info"))
-                        && "content".equals(jsonObject.getString("message"))
+                        && "'content'".equals(jsonObject.getString("message"))
                         && "fail".equals(jsonObject.getString("status"))) {
                     //2 没有文章内容
                     return MatchRequestStatusEnum.NOT_CONTENT.getStatusCode();

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/remote/impl/SortServiceImpl.java

@@ -23,19 +23,19 @@ public class SortServiceImpl implements SortService {
     public ArticleSortResponse publishArticleSort(ArticleSortRequest request) {
         ArticleSortResponse response = new ArticleSortResponse();
         String apiUrl = "http://101.37.174.139:80/recommend";
+        long startTime = System.currentTimeMillis();
         try {
             String res = HTTP_POOL_CLIENT_UTIL_DEFAULT.post(apiUrl, JSON.toJSONString(request));
-            log.info("publishArticleSort res={}", res);
+            log.info("publishArticleSort request={} res={}", request, res);
             response = JSON.parseObject(res, ArticleSortResponse.class);
             if (Objects.nonNull(response) && Objects.nonNull(response.getData())) {
                 response.setSuccessful(true);
-                if (CollectionUtil.isNotEmpty(response.getData().getRank_list())) {
-                    return response;
-                }
             }
         } catch (Exception e) {
             log.error("publishArticleSort recommend response parseObject", e);
         }
+        long endTime = System.currentTimeMillis();
+        log.info("publishArticleSort request={} needTime={}", request, endTime - startTime);
         return response;
     }