更新

2022-02-18 11:04:56 +08:00 · 2022-02-18 11:04:56 +08:00 · 87ccad6ec7
commit 87ccad6ec7
parent 1600f7cdab
86 changed files with 92 additions and 115 deletions
--- a/consumer/src/main/resources/application.yml
+++ b/consumer/src/main/resources/application.yml
@ -1,6 +1,5 @@
 server:
-#  port: 8886
-  port: 30005
+  port: 8886
  servlet:
    context-path: /

@ -31,7 +30,7 @@ spring:
  boot:
    admin:
      client:
-        url: http://127.0.0.1:30000
+        url: http://127.0.0.1:8000
  cache:
    type: redis
  # Redis
--- a/manager-api/src/main/java/cn/lili/controller/distribution/DistributionManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/distribution/DistributionManagerController.java
@ -27,7 +27,7 @@ import javax.validation.constraints.NotNull;
 */
@RestController
@Api(tags = "管理端,分销员管理接口")
-@RequestMapping("/manager/distribution")
+@RequestMapping("/manager/distribution/distribution")
 public class DistributionManagerController {

    @Autowired
--- a/manager-api/src/main/java/cn/lili/controller/file/FileManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/file/FileManagerController.java
@ -1,6 +1,5 @@
 package cn.lili.controller.file;

-import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
@ -24,8 +23,8 @@ import java.util.List;
 * @since 2020/11/26 15:41
 */
@RestController
-@Api(tags = "管理端,文件管理管理接口")
-@RequestMapping("/manager/file")
+@Api(tags = "管理端,文件管理接口")
+@RequestMapping("/manager/common/file")
 public class FileManagerController {

    @Autowired
--- a/manager-api/src/main/java/cn/lili/controller/goods/CategoryBrandManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/goods/CategoryBrandManagerController.java
@ -1,12 +1,9 @@
 package cn.lili.controller.goods;

-import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.goods.entity.dos.CategoryBrand;
 import cn.lili.modules.goods.entity.vos.CategoryBrandVO;
 import cn.lili.modules.goods.service.CategoryBrandService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@ -24,7 +21,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "管理端,分类品牌接口")
-@RequestMapping("/manager/category/brand")
+@RequestMapping("/manager/goods/categoryBrand")
 public class CategoryBrandManagerController {

    /**
--- a/manager-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupManagerController.java
@ -27,7 +27,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "管理端,分类绑定参数组接口")
-@RequestMapping("/manager/goods/category/parameters")
+@RequestMapping("/manager/goods/categoryParameters")
 public class CategoryParameterGroupManagerController {

    /**
--- a/manager-api/src/main/java/cn/lili/controller/goods/CategorySpecificationManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/goods/CategorySpecificationManagerController.java
@ -25,7 +25,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "管理端,商品分类规格接口")
-@RequestMapping("/manager/goods/category/spec")
+@RequestMapping("/manager/goods/categorySpec")
 public class CategorySpecificationManagerController {

    /**
--- a/manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java
@ -33,7 +33,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "管理端,商品管理接口")
-@RequestMapping("/manager/goods")
+@RequestMapping("/manager/goods/goods")
 public class GoodsManagerController {
    /**
     * 商品
--- a/manager-api/src/main/java/cn/lili/controller/member/MemberEvaluationManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/member/MemberEvaluationManagerController.java
@ -26,7 +26,7 @@ import javax.validation.constraints.NotNull;
 */
@RestController
@Api(tags = "管理端,会员商品评价接口")
-@RequestMapping("/manager/memberEvaluation")
+@RequestMapping("/manager/member/evaluation")
 public class MemberEvaluationManagerController {
    @Autowired
    private MemberEvaluationService memberEvaluationService;
--- a/manager-api/src/main/java/cn/lili/controller/member/MemberGradeManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/member/MemberGradeManagerController.java
@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.*;
 */
@RestController
@Api(tags = "管理端,会员等级接口")
-@RequestMapping("/manager/memberGrade")
+@RequestMapping("/manager/member/memberGrade")
 public class MemberGradeManagerController {

    @Autowired
--- a/manager-api/src/main/java/cn/lili/controller/message/MemberMessageManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/message/MemberMessageManagerController.java
@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@ -24,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
@RestController
@Api(tags = "管理端,会员消息消息管理接口")
-@RequestMapping("/manager/message/member")
+@RequestMapping("/manager/other/memberMessage")
 public class MemberMessageManagerController {
    @Autowired
    private MemberMessageService memberMessageService;
--- a/manager-api/src/main/java/cn/lili/controller/message/MemberNoticeLogManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/message/MemberNoticeLogManagerController.java
@ -22,7 +22,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "管理端,会员消息接口")
-@RequestMapping("/manager/memberNoticeLog")
+@RequestMapping("/manager/message/memberNoticeLog")
 public class MemberNoticeLogManagerController {
    @Autowired
    private MemberNoticeLogService memberNoticeLogService;
--- a/manager-api/src/main/java/cn/lili/controller/message/MemberNoticeManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/message/MemberNoticeManagerController.java
@ -25,7 +25,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "管理端,会员站内信管理API")
-@RequestMapping("/manager/member/notice")
+@RequestMapping("/manager/message/memberNotice")
 public class MemberNoticeManagerController {
    @Autowired
    private MemberNoticeService memberNoticeService;
--- a/manager-api/src/main/java/cn/lili/controller/message/MemberNoticeSenterManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/message/MemberNoticeSenterManagerController.java
@ -23,7 +23,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "管理端,会员消息接口")
-@RequestMapping("/manager/memberNoticeSenter")
+@RequestMapping("/manager/message/memberNoticeSenter")
 public class MemberNoticeSenterManagerController {
    @Autowired
    private MemberNoticeSenterService memberNoticeSenterService;
--- a/manager-api/src/main/java/cn/lili/controller/message/ServiceNoticeManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/message/ServiceNoticeManagerController.java
@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "管理端,服务订阅消息接口")
-@RequestMapping("/manager/admin/notice")
+@RequestMapping("/manager/message/serviceNotice")
 public class ServiceNoticeManagerController {
    @Autowired
    private ServiceNoticeService serviceNoticeService;
--- a/manager-api/src/main/java/cn/lili/controller/order/AfterSaleManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/order/AfterSaleManagerController.java
@ -27,7 +27,7 @@ import java.util.List;
 * @since 2021/1/6 14:11
 */
@RestController
-@RequestMapping("/manager/afterSale")
+@RequestMapping("/manager/order/afterSale")
@Api(tags = "管理端,售后接口")
 public class AfterSaleManagerController {

--- a/manager-api/src/main/java/cn/lili/controller/order/AfterSaleReasonManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/order/AfterSaleReasonManagerController.java
@ -23,7 +23,7 @@ import javax.validation.Valid;
 * @since 2021/1/6 14:11
 */
@RestController
-@RequestMapping("/manager/afterSaleReason")
+@RequestMapping("/manager/order/afterSaleReason")
@Api(tags = "管理端,售后原因接口")
 public class AfterSaleReasonManagerController {

--- a/manager-api/src/main/java/cn/lili/controller/order/OrderComplaintManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/order/OrderComplaintManagerController.java
@ -31,7 +31,7 @@ import org.springframework.web.bind.annotation.*;
 */
@RestController
@Api(tags = "管理端,交易投诉接口")
-@RequestMapping("/manager/complain")
+@RequestMapping("/manager/order/complain")
 public class OrderComplaintManagerController {

    /**
--- a/manager-api/src/main/java/cn/lili/controller/order/OrderLogManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/order/OrderLogManagerController.java
@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@ -25,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
@RestController
@Api(tags = "管理端,订单日志管理接口")
-@RequestMapping("/manager/orderLog")
+@RequestMapping("/manager/order/orderLog")
 public class OrderLogManagerController {
    @Autowired
    private OrderLogService orderLogService;
--- a/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java
@ -32,7 +32,7 @@ import java.util.List;
 * @since 2020/11/17 4:34 下午
 */
@RestController
-@RequestMapping("/manager/orders")
+@RequestMapping("/manager/order/order")
@Api(tags = "管理端,订单API")
 public class OrderManagerController {

--- a/manager-api/src/main/java/cn/lili/controller/order/PaymentLogManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/order/PaymentLogManagerController.java
@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@ -26,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
@RestController
@Api(tags = "管理端,收款日志接口")
-@RequestMapping("/manager/paymentLog")
+@RequestMapping("/manager/order/paymentLog")
 public class PaymentLogManagerController {

    @Autowired
--- a/manager-api/src/main/java/cn/lili/controller/order/ReceiptManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/order/ReceiptManagerController.java
@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 **/
@RestController
@Api(tags = "管理端,发票记录接口")
-@RequestMapping("/manager/receipt")
+@RequestMapping("/manager/trade/receipt")
 public class ReceiptManagerController {

    @Autowired
--- a/manager-api/src/main/java/cn/lili/controller/order/RefundLogManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/order/RefundLogManagerController.java
@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@ -25,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
@RestController
@Api(tags = "管理端,退款日志接口")
-@RequestMapping("/manager/refundLog")
+@RequestMapping("/manager/order/refundLog")
 public class RefundLogManagerController {
    @Autowired
    private RefundLogService refundLogService;
--- a/manager-api/src/main/java/cn/lili/controller/other/ArticleCategoryManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/ArticleCategoryManagerController.java
@ -24,7 +24,7 @@ import java.util.List;
@Slf4j
@RestController
@Api(tags = "管理端,文章分类管理接口")
-@RequestMapping("/manager/article-category")
+@RequestMapping("/manager/other/articleCategory")
 public class ArticleCategoryManagerController {

    /**
--- a/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java
@ -25,7 +25,7 @@ import javax.validation.Valid;
 */
@RestController
@Api(tags = "管理端,文章接口")
-@RequestMapping("/manager/article")
+@RequestMapping("/manager/other/article")
 public class ArticleManagerController {

    /**
--- a/manager-api/src/main/java/cn/lili/controller/other/CustomWordsController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/CustomWordsController.java
@ -35,7 +35,7 @@ import java.nio.charset.StandardCharsets;
@Slf4j
@RestController
@Api(tags = "管理端,自定义分词接口")
-@RequestMapping("/manager/custom-words")
+@RequestMapping("/manager/other/customWords")
 public class CustomWordsController {

    /**
--- a/manager-api/src/main/java/cn/lili/controller/other/ElasticsearchController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/ElasticsearchController.java
@ -20,7 +20,7 @@ import java.util.Map;
 */
@RestController
@Api(tags = "ES初始化接口")
-@RequestMapping("/manager/elasticsearch")
+@RequestMapping("/manager/other/elasticsearch")
 public class ElasticsearchController {

    @Autowired
--- a/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java
@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
@RestController
@Api(tags = "管理端,意见反馈接口")
-@RequestMapping("/manager/feedback")
+@RequestMapping("/manager/other/feedback")
 public class FeedbackManagerController {

    /**
--- a/manager-api/src/main/java/cn/lili/controller/other/MessageManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/MessageManagerController.java
@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
 */
@RestController
@Api(tags = "管理端,消息发送管理接口")
-@RequestMapping("/manager/message")
+@RequestMapping("/manager/other/message")
 public class MessageManagerController {
    @Autowired
    private MessageService messageService;
--- a/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java
@ -27,7 +27,7 @@ import javax.validation.constraints.NotNull;
 */
@RestController
@Api(tags = "管理端,页面设置管理接口")
-@RequestMapping("/manager/pageData")
+@RequestMapping("/manager/other/pageData")
 public class PageDataManagerController {

    @Autowired
--- a/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java
@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "管理端,敏感词管理接口")
-@RequestMapping("/manager/sensitiveWords")
+@RequestMapping("/manager/other/sensitiveWords")
 public class SensitiveWordsManagerController {

    @Autowired
--- a/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java
@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "管理端,专题活动接口")
-@RequestMapping("/manager/special")
+@RequestMapping("/manager/order/special")
 public class SpecialManagerController {

    @Autowired
--- a/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java
@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;

 import java.util.List;
@ -26,7 +25,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "管理端,验证码资源维护接口")
-@RequestMapping("/manager/verificationSource")
+@RequestMapping("/manager/other/verificationSource")
 public class VerificationSourceController {

    @Autowired
--- a/manager-api/src/main/java/cn/lili/controller/other/broadcast/StudioManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/broadcast/StudioManagerController.java
@ -26,7 +26,7 @@ import javax.validation.constraints.NotNull;
 * @since 2021/5/28 11:56 上午
 */
@RestController
-@Api(tags = "店铺端,直播间接口")
+@Api(tags = "管理端,直播间接口")
@RequestMapping("/manager/broadcast/studio")
 public class StudioManagerController {

--- a/manager-api/src/main/java/cn/lili/controller/other/purchase/PurchaseManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/purchase/PurchaseManagerController.java
@ -27,7 +27,7 @@ import java.util.List;
 */
@Api(tags = "管理端,采购接口")
@RestController
-@RequestMapping("/manager/purchase")
+@RequestMapping("/manager/other/purchase/purchase")
 public class PurchaseManagerController {

    /**
--- a/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java
@ -27,7 +27,6 @@ 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.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

@ -45,7 +44,7 @@ import java.util.List;
@Slf4j
@RestController
@Api(tags = "管理员")
-@RequestMapping("/manager/user")
+@RequestMapping("/manager/passport/user")
@Validated
 public class AdminUserManagerController {
    @Autowired
--- a/manager-api/src/main/java/cn/lili/controller/passport/MemberManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/passport/MemberManagerController.java
@ -45,9 +45,9 @@ public class MemberManagerController {
    @ApiOperation(value = "通过ID获取会员信息")
    @ApiImplicitParam(name = "id", value = "会员ID", required = true, dataType = "String", paramType = "path")
    @GetMapping(value = "/{id}")
-    public ResultMessage<Member> get(@PathVariable String id) {
+    public ResultMessage<MemberVO> get(@PathVariable String id) {

-        return ResultUtil.data(memberService.getById(id));
+        return ResultUtil.data(memberService.getMember(id));
    }

    @ApiOperation(value = "添加会员")
--- a/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java
@ -23,7 +23,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "管理端,部门管理接口")
-@RequestMapping("/manager/department")
+@RequestMapping("/manager/permission/department")
 public class DepartmentManagerController {
    @Autowired
    private DepartmentService departmentService;
--- a/manager-api/src/main/java/cn/lili/controller/permission/DepartmentRoleManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/permission/DepartmentRoleManagerController.java
@ -20,7 +20,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "管理端,部门角色接口")
-@RequestMapping("/manager/departmentRole")
+@RequestMapping("/manager/permission/departmentRole")
 public class DepartmentRoleManagerController {
    @Autowired
    private DepartmentRoleService departmentRoleService;
--- a/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java
@ -26,7 +26,7 @@ import java.util.List;
@Slf4j
@RestController
@Api(tags = "管理端,菜单管理接口")
-@RequestMapping("/manager/menu")
+@RequestMapping("/manager/permission/menu")
 public class MenuManagerController {

    @Autowired
--- a/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java
@ -23,7 +23,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "管理端,角色管理接口")
-@RequestMapping("/manager/role")
+@RequestMapping("/manager/permission/role")
 public class RoleManagerController {
    @Autowired
    private RoleService roleService;
--- a/manager-api/src/main/java/cn/lili/controller/permission/RoleMenuManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/permission/RoleMenuManagerController.java
@ -21,7 +21,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "管理端,角色菜单接口")
-@RequestMapping("/manager/roleMenu")
+@RequestMapping("/manager/permission/roleMenu")
 public class RoleMenuManagerController {
    @Autowired
    private RoleMenuService roleMenuService;
--- a/manager-api/src/main/java/cn/lili/controller/permission/UserRoleManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/permission/UserRoleManagerController.java
@ -21,7 +21,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "管理端,管理员角色接口")
-@RequestMapping("/manager/userRole")
+@RequestMapping("/manager/permission/userRole")
 public class UserRoleManagerController {
    @Autowired
    private UserRoleService userRoleService;
--- a/manager-api/src/main/java/cn/lili/controller/promotion/KanJiaActivityGoodsManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/promotion/KanJiaActivityGoodsManagerController.java
@ -28,7 +28,7 @@ import java.util.Arrays;
 **/
@RestController
@Api(tags = "管理端,砍价促销接口")
-@RequestMapping("/manager/promotion/kan-jia-goods")
+@RequestMapping("/manager/promotion/kanJiaGoods")
 public class KanJiaActivityGoodsManagerController {

    @Autowired
--- a/manager-api/src/main/java/cn/lili/controller/promotion/PromotionManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/promotion/PromotionManagerController.java
@ -27,7 +27,7 @@ import java.util.Map;
 **/
@RestController
@Api(tags = "管理端,促销接口")
-@RequestMapping("/manager/promotion")
+@RequestMapping("/manager/promotion/promotion")
 public class PromotionManagerController {

    @Autowired
--- a/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java
@ -23,7 +23,7 @@ import java.util.List;
@Slf4j
@RestController
@Api(tags = "日志管理接口")
-@RequestMapping("/manager/log")
+@RequestMapping("/manager/setting/log")
 public class LogManagerController {
    @Autowired
    private SystemLogService systemLogService;
--- a/manager-api/src/main/java/cn/lili/controller/setting/NoticeMessageManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/NoticeMessageManagerController.java
@ -35,7 +35,7 @@ import java.util.List;
@Slf4j
@RestController
@Api(tags = "管理端,会员站内信管理接口")
-@RequestMapping("/manager/noticeMessage")
+@RequestMapping("/manager/setting/noticeMessage")
 public class NoticeMessageManagerController {
    @Autowired
    private NoticeMessageService noticeMessageService;
--- a/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java
@ -9,7 +9,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;

 import javax.validation.Valid;
@ -24,7 +23,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "管理端,行政地区管理接口")
-@RequestMapping("/manager/region")
+@RequestMapping("/manager/setting/region")
 public class RegionManagerController {
    @Autowired
    private RegionService regionService;
--- a/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java
@ -32,7 +32,7 @@ import java.util.Collections;
 */
@RestController
@Api(tags = "管理端,系统设置接口")
-@RequestMapping("/manager/system/setting")
+@RequestMapping("/manager/setting/setting")
 public class SettingManagerController {
    @Autowired
    private SettingService settingService;
--- a/manager-api/src/main/java/cn/lili/controller/setting/SettingXManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/SettingXManagerController.java
@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
@RestController
@Api(tags = "管理端,系统设置扩展接口")
-@RequestMapping("/manager/system/settingx")
+@RequestMapping("/manager/setting/settingx")
 public class SettingXManagerController {

    @ApiOperation(value = "支持支付方式表单")
--- a/manager-api/src/main/java/cn/lili/controller/sms/SmsManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/sms/SmsManagerController.java
@ -23,7 +23,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "管理端,短信接口")
-@RequestMapping("/manager/sms")
+@RequestMapping("/manager/sms/sms")
 public class SmsManagerController {
    @Autowired
    private SmsReachService smsReachService;
--- a/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java
@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
@Api(tags = "管理端,退款统计接口")
@RestController
-@RequestMapping("/manager/statistics/refund/order")
+@RequestMapping("/manager/statistics/refundOrder")
 public class RefundOrderStatisticsManagerController {
    @Autowired
    private RefundOrderStatisticsService refundOrderStatisticsService;
--- a/manager-api/src/main/java/cn/lili/controller/store/BillManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/store/BillManagerController.java
@ -27,7 +27,7 @@ import javax.validation.constraints.NotNull;
 */
@RestController
@Api(tags = "管理端,商家结算单接口")
-@RequestMapping("/manager/store/bill")
+@RequestMapping("/manager/order/bill")
 public class BillManagerController {
    @Autowired
    private BillService billService;
--- a/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java
@ -33,7 +33,7 @@ import java.util.List;
 */
@Api(tags = "管理端,店铺管理接口")
@RestController
-@RequestMapping("/manager/store")
+@RequestMapping("/manager/store/store")
 public class StoreManagerController {

    /**
--- a/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java
@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@ -24,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
@RestController
@Api(tags = "管理端,店铺消息消息管理接口")
-@RequestMapping("/manager/message/store")
+@RequestMapping("/manager/other/storeMessage")
 public class StoreMessageManagerController {

    @Autowired
--- a/manager-api/src/main/java/cn/lili/controller/wallet/MemberWalletManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/wallet/MemberWalletManagerController.java
@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
@RestController
@Api(tags = "管理端,预存款接口")
-@RequestMapping("/manager/members/wallet")
+@RequestMapping("/manager/wallet/wallet")
 public class MemberWalletManagerController {
    @Autowired
    private MemberWalletService memberWalletService;
--- a/manager-api/src/main/java/cn/lili/controller/wallet/MemberWithdrawApplyManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/wallet/MemberWithdrawApplyManagerController.java
@ -14,7 +14,6 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@ -29,7 +28,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
@RestController
@Api(tags = "管理端,余额提现记录接口")
-@RequestMapping("/manager/members/withdraw-apply")
+@RequestMapping("/manager/wallet/withdrawApply")
 public class MemberWithdrawApplyManagerController {
    @Autowired
    private MemberWithdrawApplyService memberWithdrawApplyService;
--- a/manager-api/src/main/java/cn/lili/controller/wallet/RechargeManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/wallet/RechargeManagerController.java
@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@ -24,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
@RestController
@Api(tags = "管理端,预存款充值记录接口")
-@RequestMapping("/manager/recharge")
+@RequestMapping("/manager/wallet/recharge")
 public class RechargeManagerController {
    @Autowired
    private RechargeService rechargeService;
--- a/manager-api/src/main/java/cn/lili/controller/wallet/WalletLogManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/wallet/WalletLogManagerController.java
@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
--- a/manager-api/src/main/java/cn/lili/controller/wechat/WechatMPMessageManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/wechat/WechatMPMessageManagerController.java
@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;

 import java.util.List;
@ -22,7 +21,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "微信小程序消息订阅接口")
-@RequestMapping("/manager/message/wechatMPMessage")
+@RequestMapping("/manager/wechat/wechatMPMessage")
 public class WechatMPMessageManagerController {
    @Autowired
    private WechatMPMessageService wechatMPMessageService;
--- a/manager-api/src/main/java/cn/lili/controller/wechat/WechatMessageManageController.java
+++ b/manager-api/src/main/java/cn/lili/controller/wechat/WechatMessageManageController.java
@ -23,7 +23,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "管理端,微信消息接口")
-@RequestMapping("/manager/message/wechat")
+@RequestMapping("/manager/wechat/wechatMessage")
 public class WechatMessageManageController {
    @Autowired
    private WechatMessageService wechatMessageService;
--- a/manager-api/src/main/resources/application.yml
+++ b/manager-api/src/main/resources/application.yml
@ -1,6 +1,5 @@
 server:
-#  port: 8887
-  port: 30003
+  port: 8887

  servlet:
    context-path: /
@ -29,7 +28,7 @@ spring:
  boot:
    admin:
      client:
-        url: http://127.0.0.1:30000
+        url: http://127.0.0.1:8000
  cache:
    type: redis
  # Redis
@ -182,7 +181,7 @@ jasypt:

 lili:
  system:
-    isDemoSite: true
+    isDemoSite: false
    #     脱敏级别：
    #     0：不做脱敏处理
    #     1：管理端用户手机号等信息脱敏
--- a/seller-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsStoreController.java
@ -29,7 +29,7 @@ import java.util.Objects;
 */
@RestController
@Api(tags = "店铺端,分销商品接口")
-@RequestMapping("/store/distributionGoods")
+@RequestMapping("/store/distribution/goods")
 public class DistributionGoodsStoreController {

    /**
--- a/seller-api/src/main/java/cn/lili/controller/distribution/DistributionOrderStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/distribution/DistributionOrderStoreController.java
@ -24,7 +24,7 @@ import java.util.Objects;
 */
@RestController
@Api(tags = "店铺端,分销订单接口")
-@RequestMapping("/store/distributionOrder")
+@RequestMapping("/store/distribution/order")
 public class DistributionOrderStoreController {

    /**
--- a/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java
@ -6,7 +6,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@ -22,7 +21,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "店铺端,分类绑定参数组管理接口")
-@RequestMapping("/store/goods/category/parameters")
+@RequestMapping("/store/goods/categoryParameters")
 public class CategoryParameterGroupStoreController {


--- a/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java
@ -6,7 +6,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@ -22,7 +21,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "店铺端,商品分类规格接口")
-@RequestMapping("/store/goods/category/spec")
+@RequestMapping("/store/goods/categorySpec")
 public class CategorySpecificationStoreController {
    @Autowired
    private CategorySpecificationService categorySpecificationService;
--- a/seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java
@ -14,7 +14,6 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheConfig;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
--- a/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java
@ -27,7 +27,7 @@ import java.util.Objects;
 */
@RestController
@Api(tags = "店铺端,草稿商品接口")
-@RequestMapping("/store/draft/goods")
+@RequestMapping("/store/goods/draftGoods")
 public class DraftGoodsStoreController {
    @Autowired
    private DraftGoodsService draftGoodsService;
--- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java
@ -39,7 +39,7 @@ import java.util.stream.Collectors;
 */
@RestController
@Api(tags = "店铺端,商品接口")
-@RequestMapping("/store/goods")
+@RequestMapping("/store/goods/goods")
 public class GoodsStoreController {

    /**
--- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java
@ -1,17 +1,16 @@
 package cn.lili.controller.goods;


-import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.goods.entity.dos.GoodsUnit;
 import cn.lili.modules.goods.service.GoodsUnitService;
+import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@ -24,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
@RestController
@Api(tags = "店铺端,商品计量单位接口")
-@RequestMapping("/store/goods/unit")
+@RequestMapping("/store/goods/goodsUnit")
 public class GoodsUnitStoreController {
    @Autowired
    private GoodsUnitService goodsUnitService;
--- a/seller-api/src/main/java/cn/lili/controller/member/BillStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/member/BillStoreController.java
@ -31,7 +31,7 @@ import java.util.Objects;
 */
@RestController
@Api(tags = "店铺端,结算单接口")
-@RequestMapping("/store/bill")
+@RequestMapping("/store/order/bill")
 public class BillStoreController {

    @Autowired
--- a/seller-api/src/main/java/cn/lili/controller/member/MemberEvaluationStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/member/MemberEvaluationStoreController.java
@ -26,7 +26,7 @@ import java.util.Objects;
 */
@RestController
@Api(tags = "店铺端,商品评价管理接口")
-@RequestMapping("/store/memberEvaluation")
+@RequestMapping("/store/member/evaluation")
 public class MemberEvaluationStoreController {

    @Autowired
--- a/seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java
+++ b/seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java
@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
@RestController
@Api(tags = "店铺端,管理员接口")
-@RequestMapping("/store/user")
+@RequestMapping("/store/member/user")
 public class StoreUserController {
    @Autowired
    private MemberService memberService;
--- a/seller-api/src/main/java/cn/lili/controller/message/StoreMessageController.java
+++ b/seller-api/src/main/java/cn/lili/controller/message/StoreMessageController.java
@ -29,7 +29,7 @@ import java.util.Objects;
 */
@RestController
@Api(tags = "店铺端,消息接口")
-@RequestMapping("/store/message")
+@RequestMapping("/store/message/storeMessage")
 public class StoreMessageController {

    /**
--- a/seller-api/src/main/java/cn/lili/controller/order/AfterSaleStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/order/AfterSaleStoreController.java
@ -31,7 +31,7 @@ import java.util.Objects;
 */
@RestController
@Api(tags = "店铺端,售后管理接口")
-@RequestMapping("/store/afterSale")
+@RequestMapping("/store/order/afterSale")
 public class AfterSaleStoreController {

    @Autowired
--- a/seller-api/src/main/java/cn/lili/controller/order/OrderComplaintStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/order/OrderComplaintStoreController.java
@ -30,7 +30,7 @@ import java.util.Objects;
 **/
@RestController
@Api(tags = "店铺端,交易投诉接口")
-@RequestMapping("/store/complain")
+@RequestMapping("/store/order/complain")
 public class OrderComplaintStoreController {

    /**
--- a/seller-api/src/main/java/cn/lili/controller/order/OrderLogStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/order/OrderLogStoreController.java
@ -25,7 +25,7 @@ import java.util.List;
 **/
@RestController
@Api(tags = "店铺端,订单日志接口")
-@RequestMapping("/store/orderLog")
+@RequestMapping("/store/order/orderLog")
 public class OrderLogStoreController {

    @Autowired
--- a/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java
@ -41,7 +41,7 @@ import java.util.Objects;
 **/
@Slf4j
@RestController
-@RequestMapping("/store/orders")
+@RequestMapping("/store/order/order")
@Api(tags = "店铺端,订单接口")
 public class OrderStoreController {

--- a/seller-api/src/main/java/cn/lili/controller/order/ReceiptStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/order/ReceiptStoreController.java
@ -27,7 +27,7 @@ import java.util.Objects;
 **/
@RestController
@Api(tags = "店铺端,发票接口")
-@RequestMapping("/store/receipt")
+@RequestMapping("/store/trade/receipt")
 public class ReceiptStoreController {

    @Autowired
--- a/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java
+++ b/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java
@ -28,7 +28,7 @@ import javax.validation.constraints.NotNull;

@RestController
@Api(tags = "店铺端,商家登录接口 ")
-@RequestMapping("/store/login")
+@RequestMapping("/store/passport/login")
 public class StorePassportController {

    /**
--- a/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java
@ -24,7 +24,7 @@ import java.util.Objects;
 **/
@RestController
@Api(tags = "店铺端,运费模板接口")
-@RequestMapping("/store/freightTemplate")
+@RequestMapping("/store/setting/freightTemplate")
 public class FreightTemplateStoreController {
    @Autowired
    private FreightTemplateService freightTemplateService;
--- a/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java
@ -25,7 +25,7 @@ import java.util.Objects;
 */
@RestController
@Api(tags = "店铺端,日志管理接口")
-@RequestMapping("/store/log")
+@RequestMapping("/store/settings/log")
 public class LogStoreController {
    @Autowired
    private SystemLogService systemLogService;
--- a/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java
+++ b/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java
@ -26,7 +26,7 @@ import java.util.Objects;
 */
@RestController
@Api(tags = "店铺端,商家地址（自提点）接口")
-@RequestMapping("/store/storeAddress")
+@RequestMapping("/store/member/storeAddress")
 public class StoreAddressController {

    /**
--- a/seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java
+++ b/seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java
@ -31,7 +31,7 @@ import java.util.Objects;
 */
@RestController
@Api(tags = "店铺端,页面接口")
-@RequestMapping("/store/pageData")
+@RequestMapping("/store/settings/pageData")
 public class StorePageDataController {
    @Autowired
    private PageDataService pageDataService;
--- a/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java
+++ b/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java
@ -27,7 +27,7 @@ import javax.validation.Valid;
 */
@RestController
@Api(tags = "店铺端,店铺设置接口")
-@RequestMapping("/store/settings")
+@RequestMapping("/store/settings/storeSettings")
 public class StoreSettingsController {

    /**
--- a/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java
@ -25,7 +25,7 @@ import java.util.Objects;
 */
@Api(tags = "店铺端,退款统计接口")
@RestController
-@RequestMapping("/store/statistics/refund/order")
+@RequestMapping("/store/statistics/refundOrder")
 public class RefundOrderStatisticsStoreController {

    @Autowired
--- a/seller-api/src/main/resources/application.yml
+++ b/seller-api/src/main/resources/application.yml
@ -1,6 +1,5 @@
 server:
-#  port: 8889
-  port: 30004
+  port: 8889

  servlet:
    context-path: /
@ -29,7 +28,7 @@ spring:
  boot:
    admin:
      client:
-        url: http://127.0.0.1:30000
+        url: http://127.0.0.1:8000
  cache:
    type: redis
  # Redis
@ -179,7 +178,7 @@ jasypt:

 lili:
  system:
-    isDemoSite: true
+    isDemoSite: false
  statistics:
    # 在线人数统计 X 小时。这里设置48，即统计过去48小时每小时在线人数
    onlineMember: 48