Merge remote-tracking branch 'origin/feature-1.1-dev' into feature-1.1-dev

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java

@@ -404,9 +404,9 @@ public class FhMiniController extends BaseController {
     }
 
     @ApiOperation(value="获取提示词列表")
-    @GetMapping(value = "/getPrompt")
+    @GetMapping(value = "/getPrompt/{type}")
-    public AjaxResult getPrompt(){
+    public AjaxResult getPrompt(@PathVariable @ApiParam("提示词类型") String type){
-        return AjaxResult.success(promptService.queryPromptList());
+        return AjaxResult.success(promptService.queryPromptList(type));
     }
 
     @ApiOperation(value="文生图")

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java

@@ -426,9 +426,9 @@ public class TiktokMiniController extends BaseController {
     }
 
     @ApiOperation(value="获取提示词列表")
-    @GetMapping(value = "/getPrompt")
+    @GetMapping(value = "/getPrompt/{type}")
-    public AjaxResult getPrompt(){
+    public AjaxResult getPrompt(@PathVariable @ApiParam("提示词类型") String type){
-        return AjaxResult.success(promptService.queryPromptList());
+        return AjaxResult.success(promptService.queryPromptList(type));
     }
 
     @ApiOperation(value="文生图")

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java

@@ -431,9 +431,9 @@ public class WxMiniController extends BaseController {
     }
 
     @ApiOperation(value="获取提示词列表")
-    @GetMapping(value = "/getPrompt")
+    @GetMapping(value = "/getPrompt/{type}")
-    public AjaxResult getPrompt(){
+    public AjaxResult getPrompt(@PathVariable @ApiParam("提示词类型") String type){
-        return AjaxResult.success(promptService.queryPromptList());
+        return AjaxResult.success(promptService.queryPromptList(type));
     }
 
     @ApiOperation(value="文生图")

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/PromptService.java

@@ -10,5 +10,5 @@ public interface PromptService {
      * 随机获取8条提示词列表
      * @return -
      */
-    List<PromptVo> queryPromptList();
+    List<PromptVo> queryPromptList(String type);
 }

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/PromptServiceimpl.java

@@ -18,9 +18,9 @@ public class PromptServiceimpl implements PromptService {
     private PromptMapper promptMapper;
 
     @Override
-    public List<PromptVo> queryPromptList() {
+    public List<PromptVo> queryPromptList(String type) {
-        //type:0->绘画;1->gpt
+        //type:0->绘画;1->gpt;2->情侣头像
-        List<PromptVo> promptVos = promptMapper.queryList("0");
+        List<PromptVo> promptVos = promptMapper.queryList(type);
         List<PromptVo> news = new ArrayList<>();
         Map<Integer,String> map = new HashMap<>();
         //随机抽10条数据展示在页面上