From 2896cd7dc7c3f72b1fc2fd4dd330259400a856f9 Mon Sep 17 00:00:00 2001 From: Penny <2500338766@qq.com> Date: Tue, 23 May 2023 00:22:19 +0800 Subject: [PATCH 1/3] feature:fixbug --- .../java/com/bnyer/img/controller/FhMiniController.java | 6 +++--- .../java/com/bnyer/img/controller/TiktokMiniController.java | 6 +++--- .../java/com/bnyer/img/controller/WxMiniController.java | 6 +++--- .../src/main/java/com/bnyer/img/service/PromptService.java | 2 +- .../java/com/bnyer/img/service/impl/PromptServiceimpl.java | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java index d27439f..e18e4c4 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java +++ b/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") - public AjaxResult getPrompt(){ - return AjaxResult.success(promptService.queryPromptList()); + @GetMapping(value = "/getPrompt/{type}") + public AjaxResult getPrompt(@PathVariable @ApiParam("提示词类型") String type){ + return AjaxResult.success(promptService.queryPromptList(type)); } @ApiOperation(value="文生图") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java index 7d1a0fc..5e4f423 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java +++ b/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") - public AjaxResult getPrompt(){ - return AjaxResult.success(promptService.queryPromptList()); + @GetMapping(value = "/getPrompt/{type}") + public AjaxResult getPrompt(@PathVariable @ApiParam("提示词类型") String type){ + return AjaxResult.success(promptService.queryPromptList(type)); } @ApiOperation(value="文生图") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java index 30674f9..198c5c4 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java +++ b/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") - public AjaxResult getPrompt(){ - return AjaxResult.success(promptService.queryPromptList()); + @GetMapping(value = "/getPrompt/{type}") + public AjaxResult getPrompt(@PathVariable @ApiParam("提示词类型") String type){ + return AjaxResult.success(promptService.queryPromptList(type)); } @ApiOperation(value="文生图") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/PromptService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/PromptService.java index 22086d8..368f3c0 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/PromptService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/PromptService.java @@ -10,5 +10,5 @@ public interface PromptService { * 随机获取8条提示词列表 * @return - */ - List queryPromptList(); + List queryPromptList(String type); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/PromptServiceimpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/PromptServiceimpl.java index 814a07f..117ec28 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/PromptServiceimpl.java +++ b/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 queryPromptList() { - //type:0->绘画;1->gpt - List promptVos = promptMapper.queryList("0"); + public List queryPromptList(String type) { + //type:0->绘画;1->gpt;2->情侣头像 + List promptVos = promptMapper.queryList(type); List news = new ArrayList<>(); Map map = new HashMap<>(); //随机抽10条数据展示在页面上 From c01ce8d8ec78a16a05df4de2b4fe294907374299 Mon Sep 17 00:00:00 2001 From: Penny <2500338766@qq.com> Date: Tue, 23 May 2023 01:44:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feature:=E4=BF=AE=E6=94=B9order=E3=80=81pay?= =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83=E9=93=BE=E6=8E=A5=E5=9C=B0?= =?UTF-8?q?=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bnyer-order/src/main/resources/bootstrap-prod.yml | 4 ++-- .../bnyer-pay/src/main/resources/bootstrap-prod.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bnyer-services/bnyer-order/src/main/resources/bootstrap-prod.yml b/bnyer-services/bnyer-order/src/main/resources/bootstrap-prod.yml index 374941d..58f7726 100644 --- a/bnyer-services/bnyer-order/src/main/resources/bootstrap-prod.yml +++ b/bnyer-services/bnyer-order/src/main/resources/bootstrap-prod.yml @@ -3,14 +3,14 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: http://192.168.3.100:6001 + server-addr: http://203.104.38.186:6001 # 命名空间地址 namespace: b133c9e5-9f8d-4ed4-9ebd-95557802889f # 命名空间分组 group: prod config: # 配置中心地址 - server-addr: http://192.168.3.100:6001 + server-addr: http://203.104.38.186:6001 # 配置文件格式 file-extension: yml # 命名空间地址 diff --git a/bnyer-services/bnyer-pay/src/main/resources/bootstrap-prod.yml b/bnyer-services/bnyer-pay/src/main/resources/bootstrap-prod.yml index 374941d..58f7726 100644 --- a/bnyer-services/bnyer-pay/src/main/resources/bootstrap-prod.yml +++ b/bnyer-services/bnyer-pay/src/main/resources/bootstrap-prod.yml @@ -3,14 +3,14 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: http://192.168.3.100:6001 + server-addr: http://203.104.38.186:6001 # 命名空间地址 namespace: b133c9e5-9f8d-4ed4-9ebd-95557802889f # 命名空间分组 group: prod config: # 配置中心地址 - server-addr: http://192.168.3.100:6001 + server-addr: http://203.104.38.186:6001 # 配置文件格式 file-extension: yml # 命名空间地址 From 2ca382d3994175cfdb20097c05729f3e17972818 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98=E2=80=98?= Date: Tue, 23 May 2023 12:08:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feature:=E4=BF=AE=E6=94=B9=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E3=80=81=E6=94=AF=E4=BB=98=E6=9C=8D=E5=8A=A1=E4=B8=BA?= =?UTF-8?q?=E5=86=85=E7=BD=91=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bnyer-order/src/main/resources/bootstrap-prod.yml | 4 ++-- .../bnyer-pay/src/main/resources/bootstrap-prod.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bnyer-services/bnyer-order/src/main/resources/bootstrap-prod.yml b/bnyer-services/bnyer-order/src/main/resources/bootstrap-prod.yml index 58f7726..374941d 100644 --- a/bnyer-services/bnyer-order/src/main/resources/bootstrap-prod.yml +++ b/bnyer-services/bnyer-order/src/main/resources/bootstrap-prod.yml @@ -3,14 +3,14 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: http://203.104.38.186:6001 + server-addr: http://192.168.3.100:6001 # 命名空间地址 namespace: b133c9e5-9f8d-4ed4-9ebd-95557802889f # 命名空间分组 group: prod config: # 配置中心地址 - server-addr: http://203.104.38.186:6001 + server-addr: http://192.168.3.100:6001 # 配置文件格式 file-extension: yml # 命名空间地址 diff --git a/bnyer-services/bnyer-pay/src/main/resources/bootstrap-prod.yml b/bnyer-services/bnyer-pay/src/main/resources/bootstrap-prod.yml index 58f7726..374941d 100644 --- a/bnyer-services/bnyer-pay/src/main/resources/bootstrap-prod.yml +++ b/bnyer-services/bnyer-pay/src/main/resources/bootstrap-prod.yml @@ -3,14 +3,14 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: http://203.104.38.186:6001 + server-addr: http://192.168.3.100:6001 # 命名空间地址 namespace: b133c9e5-9f8d-4ed4-9ebd-95557802889f # 命名空间分组 group: prod config: # 配置中心地址 - server-addr: http://203.104.38.186:6001 + server-addr: http://192.168.3.100:6001 # 配置文件格式 file-extension: yml # 命名空间地址