From d1b555273339e4ba47227d168004d80eb762bc9c Mon Sep 17 00:00:00 2001 From: xmzhao71 Date: Wed, 25 Oct 2023 15:25:25 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat=EF=BC=9A=E6=94=BE=E8=A1=8C=E6=89=80?= =?UTF-8?q?=E6=9C=89=E7=9A=84=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/config/ShiroConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/suimangAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/suimangAdmin/src/main/java/com/iformall/config/ShiroConfig.java index 7e8f60c..75223d8 100644 --- a/suimangAdmin/src/main/java/com/iformall/config/ShiroConfig.java +++ b/suimangAdmin/src/main/java/com/iformall/config/ShiroConfig.java @@ -149,8 +149,8 @@ public class ShiroConfig { //配置退出 过滤器,其中的具体的退出代码Shiro已经替我们实现了 filterChainDefinitionMap.put("/logout", "authc"); - filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); -// filterChainDefinitionMap.put("/**", "anon"); +// filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); + filterChainDefinitionMap.put("/**", "anon"); shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); From 955190d2ebee8ddbc69d086e85e0a49c20bfab84 Mon Sep 17 00:00:00 2001 From: xmzhao71 Date: Wed, 25 Oct 2023 16:22:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/controller/sys/HomeController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/suimangAdmin/src/main/java/com/iformall/controller/sys/HomeController.java b/suimangAdmin/src/main/java/com/iformall/controller/sys/HomeController.java index 7f7b9a5..33333c1 100644 --- a/suimangAdmin/src/main/java/com/iformall/controller/sys/HomeController.java +++ b/suimangAdmin/src/main/java/com/iformall/controller/sys/HomeController.java @@ -88,6 +88,7 @@ public class HomeController extends BaseController { BufferedImage image = producer.createImage(text); //保存到shiro session ShiroUtils.setSessionAttribute(Constants.KAPTCHA_SESSION_KEY, text); + logger.info("验证码接口-生成的验证码:{}", text); ServletOutputStream out = response.getOutputStream(); ImageIO.write(image, "jpg", out); @@ -101,6 +102,8 @@ public class HomeController extends BaseController { logger.debug("[" + ipaddress + "] HomeController::doLogin"); try { String kaptcha = ShiroUtils.getKaptcha(Constants.KAPTCHA_SESSION_KEY); + logger.info("登录接口-验证码:{}", user.getCaptcha()); + logger.info("登录接口-生成的验证码:{}", kaptcha); if(!user.getCaptcha().equalsIgnoreCase(kaptcha)){ return new ResultData(ErrorCode.KAPCHA_NOT_EQUAL); } From 7ad9485dc71ca055ba541875eb44ce4d6a9f74f9 Mon Sep 17 00:00:00 2001 From: xmzhao71 Date: Wed, 25 Oct 2023 17:33:55 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0a=E7=AB=AFap?= =?UTF-8?q?i=E6=96=87=E6=A1=A3=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AiVideoServiceImpl.java | 2 +- .../controller/sm/ApiDetailController.java | 26 +++++ .../controller/sm/ApiGuideController.java | 40 +++++++ .../controller/sm/ApiMenuController.java | 40 +++++++ .../controller/sm/ServiceInfoController.java | 6 +- .../sm/ThirdPartyApiController.java | 2 +- .../controller/VoiceLanguageController.java | 3 +- .../dto/{neuver => sm}/GetLanguageDTO.java | 2 +- .../domain/dto/sm/SaveApiGuideDTO.java | 9 ++ .../domain/dto/sm/SaveApiMenuDTO.java | 9 ++ .../{neuver => sm}/SaveServiceInfoDTO.java | 2 +- .../SaveServiceVideoRecordDTO.java | 2 +- .../{neuver => sm}/SaveThirdPartyApiDTO.java | 2 +- .../domain/dto/sm/UpdateApiGuideDTO.java | 9 ++ .../domain/dto/sm/UpdateApiMenuDTO.java | 9 ++ .../{neuver => sm}/UpdateServiceInfoDTO.java | 3 +- .../UpdateServiceInfoStatusDTO.java | 2 +- .../UpdateThirdPartyApiStatusDTO.java | 3 +- .../com/iformall/domain/po/sm/ApiDetail.java | 101 ++++++++++++++++++ .../com/iformall/domain/po/sm/ApiGuide.java | 61 +++++++++++ .../com/iformall/domain/po/sm/ApiMenu.java | 61 +++++++++++ .../com/iformall/mapper/ApiDetailMapper.java | 15 +++ .../com/iformall/mapper/ApiGuideMapper.java | 15 +++ .../com/iformall/mapper/ApiMenuMapper.java | 15 +++ .../service/WxThirdPartyApiService.java | 4 +- .../impl/WxThirdPartyApiServiceImpl.java | 4 +- .../iformall/service/sm/ApiDetailService.java | 12 +++ .../iformall/service/sm/ApiGuideService.java | 19 ++++ .../iformall/service/sm/ApiMenuService.java | 19 ++++ .../service/sm/ServiceInfoService.java | 6 +- .../service/sm/ServiceVideoRecordService.java | 2 +- .../service/sm/impl/ApiDetailServiceImpl.java | 24 +++++ .../service/sm/impl/ApiGuideServiceImpl.java | 37 +++++++ .../service/sm/impl/ApiMenuServiceImpl.java | 37 +++++++ .../sm/impl/ServiceInfoServiceImpl.java | 4 +- .../impl/ServiceVideoRecordServiceImpl.java | 3 +- .../main/resources/mapper/ApiDetailMapper.xml | 34 ++++++ .../main/resources/mapper/ApiGuideMapper.xml | 23 ++++ .../main/resources/mapper/ApiMenuMapper.xml | 23 ++++ 39 files changed, 661 insertions(+), 29 deletions(-) create mode 100644 suimangAdmin/src/main/java/com/iformall/controller/sm/ApiDetailController.java create mode 100644 suimangAdmin/src/main/java/com/iformall/controller/sm/ApiGuideController.java create mode 100644 suimangAdmin/src/main/java/com/iformall/controller/sm/ApiMenuController.java rename suimangService/src/main/java/com/iformall/domain/dto/{neuver => sm}/GetLanguageDTO.java (86%) create mode 100644 suimangService/src/main/java/com/iformall/domain/dto/sm/SaveApiGuideDTO.java create mode 100644 suimangService/src/main/java/com/iformall/domain/dto/sm/SaveApiMenuDTO.java rename suimangService/src/main/java/com/iformall/domain/dto/{neuver => sm}/SaveServiceInfoDTO.java (96%) rename suimangService/src/main/java/com/iformall/domain/dto/{neuver => sm}/SaveServiceVideoRecordDTO.java (96%) rename suimangService/src/main/java/com/iformall/domain/dto/{neuver => sm}/SaveThirdPartyApiDTO.java (93%) create mode 100644 suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateApiGuideDTO.java create mode 100644 suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateApiMenuDTO.java rename suimangService/src/main/java/com/iformall/domain/dto/{neuver => sm}/UpdateServiceInfoDTO.java (90%) rename suimangService/src/main/java/com/iformall/domain/dto/{neuver => sm}/UpdateServiceInfoStatusDTO.java (89%) rename suimangService/src/main/java/com/iformall/domain/dto/{neuver => sm}/UpdateThirdPartyApiStatusDTO.java (85%) create mode 100644 suimangService/src/main/java/com/iformall/domain/po/sm/ApiDetail.java create mode 100644 suimangService/src/main/java/com/iformall/domain/po/sm/ApiGuide.java create mode 100644 suimangService/src/main/java/com/iformall/domain/po/sm/ApiMenu.java create mode 100644 suimangService/src/main/java/com/iformall/mapper/ApiDetailMapper.java create mode 100644 suimangService/src/main/java/com/iformall/mapper/ApiGuideMapper.java create mode 100644 suimangService/src/main/java/com/iformall/mapper/ApiMenuMapper.java create mode 100644 suimangService/src/main/java/com/iformall/service/sm/ApiDetailService.java create mode 100644 suimangService/src/main/java/com/iformall/service/sm/ApiGuideService.java create mode 100644 suimangService/src/main/java/com/iformall/service/sm/ApiMenuService.java create mode 100644 suimangService/src/main/java/com/iformall/service/sm/impl/ApiDetailServiceImpl.java create mode 100644 suimangService/src/main/java/com/iformall/service/sm/impl/ApiGuideServiceImpl.java create mode 100644 suimangService/src/main/java/com/iformall/service/sm/impl/ApiMenuServiceImpl.java create mode 100644 suimangService/src/main/resources/mapper/ApiDetailMapper.xml create mode 100644 suimangService/src/main/resources/mapper/ApiGuideMapper.xml create mode 100644 suimangService/src/main/resources/mapper/ApiMenuMapper.xml diff --git a/open-api/src/main/java/com/iformall/service/impl/AiVideoServiceImpl.java b/open-api/src/main/java/com/iformall/service/impl/AiVideoServiceImpl.java index 3c6c992..ea4d7ef 100644 --- a/open-api/src/main/java/com/iformall/service/impl/AiVideoServiceImpl.java +++ b/open-api/src/main/java/com/iformall/service/impl/AiVideoServiceImpl.java @@ -1,6 +1,6 @@ package com.iformall.service.impl; -import com.iformall.domain.dto.neuver.SaveServiceVideoRecordDTO; +import com.iformall.domain.dto.sm.SaveServiceVideoRecordDTO; import com.iformall.service.AiVideoService; import com.iformall.service.sm.ServiceVideoRecordService; import com.iformall.sm.*; diff --git a/suimangAdmin/src/main/java/com/iformall/controller/sm/ApiDetailController.java b/suimangAdmin/src/main/java/com/iformall/controller/sm/ApiDetailController.java new file mode 100644 index 0000000..21b0d1f --- /dev/null +++ b/suimangAdmin/src/main/java/com/iformall/controller/sm/ApiDetailController.java @@ -0,0 +1,26 @@ +package com.iformall.controller.sm; + +import com.iformall.common.ResultData; +import com.iformall.domain.dto.sm.SaveApiMenuDTO; +import com.iformall.domain.po.sm.ApiDetail; +import com.iformall.service.sm.ApiDetailService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/apiDetail") +@Api(tags = "api菜单详情接口") +public class ApiDetailController { + + @Autowired + private ApiDetailService apiDetailService; + + @ApiOperation("查询单个api菜单详情") + @GetMapping("/get") + public ResultData getApiDetail(Long id) { + ApiDetail apiDetail = apiDetailService.getApiDetail(id); + return new ResultData(apiDetail); + } +} diff --git a/suimangAdmin/src/main/java/com/iformall/controller/sm/ApiGuideController.java b/suimangAdmin/src/main/java/com/iformall/controller/sm/ApiGuideController.java new file mode 100644 index 0000000..ac1b4ab --- /dev/null +++ b/suimangAdmin/src/main/java/com/iformall/controller/sm/ApiGuideController.java @@ -0,0 +1,40 @@ +package com.iformall.controller.sm; + +import com.iformall.common.ResultData; +import com.iformall.domain.dto.sm.SaveApiGuideDTO; +import com.iformall.domain.dto.sm.UpdateApiGuideDTO; +import com.iformall.domain.po.sm.ApiGuide; +import com.iformall.service.sm.ApiGuideService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/apiGuide") +@Api(tags = "api指南接口") +public class ApiGuideController { + + @Autowired + private ApiGuideService apiGuideService; + + @ApiOperation("分页查询api菜单") + @GetMapping("/page") + public ResultData pageApiGuide(ApiGuide apiGuide, Integer pageNum, Integer pageSize) { + return new ResultData(apiGuideService.pageApiGuide(apiGuide, pageNum, pageSize)); + } + + @ApiOperation("新增api菜单") + @PostMapping("/save") + public ResultData saveApiGuide(@RequestBody SaveApiGuideDTO dto) { + apiGuideService.saveApiGuide(dto); + return new ResultData(); + } + + @ApiOperation("修改api菜单") + @PostMapping("/update") + public ResultData updateApiGuide(@RequestBody UpdateApiGuideDTO dto) { + apiGuideService.updateApiGuide(dto); + return new ResultData(); + } +} diff --git a/suimangAdmin/src/main/java/com/iformall/controller/sm/ApiMenuController.java b/suimangAdmin/src/main/java/com/iformall/controller/sm/ApiMenuController.java new file mode 100644 index 0000000..58bec26 --- /dev/null +++ b/suimangAdmin/src/main/java/com/iformall/controller/sm/ApiMenuController.java @@ -0,0 +1,40 @@ +package com.iformall.controller.sm; + +import com.iformall.common.ResultData; +import com.iformall.domain.dto.sm.SaveApiMenuDTO; +import com.iformall.domain.dto.sm.UpdateApiMenuDTO; +import com.iformall.domain.po.sm.ApiMenu; +import com.iformall.service.sm.ApiMenuService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/apiMenu") +@Api(tags = "api菜单接口") +public class ApiMenuController { + + @Autowired + private ApiMenuService apiMenuService; + + @ApiOperation("分页查询api菜单") + @GetMapping("/page") + public ResultData pageApiMenu(ApiMenu ApiMenu, Integer pageNum, Integer pageSize) { + return new ResultData(apiMenuService.pageApiMenu(ApiMenu, pageNum, pageSize)); + } + + @ApiOperation("新增api菜单") + @PostMapping("/save") + public ResultData saveApiMenu(@RequestBody SaveApiMenuDTO dto) { + apiMenuService.saveApiMenu(dto); + return new ResultData(); + } + + @ApiOperation("修改api菜单") + @PostMapping("/update") + public ResultData updateApiMenu(@RequestBody UpdateApiMenuDTO dto) { + apiMenuService.updateApiMenu(dto); + return new ResultData(); + } +} diff --git a/suimangAdmin/src/main/java/com/iformall/controller/sm/ServiceInfoController.java b/suimangAdmin/src/main/java/com/iformall/controller/sm/ServiceInfoController.java index d87d6f3..843b80e 100644 --- a/suimangAdmin/src/main/java/com/iformall/controller/sm/ServiceInfoController.java +++ b/suimangAdmin/src/main/java/com/iformall/controller/sm/ServiceInfoController.java @@ -2,9 +2,9 @@ package com.iformall.controller.sm; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.dto.neuver.SaveServiceInfoDTO; -import com.iformall.domain.dto.neuver.UpdateServiceInfoDTO; -import com.iformall.domain.dto.neuver.UpdateServiceInfoStatusDTO; +import com.iformall.domain.dto.sm.SaveServiceInfoDTO; +import com.iformall.domain.dto.sm.UpdateServiceInfoDTO; +import com.iformall.domain.dto.sm.UpdateServiceInfoStatusDTO; import com.iformall.domain.po.sm.ServiceInfo; import com.iformall.service.sm.ServiceInfoService; import io.swagger.annotations.Api; diff --git a/suimangAdmin/src/main/java/com/iformall/controller/sm/ThirdPartyApiController.java b/suimangAdmin/src/main/java/com/iformall/controller/sm/ThirdPartyApiController.java index f8a9ffa..e6fbc0b 100644 --- a/suimangAdmin/src/main/java/com/iformall/controller/sm/ThirdPartyApiController.java +++ b/suimangAdmin/src/main/java/com/iformall/controller/sm/ThirdPartyApiController.java @@ -1,7 +1,7 @@ package com.iformall.controller.sm; import com.iformall.common.ResultData; -import com.iformall.domain.dto.neuver.UpdateThirdPartyApiStatusDTO; +import com.iformall.domain.dto.sm.UpdateThirdPartyApiStatusDTO; import com.iformall.domain.po.WxThirdPartyApi; import com.iformall.service.WxThirdPartyApiService; import io.swagger.annotations.Api; diff --git a/suimangCApi/src/main/java/com/iformall/controller/VoiceLanguageController.java b/suimangCApi/src/main/java/com/iformall/controller/VoiceLanguageController.java index 77299f7..8be1722 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/VoiceLanguageController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/VoiceLanguageController.java @@ -1,8 +1,7 @@ package com.iformall.controller; -import com.iformall.annotation.AuthIgnore; import com.iformall.common.ResultData; -import com.iformall.domain.dto.neuver.GetLanguageDTO; +import com.iformall.domain.dto.sm.GetLanguageDTO; import com.iformall.service.sm.VoiceLanguageService; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/suimangService/src/main/java/com/iformall/domain/dto/neuver/GetLanguageDTO.java b/suimangService/src/main/java/com/iformall/domain/dto/sm/GetLanguageDTO.java similarity index 86% rename from suimangService/src/main/java/com/iformall/domain/dto/neuver/GetLanguageDTO.java rename to suimangService/src/main/java/com/iformall/domain/dto/sm/GetLanguageDTO.java index ecae1cd..1ad0784 100644 --- a/suimangService/src/main/java/com/iformall/domain/dto/neuver/GetLanguageDTO.java +++ b/suimangService/src/main/java/com/iformall/domain/dto/sm/GetLanguageDTO.java @@ -1,4 +1,4 @@ -package com.iformall.domain.dto.neuver; +package com.iformall.domain.dto.sm; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveApiGuideDTO.java b/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveApiGuideDTO.java new file mode 100644 index 0000000..48edffd --- /dev/null +++ b/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveApiGuideDTO.java @@ -0,0 +1,9 @@ +package com.iformall.domain.dto.sm; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +@ApiModel(value = "新增API指南") +@Data +public class SaveApiGuideDTO { +} diff --git a/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveApiMenuDTO.java b/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveApiMenuDTO.java new file mode 100644 index 0000000..c4b2140 --- /dev/null +++ b/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveApiMenuDTO.java @@ -0,0 +1,9 @@ +package com.iformall.domain.dto.sm; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +@ApiModel(value = "新增API菜单") +@Data +public class SaveApiMenuDTO { +} diff --git a/suimangService/src/main/java/com/iformall/domain/dto/neuver/SaveServiceInfoDTO.java b/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveServiceInfoDTO.java similarity index 96% rename from suimangService/src/main/java/com/iformall/domain/dto/neuver/SaveServiceInfoDTO.java rename to suimangService/src/main/java/com/iformall/domain/dto/sm/SaveServiceInfoDTO.java index 7dcd4f8..4032f75 100644 --- a/suimangService/src/main/java/com/iformall/domain/dto/neuver/SaveServiceInfoDTO.java +++ b/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveServiceInfoDTO.java @@ -1,4 +1,4 @@ -package com.iformall.domain.dto.neuver; +package com.iformall.domain.dto.sm; import com.iformall.common.CommonConstants; import com.iformall.common.IdWorker; diff --git a/suimangService/src/main/java/com/iformall/domain/dto/neuver/SaveServiceVideoRecordDTO.java b/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveServiceVideoRecordDTO.java similarity index 96% rename from suimangService/src/main/java/com/iformall/domain/dto/neuver/SaveServiceVideoRecordDTO.java rename to suimangService/src/main/java/com/iformall/domain/dto/sm/SaveServiceVideoRecordDTO.java index e146f73..bfdc40b 100644 --- a/suimangService/src/main/java/com/iformall/domain/dto/neuver/SaveServiceVideoRecordDTO.java +++ b/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveServiceVideoRecordDTO.java @@ -1,4 +1,4 @@ -package com.iformall.domain.dto.neuver; +package com.iformall.domain.dto.sm; import com.iformall.common.IdWorker; import com.iformall.domain.po.sm.ServiceVideoRecord; diff --git a/suimangService/src/main/java/com/iformall/domain/dto/neuver/SaveThirdPartyApiDTO.java b/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveThirdPartyApiDTO.java similarity index 93% rename from suimangService/src/main/java/com/iformall/domain/dto/neuver/SaveThirdPartyApiDTO.java rename to suimangService/src/main/java/com/iformall/domain/dto/sm/SaveThirdPartyApiDTO.java index 79bec50..a1ee443 100644 --- a/suimangService/src/main/java/com/iformall/domain/dto/neuver/SaveThirdPartyApiDTO.java +++ b/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveThirdPartyApiDTO.java @@ -1,4 +1,4 @@ -package com.iformall.domain.dto.neuver; +package com.iformall.domain.dto.sm; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateApiGuideDTO.java b/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateApiGuideDTO.java new file mode 100644 index 0000000..58986e2 --- /dev/null +++ b/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateApiGuideDTO.java @@ -0,0 +1,9 @@ +package com.iformall.domain.dto.sm; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +@ApiModel(value = "修改API指南") +@Data +public class UpdateApiGuideDTO { +} diff --git a/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateApiMenuDTO.java b/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateApiMenuDTO.java new file mode 100644 index 0000000..c8e530b --- /dev/null +++ b/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateApiMenuDTO.java @@ -0,0 +1,9 @@ +package com.iformall.domain.dto.sm; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +@ApiModel(value = "修改API菜单") +@Data +public class UpdateApiMenuDTO { +} diff --git a/suimangService/src/main/java/com/iformall/domain/dto/neuver/UpdateServiceInfoDTO.java b/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateServiceInfoDTO.java similarity index 90% rename from suimangService/src/main/java/com/iformall/domain/dto/neuver/UpdateServiceInfoDTO.java rename to suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateServiceInfoDTO.java index 3e9d8ba..c14355b 100644 --- a/suimangService/src/main/java/com/iformall/domain/dto/neuver/UpdateServiceInfoDTO.java +++ b/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateServiceInfoDTO.java @@ -1,6 +1,5 @@ -package com.iformall.domain.dto.neuver; +package com.iformall.domain.dto.sm; -import com.iformall.common.CommonConstants; import com.iformall.domain.po.sm.ServiceInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/suimangService/src/main/java/com/iformall/domain/dto/neuver/UpdateServiceInfoStatusDTO.java b/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateServiceInfoStatusDTO.java similarity index 89% rename from suimangService/src/main/java/com/iformall/domain/dto/neuver/UpdateServiceInfoStatusDTO.java rename to suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateServiceInfoStatusDTO.java index 65cc181..53b66a2 100644 --- a/suimangService/src/main/java/com/iformall/domain/dto/neuver/UpdateServiceInfoStatusDTO.java +++ b/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateServiceInfoStatusDTO.java @@ -1,4 +1,4 @@ -package com.iformall.domain.dto.neuver; +package com.iformall.domain.dto.sm; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/suimangService/src/main/java/com/iformall/domain/dto/neuver/UpdateThirdPartyApiStatusDTO.java b/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateThirdPartyApiStatusDTO.java similarity index 85% rename from suimangService/src/main/java/com/iformall/domain/dto/neuver/UpdateThirdPartyApiStatusDTO.java rename to suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateThirdPartyApiStatusDTO.java index c3b059d..64debcd 100644 --- a/suimangService/src/main/java/com/iformall/domain/dto/neuver/UpdateThirdPartyApiStatusDTO.java +++ b/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateThirdPartyApiStatusDTO.java @@ -1,8 +1,7 @@ -package com.iformall.domain.dto.neuver; +package com.iformall.domain.dto.sm; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Builder; import lombok.Data; @ApiModel(value = "更新开放接口秘钥状态") diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/ApiDetail.java b/suimangService/src/main/java/com/iformall/domain/po/sm/ApiDetail.java new file mode 100644 index 0000000..1707d82 --- /dev/null +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/ApiDetail.java @@ -0,0 +1,101 @@ +package com.iformall.domain.po.sm; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * + * @TableName api_detail + */ +@TableName(value ="api_detail") +@Data +public class ApiDetail implements Serializable { + /** + * 详情id + */ + @TableId + private Long id; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 修改时间 + */ + private Date updateTime; + + /** + * 菜单id + */ + private Long menuId; + + /** + * 菜单名称 + */ + private String menuName; + + /** + * 是否付费(0:否,1:是) + */ + private Byte chargeFlag; + + /** + * 是否需用户授权(0:否,1:是) + */ + private Byte authFlag; + + /** + * 描述 + */ + private String description; + + /** + * 平台地址 + */ + private String platformUrl; + + /** + * 系统参数 + */ + private String publicParam; + + /** + * 请求参数 + */ + private String requestParam; + + /** + * 响应参数 + */ + private String responseParam; + + /** + * 请求示例 + */ + private String requestSample; + + /** + * 响应示例 + */ + private String responseSample; + + /** + * 异常示例 + */ + private String exceptionSample; + + /** + * 状态(0:正常,1:锁定) + */ + private Byte status; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/ApiGuide.java b/suimangService/src/main/java/com/iformall/domain/po/sm/ApiGuide.java new file mode 100644 index 0000000..bd47c7a --- /dev/null +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/ApiGuide.java @@ -0,0 +1,61 @@ +package com.iformall.domain.po.sm; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * + * @TableName api_guide + */ +@TableName(value ="api_guide") +@Data +public class ApiGuide implements Serializable { + /** + * 主键id + */ + @TableId + private Long id; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 修改时间 + */ + private Date updateTime; + + /** + * 发布时间 + */ + private Date releaseTime; + + /** + * 指南名称 + */ + private String name; + + /** + * 指南内容 + */ + private String content; + + /** + * 状态(0:正常,1:锁定) + */ + private Byte status; + + /** + * 删除(0:未删除,1:删除) + */ + private Byte deleteFlag; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/ApiMenu.java b/suimangService/src/main/java/com/iformall/domain/po/sm/ApiMenu.java new file mode 100644 index 0000000..935394f --- /dev/null +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/ApiMenu.java @@ -0,0 +1,61 @@ +package com.iformall.domain.po.sm; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * + * @TableName api_menu + */ +@TableName(value ="api_menu") +@Data +public class ApiMenu implements Serializable { + /** + * 菜单id + */ + @TableId + private Long id; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 修改时间 + */ + private Date updateTime; + + /** + * 菜单名称 + */ + private String name; + + /** + * 父菜单id + */ + private Long parentId; + + /** + * 状态(0:正常,1:锁定) + */ + private Byte status; + + /** + * 是否叶子节点(0:否,1:是) + */ + private Byte leafFlag; + + /** + * 是否删除(0:未删除,1:删除) + */ + private Byte deleteFlag; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/suimangService/src/main/java/com/iformall/mapper/ApiDetailMapper.java b/suimangService/src/main/java/com/iformall/mapper/ApiDetailMapper.java new file mode 100644 index 0000000..e7574e4 --- /dev/null +++ b/suimangService/src/main/java/com/iformall/mapper/ApiDetailMapper.java @@ -0,0 +1,15 @@ +package com.iformall.mapper; + +import com.iformall.domain.po.sm.ApiDetail; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Entity com.iformall.domain.po.sm.ApiDetail + */ +public interface ApiDetailMapper extends BaseMapper { + +} + + + + diff --git a/suimangService/src/main/java/com/iformall/mapper/ApiGuideMapper.java b/suimangService/src/main/java/com/iformall/mapper/ApiGuideMapper.java new file mode 100644 index 0000000..f981249 --- /dev/null +++ b/suimangService/src/main/java/com/iformall/mapper/ApiGuideMapper.java @@ -0,0 +1,15 @@ +package com.iformall.mapper; + +import com.iformall.domain.po.sm.ApiGuide; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Entity com.iformall.domain.po.sm.ApiGuide + */ +public interface ApiGuideMapper extends BaseMapper { + +} + + + + diff --git a/suimangService/src/main/java/com/iformall/mapper/ApiMenuMapper.java b/suimangService/src/main/java/com/iformall/mapper/ApiMenuMapper.java new file mode 100644 index 0000000..bf1ef67 --- /dev/null +++ b/suimangService/src/main/java/com/iformall/mapper/ApiMenuMapper.java @@ -0,0 +1,15 @@ +package com.iformall.mapper; + +import com.iformall.domain.po.sm.ApiMenu; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Entity com.iformall.domain.po.sm.ApiMenu + */ +public interface ApiMenuMapper extends BaseMapper { + +} + + + + diff --git a/suimangService/src/main/java/com/iformall/service/WxThirdPartyApiService.java b/suimangService/src/main/java/com/iformall/service/WxThirdPartyApiService.java index 4c01e9a..e80a8a3 100644 --- a/suimangService/src/main/java/com/iformall/service/WxThirdPartyApiService.java +++ b/suimangService/src/main/java/com/iformall/service/WxThirdPartyApiService.java @@ -1,8 +1,8 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; -import com.iformall.domain.dto.neuver.SaveThirdPartyApiDTO; -import com.iformall.domain.dto.neuver.UpdateThirdPartyApiStatusDTO; +import com.iformall.domain.dto.sm.SaveThirdPartyApiDTO; +import com.iformall.domain.dto.sm.UpdateThirdPartyApiStatusDTO; import com.iformall.domain.po.WxThirdPartyApi; import java.util.List; diff --git a/suimangService/src/main/java/com/iformall/service/impl/WxThirdPartyApiServiceImpl.java b/suimangService/src/main/java/com/iformall/service/impl/WxThirdPartyApiServiceImpl.java index d3db214..d3d26ad 100644 --- a/suimangService/src/main/java/com/iformall/service/impl/WxThirdPartyApiServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/impl/WxThirdPartyApiServiceImpl.java @@ -8,8 +8,8 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.CommonConstants; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; -import com.iformall.domain.dto.neuver.SaveThirdPartyApiDTO; -import com.iformall.domain.dto.neuver.UpdateThirdPartyApiStatusDTO; +import com.iformall.domain.dto.sm.SaveThirdPartyApiDTO; +import com.iformall.domain.dto.sm.UpdateThirdPartyApiStatusDTO; import com.iformall.domain.po.WxThirdPartyApi; import com.iformall.domain.po.sm.ServiceInfo; import com.iformall.exception.BizException; diff --git a/suimangService/src/main/java/com/iformall/service/sm/ApiDetailService.java b/suimangService/src/main/java/com/iformall/service/sm/ApiDetailService.java new file mode 100644 index 0000000..124f1e9 --- /dev/null +++ b/suimangService/src/main/java/com/iformall/service/sm/ApiDetailService.java @@ -0,0 +1,12 @@ +package com.iformall.service.sm; + +import com.iformall.domain.po.sm.ApiDetail; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * + */ +public interface ApiDetailService extends IService { + + ApiDetail getApiDetail(Long id); +} diff --git a/suimangService/src/main/java/com/iformall/service/sm/ApiGuideService.java b/suimangService/src/main/java/com/iformall/service/sm/ApiGuideService.java new file mode 100644 index 0000000..71b3f01 --- /dev/null +++ b/suimangService/src/main/java/com/iformall/service/sm/ApiGuideService.java @@ -0,0 +1,19 @@ +package com.iformall.service.sm; + +import com.github.pagehelper.PageInfo; +import com.iformall.domain.dto.sm.SaveApiGuideDTO; +import com.iformall.domain.dto.sm.UpdateApiGuideDTO; +import com.iformall.domain.po.sm.ApiGuide; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * + */ +public interface ApiGuideService extends IService { + + PageInfo pageApiGuide(ApiGuide apiGuide, Integer pageNum, Integer pageSize); + + void saveApiGuide(SaveApiGuideDTO dto); + + void updateApiGuide(UpdateApiGuideDTO dto); +} diff --git a/suimangService/src/main/java/com/iformall/service/sm/ApiMenuService.java b/suimangService/src/main/java/com/iformall/service/sm/ApiMenuService.java new file mode 100644 index 0000000..efc12ff --- /dev/null +++ b/suimangService/src/main/java/com/iformall/service/sm/ApiMenuService.java @@ -0,0 +1,19 @@ +package com.iformall.service.sm; + +import com.github.pagehelper.PageInfo; +import com.iformall.domain.dto.sm.SaveApiMenuDTO; +import com.iformall.domain.dto.sm.UpdateApiMenuDTO; +import com.iformall.domain.po.sm.ApiMenu; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * + */ +public interface ApiMenuService extends IService { + + PageInfo pageApiMenu(ApiMenu apiMenu, Integer pageNum, Integer pageSize); + + void saveApiMenu(SaveApiMenuDTO dto); + + void updateApiMenu(UpdateApiMenuDTO dto); +} diff --git a/suimangService/src/main/java/com/iformall/service/sm/ServiceInfoService.java b/suimangService/src/main/java/com/iformall/service/sm/ServiceInfoService.java index 7acd4ea..abd0179 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/ServiceInfoService.java +++ b/suimangService/src/main/java/com/iformall/service/sm/ServiceInfoService.java @@ -1,9 +1,9 @@ package com.iformall.service.sm; import com.github.pagehelper.PageInfo; -import com.iformall.domain.dto.neuver.SaveServiceInfoDTO; -import com.iformall.domain.dto.neuver.UpdateServiceInfoDTO; -import com.iformall.domain.dto.neuver.UpdateServiceInfoStatusDTO; +import com.iformall.domain.dto.sm.SaveServiceInfoDTO; +import com.iformall.domain.dto.sm.UpdateServiceInfoDTO; +import com.iformall.domain.dto.sm.UpdateServiceInfoStatusDTO; import com.iformall.domain.po.sm.ServiceInfo; import com.iformall.domain.vo.neuver.PageServiceInfoVO; diff --git a/suimangService/src/main/java/com/iformall/service/sm/ServiceVideoRecordService.java b/suimangService/src/main/java/com/iformall/service/sm/ServiceVideoRecordService.java index 40652d2..82f2b66 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/ServiceVideoRecordService.java +++ b/suimangService/src/main/java/com/iformall/service/sm/ServiceVideoRecordService.java @@ -1,6 +1,6 @@ package com.iformall.service.sm; -import com.iformall.domain.dto.neuver.SaveServiceVideoRecordDTO; +import com.iformall.domain.dto.sm.SaveServiceVideoRecordDTO; /** * @author xmzhao71 diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/ApiDetailServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/ApiDetailServiceImpl.java new file mode 100644 index 0000000..a62b5f0 --- /dev/null +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/ApiDetailServiceImpl.java @@ -0,0 +1,24 @@ +package com.iformall.service.sm.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.iformall.domain.po.sm.ApiDetail; +import com.iformall.service.sm.ApiDetailService; +import com.iformall.mapper.ApiDetailMapper; +import org.springframework.stereotype.Service; + +/** + * + */ +@Service +public class ApiDetailServiceImpl extends ServiceImpl + implements ApiDetailService{ + + @Override + public ApiDetail getApiDetail(Long id) { + return null; + } +} + + + + diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/ApiGuideServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/ApiGuideServiceImpl.java new file mode 100644 index 0000000..24f91a6 --- /dev/null +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/ApiGuideServiceImpl.java @@ -0,0 +1,37 @@ +package com.iformall.service.sm.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageInfo; +import com.iformall.domain.dto.sm.SaveApiGuideDTO; +import com.iformall.domain.dto.sm.UpdateApiGuideDTO; +import com.iformall.domain.po.sm.ApiGuide; +import com.iformall.service.sm.ApiGuideService; +import com.iformall.mapper.ApiGuideMapper; +import org.springframework.stereotype.Service; + +/** + * + */ +@Service +public class ApiGuideServiceImpl extends ServiceImpl + implements ApiGuideService{ + + @Override + public PageInfo pageApiGuide(ApiGuide apiGuide, Integer pageNum, Integer pageSize) { + return null; + } + + @Override + public void saveApiGuide(SaveApiGuideDTO dto) { + + } + + @Override + public void updateApiGuide(UpdateApiGuideDTO dto) { + + } +} + + + + diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/ApiMenuServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/ApiMenuServiceImpl.java new file mode 100644 index 0000000..57ceac1 --- /dev/null +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/ApiMenuServiceImpl.java @@ -0,0 +1,37 @@ +package com.iformall.service.sm.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageInfo; +import com.iformall.domain.dto.sm.SaveApiMenuDTO; +import com.iformall.domain.dto.sm.UpdateApiMenuDTO; +import com.iformall.domain.po.sm.ApiMenu; +import com.iformall.service.sm.ApiMenuService; +import com.iformall.mapper.ApiMenuMapper; +import org.springframework.stereotype.Service; + +/** + * + */ +@Service +public class ApiMenuServiceImpl extends ServiceImpl + implements ApiMenuService{ + + @Override + public PageInfo pageApiMenu(ApiMenu apiMenu, Integer pageNum, Integer pageSize) { + return null; + } + + @Override + public void saveApiMenu(SaveApiMenuDTO dto) { + + } + + @Override + public void updateApiMenu(UpdateApiMenuDTO dto) { + + } +} + + + + diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/ServiceInfoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/ServiceInfoServiceImpl.java index 64e113c..93e0233 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/ServiceInfoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/ServiceInfoServiceImpl.java @@ -6,7 +6,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.CommonConstants; import com.iformall.common.ErrorCode; -import com.iformall.domain.dto.neuver.*; +import com.iformall.domain.dto.sm.*; import com.iformall.domain.po.WxThirdPartyApi; import com.iformall.domain.po.sm.ServiceInfo; import com.iformall.exception.BizException; @@ -18,8 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Optional; - @Service public class ServiceInfoServiceImpl implements ServiceInfoService { diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/ServiceVideoRecordServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/ServiceVideoRecordServiceImpl.java index a60afbc..6963617 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/ServiceVideoRecordServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/ServiceVideoRecordServiceImpl.java @@ -1,7 +1,6 @@ package com.iformall.service.sm.impl; -import com.iformall.domain.dto.neuver.SaveServiceVideoRecordDTO; -import com.iformall.domain.po.sm.ServiceVideoRecord; +import com.iformall.domain.dto.sm.SaveServiceVideoRecordDTO; import com.iformall.mapper.ServiceVideoRecordMapper; import com.iformall.service.sm.ServiceVideoRecordService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/suimangService/src/main/resources/mapper/ApiDetailMapper.xml b/suimangService/src/main/resources/mapper/ApiDetailMapper.xml new file mode 100644 index 0000000..982f85e --- /dev/null +++ b/suimangService/src/main/resources/mapper/ApiDetailMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id,create_time,update_time, + menu_id,menu_name,charge_flag, + auth_flag,description,platform_url, + public_param,request_param,response_param, + request_sample,response_sample,exception_sample, + status + + diff --git a/suimangService/src/main/resources/mapper/ApiGuideMapper.xml b/suimangService/src/main/resources/mapper/ApiGuideMapper.xml new file mode 100644 index 0000000..722d546 --- /dev/null +++ b/suimangService/src/main/resources/mapper/ApiGuideMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + id,create_time,update_time, + release_time,name,content, + status,delete_flag + + diff --git a/suimangService/src/main/resources/mapper/ApiMenuMapper.xml b/suimangService/src/main/resources/mapper/ApiMenuMapper.xml new file mode 100644 index 0000000..ae90892 --- /dev/null +++ b/suimangService/src/main/resources/mapper/ApiMenuMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + id,create_time,update_time, + name,parent_id,status, + leaf_flag,delete_flag + + From d3d061d7828dc9e07a2af7a617c82e8d979b4767 Mon Sep 17 00:00:00 2001 From: xmzhao71 Date: Wed, 25 Oct 2023 18:38:22 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0a=E7=AB=AFap?= =?UTF-8?q?i=E6=96=87=E6=A1=A3=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/common/CommonConstants.java | 7 ++--- .../domain/dto/sm/SaveApiGuideDTO.java | 27 +++++++++++++++++++ .../domain/dto/sm/SaveApiMenuDTO.java | 24 +++++++++++++++++ .../domain/dto/sm/UpdateApiGuideDTO.java | 26 ++++++++++++++++++ .../domain/dto/sm/UpdateApiMenuDTO.java | 24 +++++++++++++++++ .../com/iformall/domain/po/sm/ApiGuide.java | 4 +-- .../com/iformall/domain/po/sm/ApiMenu.java | 6 ++--- .../com/iformall/mapper/ApiGuideMapper.java | 3 +++ .../com/iformall/mapper/ApiMenuMapper.java | 3 +++ .../service/sm/impl/ApiDetailServiceImpl.java | 6 +++-- .../service/sm/impl/ApiGuideServiceImpl.java | 16 +++++++---- .../service/sm/impl/ApiMenuServiceImpl.java | 16 +++++++---- .../sm/impl/ServiceInfoServiceImpl.java | 2 +- .../main/resources/mapper/ApiGuideMapper.xml | 20 ++++++++++++++ .../main/resources/mapper/ApiMenuMapper.xml | 23 ++++++++++++++++ 15 files changed, 186 insertions(+), 21 deletions(-) diff --git a/suimangService/src/main/java/com/iformall/common/CommonConstants.java b/suimangService/src/main/java/com/iformall/common/CommonConstants.java index fe8ad85..13b67b0 100644 --- a/suimangService/src/main/java/com/iformall/common/CommonConstants.java +++ b/suimangService/src/main/java/com/iformall/common/CommonConstants.java @@ -8,8 +8,9 @@ public interface CommonConstants { Integer STATUS_ABNORMAL = 1; /** - * 删除状态(0:未删除,1:已删除) + * 是否:0:否,1:是 + * 是否删除状态(0:未删除,1:已删除) */ - Integer DEL_FLAG_DELETED = 1; - Integer DEL_FLAG_NORMAL = 0; + Integer FLAG_TRUE = 1; + Integer FLAG_FALSE = 0; } diff --git a/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveApiGuideDTO.java b/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveApiGuideDTO.java index 48edffd..5e86ffa 100644 --- a/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveApiGuideDTO.java +++ b/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveApiGuideDTO.java @@ -1,9 +1,36 @@ package com.iformall.domain.dto.sm; +import com.iformall.common.CommonConstants; +import com.iformall.common.IdWorker; +import com.iformall.domain.po.sm.ApiGuide; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + @ApiModel(value = "新增API指南") @Data public class SaveApiGuideDTO { + @ApiModelProperty("api名称") + private String name; + @ApiModelProperty("指南内容") + private String content; + @ApiModelProperty("状态(0:正常,1:锁定)") + private Integer status; + + public static ApiGuide mapping(SaveApiGuideDTO dto) { + ApiGuide apiGuide = new ApiGuide(); + apiGuide.setId(IdWorker.get().nextId()); + apiGuide.setCreateTime(new Date()); + apiGuide.setUpdateTime(new Date()); + if (CommonConstants.STATUS_NORMAL.equals(dto.getStatus())) { + apiGuide.setReleaseTime(new Date()); + } + apiGuide.setName(dto.getName()); + apiGuide.setContent(dto.getContent()); + apiGuide.setStatus(dto.getStatus()); + apiGuide.setDeleteFlag(CommonConstants.FLAG_FALSE); + return apiGuide; + } } diff --git a/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveApiMenuDTO.java b/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveApiMenuDTO.java index c4b2140..c4cb19e 100644 --- a/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveApiMenuDTO.java +++ b/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveApiMenuDTO.java @@ -1,9 +1,33 @@ package com.iformall.domain.dto.sm; +import com.iformall.common.CommonConstants; +import com.iformall.common.IdWorker; +import com.iformall.domain.po.sm.ApiMenu; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + @ApiModel(value = "新增API菜单") @Data public class SaveApiMenuDTO { + @ApiModelProperty("菜单名称") + private String name; + @ApiModelProperty("父菜单id") + private Long parentId; + @ApiModelProperty("状态(0:正常,1:锁定)") + private Integer status; + + public static ApiMenu mapping(SaveApiMenuDTO dto) { + ApiMenu apiMenu = new ApiMenu(); + apiMenu.setId(IdWorker.get().nextId()); + apiMenu.setCreateTime(new Date()); + apiMenu.setUpdateTime(new Date()); + apiMenu.setName(dto.getName()); + apiMenu.setParentId(dto.getParentId()); + apiMenu.setStatus(dto.getStatus()); + apiMenu.setDeleteFlag(CommonConstants.FLAG_FALSE); + return apiMenu; + } } diff --git a/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateApiGuideDTO.java b/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateApiGuideDTO.java index 58986e2..ca80d9a 100644 --- a/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateApiGuideDTO.java +++ b/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateApiGuideDTO.java @@ -1,9 +1,35 @@ package com.iformall.domain.dto.sm; +import com.iformall.common.CommonConstants; +import com.iformall.common.IdWorker; +import com.iformall.domain.po.sm.ApiGuide; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + @ApiModel(value = "修改API指南") @Data public class UpdateApiGuideDTO { + @ApiModelProperty("id") + private Long id; + @ApiModelProperty("api名称") + private String name; + @ApiModelProperty("指南内容") + private String content; + @ApiModelProperty("状态(0:正常,1:锁定)") + private Integer status; + + public static ApiGuide mapping(UpdateApiGuideDTO dto) { + ApiGuide apiGuide = new ApiGuide(); + apiGuide.setUpdateTime(new Date()); + if (CommonConstants.STATUS_NORMAL.equals(dto.getStatus())) { + apiGuide.setReleaseTime(new Date()); + } + apiGuide.setName(dto.getName()); + apiGuide.setContent(dto.getContent()); + apiGuide.setStatus(dto.getStatus()); + return apiGuide; + } } diff --git a/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateApiMenuDTO.java b/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateApiMenuDTO.java index c8e530b..d16354d 100644 --- a/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateApiMenuDTO.java +++ b/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateApiMenuDTO.java @@ -1,9 +1,33 @@ package com.iformall.domain.dto.sm; +import com.iformall.common.CommonConstants; +import com.iformall.common.IdWorker; +import com.iformall.domain.po.sm.ApiMenu; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + @ApiModel(value = "修改API菜单") @Data public class UpdateApiMenuDTO { + @ApiModelProperty("id") + private Long id; + @ApiModelProperty("菜单名称") + private String name; + @ApiModelProperty("父菜单id") + private Long parentId; + @ApiModelProperty("状态(0:正常,1:锁定)") + private Integer status; + + public static ApiMenu mapping(UpdateApiMenuDTO dto) { + ApiMenu apiMenu = new ApiMenu(); + apiMenu.setId(dto.getId()); + apiMenu.setUpdateTime(new Date()); + apiMenu.setName(dto.getName()); + apiMenu.setParentId(dto.getParentId()); + apiMenu.setStatus(dto.getStatus()); + return apiMenu; + } } diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/ApiGuide.java b/suimangService/src/main/java/com/iformall/domain/po/sm/ApiGuide.java index bd47c7a..2598ccc 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/ApiGuide.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/ApiGuide.java @@ -49,12 +49,12 @@ public class ApiGuide implements Serializable { /** * 状态(0:正常,1:锁定) */ - private Byte status; + private Integer status; /** * 删除(0:未删除,1:删除) */ - private Byte deleteFlag; + private Integer deleteFlag; @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/ApiMenu.java b/suimangService/src/main/java/com/iformall/domain/po/sm/ApiMenu.java index 935394f..ab94f22 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/ApiMenu.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/ApiMenu.java @@ -44,17 +44,17 @@ public class ApiMenu implements Serializable { /** * 状态(0:正常,1:锁定) */ - private Byte status; + private Integer status; /** * 是否叶子节点(0:否,1:是) */ - private Byte leafFlag; + private Integer leafFlag; /** * 是否删除(0:未删除,1:删除) */ - private Byte deleteFlag; + private Integer deleteFlag; @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/suimangService/src/main/java/com/iformall/mapper/ApiGuideMapper.java b/suimangService/src/main/java/com/iformall/mapper/ApiGuideMapper.java index f981249..42a1d0d 100644 --- a/suimangService/src/main/java/com/iformall/mapper/ApiGuideMapper.java +++ b/suimangService/src/main/java/com/iformall/mapper/ApiGuideMapper.java @@ -3,11 +3,14 @@ package com.iformall.mapper; import com.iformall.domain.po.sm.ApiGuide; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; + /** * @Entity com.iformall.domain.po.sm.ApiGuide */ public interface ApiGuideMapper extends BaseMapper { + List listApiGuide(ApiGuide apiGuide); } diff --git a/suimangService/src/main/java/com/iformall/mapper/ApiMenuMapper.java b/suimangService/src/main/java/com/iformall/mapper/ApiMenuMapper.java index bf1ef67..1a95553 100644 --- a/suimangService/src/main/java/com/iformall/mapper/ApiMenuMapper.java +++ b/suimangService/src/main/java/com/iformall/mapper/ApiMenuMapper.java @@ -3,11 +3,14 @@ package com.iformall.mapper; import com.iformall.domain.po.sm.ApiMenu; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; + /** * @Entity com.iformall.domain.po.sm.ApiMenu */ public interface ApiMenuMapper extends BaseMapper { + List listApiMenu(ApiMenu apiMenu); } diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/ApiDetailServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/ApiDetailServiceImpl.java index a62b5f0..f1ae80a 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/ApiDetailServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/ApiDetailServiceImpl.java @@ -4,14 +4,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.iformall.domain.po.sm.ApiDetail; import com.iformall.service.sm.ApiDetailService; import com.iformall.mapper.ApiDetailMapper; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** * */ @Service -public class ApiDetailServiceImpl extends ServiceImpl - implements ApiDetailService{ +public class ApiDetailServiceImpl extends ServiceImpl implements ApiDetailService{ + @Autowired + private ApiDetailMapper apiDetailMapper; @Override public ApiDetail getApiDetail(Long id) { diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/ApiGuideServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/ApiGuideServiceImpl.java index 24f91a6..b008973 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/ApiGuideServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/ApiGuideServiceImpl.java @@ -1,34 +1,40 @@ package com.iformall.service.sm.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.domain.dto.sm.SaveApiGuideDTO; import com.iformall.domain.dto.sm.UpdateApiGuideDTO; import com.iformall.domain.po.sm.ApiGuide; import com.iformall.service.sm.ApiGuideService; import com.iformall.mapper.ApiGuideMapper; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** * */ @Service -public class ApiGuideServiceImpl extends ServiceImpl - implements ApiGuideService{ +public class ApiGuideServiceImpl extends ServiceImpl implements ApiGuideService{ + + @Autowired + private ApiGuideMapper apiGuideMapper; @Override public PageInfo pageApiGuide(ApiGuide apiGuide, Integer pageNum, Integer pageSize) { - return null; + return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> apiGuideMapper.listApiGuide(apiGuide)); } @Override public void saveApiGuide(SaveApiGuideDTO dto) { - + ApiGuide apiGuide = SaveApiGuideDTO.mapping(dto); + apiGuideMapper.insert(apiGuide); } @Override public void updateApiGuide(UpdateApiGuideDTO dto) { - + ApiGuide apiGuide = UpdateApiGuideDTO.mapping(dto); + apiGuideMapper.updateById(apiGuide); } } diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/ApiMenuServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/ApiMenuServiceImpl.java index 57ceac1..ff066a6 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/ApiMenuServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/ApiMenuServiceImpl.java @@ -1,34 +1,40 @@ package com.iformall.service.sm.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.domain.dto.sm.SaveApiMenuDTO; import com.iformall.domain.dto.sm.UpdateApiMenuDTO; import com.iformall.domain.po.sm.ApiMenu; import com.iformall.service.sm.ApiMenuService; import com.iformall.mapper.ApiMenuMapper; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** * */ @Service -public class ApiMenuServiceImpl extends ServiceImpl - implements ApiMenuService{ +public class ApiMenuServiceImpl extends ServiceImpl implements ApiMenuService{ + + @Autowired + private ApiMenuMapper apiMenuMapper; @Override public PageInfo pageApiMenu(ApiMenu apiMenu, Integer pageNum, Integer pageSize) { - return null; + return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> apiMenuMapper.listApiMenu(apiMenu)); } @Override public void saveApiMenu(SaveApiMenuDTO dto) { - + ApiMenu apiMenu = SaveApiMenuDTO.mapping(dto); + apiMenuMapper.insert(apiMenu); } @Override public void updateApiMenu(UpdateApiMenuDTO dto) { - + ApiMenu apiMenu = UpdateApiMenuDTO.mapping(dto); + apiMenuMapper.updateById(apiMenu); } } diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/ServiceInfoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/ServiceInfoServiceImpl.java index 93e0233..4aea26b 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/ServiceInfoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/ServiceInfoServiceImpl.java @@ -33,7 +33,7 @@ public class ServiceInfoServiceImpl implements ServiceInfoService { public void saveServiceInfo(SaveServiceInfoDTO dto) { // 校验 ServiceInfo serviceInfo = serviceInfoMapper.selectOne(new LambdaQueryWrapper() - .eq(ServiceInfo::getDelFlag, CommonConstants.DEL_FLAG_NORMAL) + .eq(ServiceInfo::getDelFlag, CommonConstants.FLAG_FALSE) .eq(ServiceInfo::getCode, dto.getCode())); if (serviceInfo != null) { throw new BizException(ErrorCode.CODE_ALREADY_EXISTS); diff --git a/suimangService/src/main/resources/mapper/ApiGuideMapper.xml b/suimangService/src/main/resources/mapper/ApiGuideMapper.xml index 722d546..b583099 100644 --- a/suimangService/src/main/resources/mapper/ApiGuideMapper.xml +++ b/suimangService/src/main/resources/mapper/ApiGuideMapper.xml @@ -20,4 +20,24 @@ release_time,name,content, status,delete_flag + + + WHERE 1 = 1 + + and `id` = #{id} + + + and `name` = #{name} + + + and `status = #{status} + + + + diff --git a/suimangService/src/main/resources/mapper/ApiMenuMapper.xml b/suimangService/src/main/resources/mapper/ApiMenuMapper.xml index ae90892..a3810cf 100644 --- a/suimangService/src/main/resources/mapper/ApiMenuMapper.xml +++ b/suimangService/src/main/resources/mapper/ApiMenuMapper.xml @@ -20,4 +20,27 @@ name,parent_id,status, leaf_flag,delete_flag + + + WHERE 1 = 1 + + and `id` = #{id} + + + and `parent_id` = #{parentId} + + + and `name` = #{name} + + + and `status = #{status} + + + + From 9b28b730f1123ac955a80ec411132cb0885780d8 Mon Sep 17 00:00:00 2001 From: xmzhao71 Date: Wed, 25 Oct 2023 18:51:51 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=94=B9=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E9=AA=8C=E8=AF=81=E7=A0=81=E6=A0=A1=E9=AA=8C=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/sys/HomeController.java | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/suimangAdmin/src/main/java/com/iformall/controller/sys/HomeController.java b/suimangAdmin/src/main/java/com/iformall/controller/sys/HomeController.java index 33333c1..a524769 100644 --- a/suimangAdmin/src/main/java/com/iformall/controller/sys/HomeController.java +++ b/suimangAdmin/src/main/java/com/iformall/controller/sys/HomeController.java @@ -87,7 +87,9 @@ public class HomeController extends BaseController { //生成图片验证码 BufferedImage image = producer.createImage(text); //保存到shiro session - ShiroUtils.setSessionAttribute(Constants.KAPTCHA_SESSION_KEY, text); +// ShiroUtils.setSessionAttribute(Constants.KAPTCHA_SESSION_KEY, text); + String key = Constant.captchaPrev + ":" + getIpAddr(); + RedisCacheUtils.cache(redisTemplate, key, text, 60); logger.info("验证码接口-生成的验证码:{}", text); ServletOutputStream out = response.getOutputStream(); @@ -100,17 +102,26 @@ public class HomeController extends BaseController { public ResultData login(@RequestBody MallUserInfo user, HttpServletResponse response) { String ipaddress = getIpAddr(); logger.debug("[" + ipaddress + "] HomeController::doLogin"); - try { - String kaptcha = ShiroUtils.getKaptcha(Constants.KAPTCHA_SESSION_KEY); - logger.info("登录接口-验证码:{}", user.getCaptcha()); - logger.info("登录接口-生成的验证码:{}", kaptcha); - if(!user.getCaptcha().equalsIgnoreCase(kaptcha)){ - return new ResultData(ErrorCode.KAPCHA_NOT_EQUAL); - } - } catch (MallinkException e) { - logger.error("验证码" + e.getMessage()); - return new ResultData(ErrorCode.KAPCHA_NOT_VALID.getCode(), e.getMessage()); +// try { +// String kaptcha = ShiroUtils.getKaptcha(Constants.KAPTCHA_SESSION_KEY); +// logger.info("登录接口-验证码:{}", user.getCaptcha()); +// logger.info("登录接口-生成的验证码:{}", kaptcha); +// if(!user.getCaptcha().equalsIgnoreCase(kaptcha)){ +// return new ResultData(ErrorCode.KAPCHA_NOT_EQUAL); +// } +// } catch (MallinkException e) { +// logger.error("验证码" + e.getMessage()); +// return new ResultData(ErrorCode.KAPCHA_NOT_VALID.getCode(), e.getMessage()); +// } + String key = Constant.captchaPrev + ":" + getIpAddr(); + String code = RedisCacheUtils.getCacheString(redisTemplate, key); + if (StringUtils.isBlank(code)) { + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "验证码已过期"); } + if (!code.equals(user.getCaptcha())) { + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "验证码不正确"); + } + if (StringUtils.isBlank(user.getUsername()) || StringUtils.isBlank(user.getPassword())) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);