Pārlūkot izejas kodu

Merge branch 'master' into test

yumeng 5 gadi atpakaļ
vecāks
revīzija
e8571efae4

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CreativeTitleController.java

@@ -28,9 +28,9 @@ public class CreativeTitleController {
 
 
     @GetMapping("titleSuggestion")
-    public Result<JSONArray> titleSuggestion(String firstCategory, String secondCategory, String keywords) {
+    public Result<JSONArray> titleSuggestion(String firstCategory, String secondCategory, String keyword) {
         Result<JSONArray> result = new Result<>();
-        JSONArray labelArr = creativeTitleService.titleSuggestion(firstCategory, secondCategory, keywords);
+        JSONArray labelArr = creativeTitleService.titleSuggestion(firstCategory, secondCategory, keyword);
         result.setSuccess(true);
         result.setResult(labelArr);
         return result;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/ICreativeTitleService.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 public interface ICreativeTitleService {
     JSONArray getTitleLabel();
 
-    JSONArray titleSuggestion(String firstCategory, String secondCategory, String keywords);
+    JSONArray titleSuggestion(String firstCategory, String secondCategory, String keyword);
 
     JSONArray titleSearch(String firstCategory, String secondCategory, String keywords);
 }

+ 3 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/CreativeTitleServiceImpl.java

@@ -30,8 +30,8 @@ public class CreativeTitleServiceImpl implements ICreativeTitleService {
 
 
     @Override
-    public JSONArray titleSuggestion(String firstCategory, String secondCategory, String keywords) {
-        if (Check.isNull(keywords)) {
+    public JSONArray titleSuggestion(String firstCategory, String secondCategory, String keyword) {
+        if (Check.isNull(keyword)) {
             return null;
         }
 
@@ -40,9 +40,7 @@ public class CreativeTitleServiceImpl implements ICreativeTitleService {
         Map<String, Object> paramsMap = new HashMap<>();
         paramsMap.put("first_category", firstCategory);
         paramsMap.put("second_category", secondCategory);
-        JSONObject json = new JSONObject();
-        json.put("keywords", keywords);
-        paramsMap.put("params", json);
+        paramsMap.put("keyword", keyword);
 
         String result = HttpUtils.httpGet("https://cc.oceanengine.com/creative_center_server/api/title/title_suggestion", paramsMap, headers);
         JSONObject resultJson = JSONObject.parseObject(result);