From 2a7263a8f0f8a76376574e21c625661e8d437202 Mon Sep 17 00:00:00 2001 From: chengkun Date: Mon, 14 Aug 2023 17:22:51 +0800 Subject: [PATCH] =?UTF-8?q?feature:=E7=BB=9F=E4=B8=80=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 10 ++++++++++ .../cyjd/rights/controller/AliPayOrderController.java | 7 +------ .../controller/AliPaySigningOrderController.java | 4 +--- .../rights/controller/ConfigServiceController.java | 6 +----- .../com/cyjd/rights/controller/LinkController.java | 9 +++++---- .../cyjd/rights/controller/RightsOrderController.java | 5 +---- 6 files changed, 19 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 84adb3f..a84aab9 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,13 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + diff --git a/rights-admin-controller/src/main/java/com/cyjd/rights/controller/AliPayOrderController.java b/rights-admin-controller/src/main/java/com/cyjd/rights/controller/AliPayOrderController.java index ab3d838..a291fd8 100644 --- a/rights-admin-controller/src/main/java/com/cyjd/rights/controller/AliPayOrderController.java +++ b/rights-admin-controller/src/main/java/com/cyjd/rights/controller/AliPayOrderController.java @@ -1,13 +1,10 @@ package com.cyjd.rights.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.cyjd.rights.business.service.AliPayOrderService; import com.cyjd.rights.dto.AliPayInOrderDto; -import com.cyjd.rights.entity.AliPayOrderEntity; import com.cyjd.rights.vo.AliPayOrderVo; import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -19,11 +16,9 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - @Api(value = "支付宝支付订单接口",tags = "支付宝支付订单接口") @RestController -@RequestMapping("/aliPayOrder") +@RequestMapping("/rights/aliPayOrder") @Slf4j public class AliPayOrderController { @Autowired diff --git a/rights-admin-controller/src/main/java/com/cyjd/rights/controller/AliPaySigningOrderController.java b/rights-admin-controller/src/main/java/com/cyjd/rights/controller/AliPaySigningOrderController.java index d4380a9..04f2f3e 100644 --- a/rights-admin-controller/src/main/java/com/cyjd/rights/controller/AliPaySigningOrderController.java +++ b/rights-admin-controller/src/main/java/com/cyjd/rights/controller/AliPaySigningOrderController.java @@ -2,9 +2,7 @@ package com.cyjd.rights.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.cyjd.rights.business.service.AliPaySigningOrderService; -import com.cyjd.rights.dto.AliPayInOrderDto; import com.cyjd.rights.dto.AliPaySignOrderDto; -import com.cyjd.rights.vo.AliPayOrderVo; import com.cyjd.rights.vo.AliPaySigningOrderVo; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; @@ -20,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; @Api(value = "支付宝签约订单接口",tags = "支付宝签约订单接口") @RestController -@RequestMapping("/aliPaySigningOrder") +@RequestMapping("/rights/aliPaySigningOrder") @Slf4j public class AliPaySigningOrderController { @Autowired diff --git a/rights-admin-controller/src/main/java/com/cyjd/rights/controller/ConfigServiceController.java b/rights-admin-controller/src/main/java/com/cyjd/rights/controller/ConfigServiceController.java index f88d2e6..493d8de 100644 --- a/rights-admin-controller/src/main/java/com/cyjd/rights/controller/ConfigServiceController.java +++ b/rights-admin-controller/src/main/java/com/cyjd/rights/controller/ConfigServiceController.java @@ -2,14 +2,10 @@ package com.cyjd.rights.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.cyjd.rights.beans.R; import com.cyjd.rights.business.service.ConfigService; -import com.cyjd.rights.dto.AliPaySignOrderDto; import com.cyjd.rights.dto.UpdateConfigDto; import com.cyjd.rights.entity.ConfigEntity; -import com.cyjd.rights.vo.AliPaySigningOrderVo; -import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -20,7 +16,7 @@ import org.springframework.web.bind.annotation.*; @Api(value = "配置类接口", tags = "配置类接口") @RestController -@RequestMapping("/configService") +@RequestMapping("/rights/configService") @Slf4j public class ConfigServiceController { @Autowired diff --git a/rights-admin-controller/src/main/java/com/cyjd/rights/controller/LinkController.java b/rights-admin-controller/src/main/java/com/cyjd/rights/controller/LinkController.java index 9b52bfa..ee42c30 100644 --- a/rights-admin-controller/src/main/java/com/cyjd/rights/controller/LinkController.java +++ b/rights-admin-controller/src/main/java/com/cyjd/rights/controller/LinkController.java @@ -4,19 +4,20 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.cyjd.rights.beans.R; import com.cyjd.rights.business.service.LinkService; import com.cyjd.rights.dto.AddLinkDto; -import com.cyjd.rights.entity.ConfigEntity; import com.cyjd.rights.entity.LinkEntity; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @Api(value = "链接类接口", tags = "链接类接口") @RestController -@RequestMapping("/link") +@RequestMapping("/rights/link") @Slf4j public class LinkController { @Autowired diff --git a/rights-admin-controller/src/main/java/com/cyjd/rights/controller/RightsOrderController.java b/rights-admin-controller/src/main/java/com/cyjd/rights/controller/RightsOrderController.java index 1fc59fb..5aff793 100644 --- a/rights-admin-controller/src/main/java/com/cyjd/rights/controller/RightsOrderController.java +++ b/rights-admin-controller/src/main/java/com/cyjd/rights/controller/RightsOrderController.java @@ -1,11 +1,8 @@ package com.cyjd.rights.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.cyjd.rights.business.service.AliPayOrderService; import com.cyjd.rights.business.service.RightsOrderService; -import com.cyjd.rights.dto.AliPayInOrderDto; import com.cyjd.rights.dto.RightsOrderDto; -import com.cyjd.rights.vo.AliPayOrderVo; import com.cyjd.rights.vo.RightsOrderVo; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; @@ -21,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; @Api(value = "权益领取订单接口",tags = "权益领取订单接口") @RestController -@RequestMapping("/rightsOrder") +@RequestMapping("/rights/rightsOrder") @Slf4j public class RightsOrderController { @Autowired