Merge remote-tracking branch 'origin/master'

.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/
+

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

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

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

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

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