caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
itheinjury@163.com 2022-02-18 11:04:56 +08:00
parent 1600f7cdab
commit 87ccad6ec7
86 changed files with 92 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
consumer/src/main/resources/application.yml
View File

@ -1,6 +1,5 @@
server: server:
# port: 8886 port: 8886
port: 30005
servlet: servlet:
context-path: / context-path: /
@ -31,7 +30,7 @@ spring:
boot: boot:
admin: admin:
client: client:
url: http://127.0.0.1:30000 url: http://127.0.0.1:8000
cache: cache:
type: redis type: redis
# Redis # Redis

2
manager-api/src/main/java/cn/lili/controller/distribution/DistributionManagerController.java
View File

@ -27,7 +27,7 @@ import javax.validation.constraints.NotNull;
*/ */
@RestController @RestController
@Api(tags = "管理端,分销员管理接口") @Api(tags = "管理端,分销员管理接口")
@RequestMapping("/manager/distribution") @RequestMapping("/manager/distribution/distribution")
public class DistributionManagerController { public class DistributionManagerController {
@Autowired @Autowired

5
manager-api/src/main/java/cn/lili/controller/file/FileManagerController.java
View File

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

5
manager-api/src/main/java/cn/lili/controller/goods/CategoryBrandManagerController.java
View File

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

2
manager-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupManagerController.java
View File

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

2
manager-api/src/main/java/cn/lili/controller/goods/CategorySpecificationManagerController.java
View File

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

2
manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java
View File

@ -33,7 +33,7 @@ import java.util.List;
*/ */
@RestController @RestController
@Api(tags = "管理端,商品管理接口") @Api(tags = "管理端,商品管理接口")
@RequestMapping("/manager/goods") @RequestMapping("/manager/goods/goods")
public class GoodsManagerController { public class GoodsManagerController {
/** /**
* 商品 * 商品

2
manager-api/src/main/java/cn/lili/controller/member/MemberEvaluationManagerController.java
View File

@ -26,7 +26,7 @@ import javax.validation.constraints.NotNull;
*/ */
@RestController @RestController
@Api(tags = "管理端,会员商品评价接口") @Api(tags = "管理端,会员商品评价接口")
@RequestMapping("/manager/memberEvaluation") @RequestMapping("/manager/member/evaluation")
public class MemberEvaluationManagerController { public class MemberEvaluationManagerController {
@Autowired @Autowired
private MemberEvaluationService memberEvaluationService; private MemberEvaluationService memberEvaluationService;

2
manager-api/src/main/java/cn/lili/controller/member/MemberGradeManagerController.java
View File

@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.*;
*/ */
@RestController @RestController
@Api(tags = "管理端,会员等级接口") @Api(tags = "管理端,会员等级接口")
@RequestMapping("/manager/memberGrade") @RequestMapping("/manager/member/memberGrade")
public class MemberGradeManagerController { public class MemberGradeManagerController {
@Autowired @Autowired

3
manager-api/src/main/java/cn/lili/controller/message/MemberMessageManagerController.java
View File

@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; 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.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -24,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
*/ */
@RestController @RestController
@Api(tags = "管理端,会员消息消息管理接口") @Api(tags = "管理端,会员消息消息管理接口")
@RequestMapping("/manager/message/member") @RequestMapping("/manager/other/memberMessage")
public class MemberMessageManagerController { public class MemberMessageManagerController {
@Autowired @Autowired
private MemberMessageService memberMessageService; private MemberMessageService memberMessageService;

2
manager-api/src/main/java/cn/lili/controller/message/MemberNoticeLogManagerController.java
View File

@ -22,7 +22,7 @@ import java.util.List;
*/ */
@RestController @RestController
@Api(tags = "管理端,会员消息接口") @Api(tags = "管理端,会员消息接口")
@RequestMapping("/manager/memberNoticeLog") @RequestMapping("/manager/message/memberNoticeLog")
public class MemberNoticeLogManagerController { public class MemberNoticeLogManagerController {
@Autowired @Autowired
private MemberNoticeLogService memberNoticeLogService; private MemberNoticeLogService memberNoticeLogService;

2
manager-api/src/main/java/cn/lili/controller/message/MemberNoticeManagerController.java
View File

@ -25,7 +25,7 @@ import java.util.List;
*/ */
@RestController @RestController
@Api(tags = "管理端,会员站内信管理API") @Api(tags = "管理端,会员站内信管理API")
@RequestMapping("/manager/member/notice") @RequestMapping("/manager/message/memberNotice")
public class MemberNoticeManagerController { public class MemberNoticeManagerController {
@Autowired @Autowired
private MemberNoticeService memberNoticeService; private MemberNoticeService memberNoticeService;

2
manager-api/src/main/java/cn/lili/controller/message/MemberNoticeSenterManagerController.java
View File

@ -23,7 +23,7 @@ import java.util.List;
*/ */
@RestController @RestController
@Api(tags = "管理端,会员消息接口") @Api(tags = "管理端,会员消息接口")
@RequestMapping("/manager/memberNoticeSenter") @RequestMapping("/manager/message/memberNoticeSenter")
public class MemberNoticeSenterManagerController { public class MemberNoticeSenterManagerController {
@Autowired @Autowired
private MemberNoticeSenterService memberNoticeSenterService; private MemberNoticeSenterService memberNoticeSenterService;

2
manager-api/src/main/java/cn/lili/controller/message/ServiceNoticeManagerController.java
View File

@ -24,7 +24,7 @@ import java.util.List;
*/ */
@RestController @RestController
@Api(tags = "管理端,服务订阅消息接口") @Api(tags = "管理端,服务订阅消息接口")
@RequestMapping("/manager/admin/notice") @RequestMapping("/manager/message/serviceNotice")
public class ServiceNoticeManagerController { public class ServiceNoticeManagerController {
@Autowired @Autowired
private ServiceNoticeService serviceNoticeService; private ServiceNoticeService serviceNoticeService;

2
manager-api/src/main/java/cn/lili/controller/order/AfterSaleManagerController.java
View File

@ -27,7 +27,7 @@ import java.util.List;
* @since 2021/1/6 14:11 * @since 2021/1/6 14:11
*/ */
@RestController @RestController
@RequestMapping("/manager/afterSale") @RequestMapping("/manager/order/afterSale")
@Api(tags = "管理端,售后接口") @Api(tags = "管理端,售后接口")
public class AfterSaleManagerController { public class AfterSaleManagerController {

2
manager-api/src/main/java/cn/lili/controller/order/AfterSaleReasonManagerController.java
View File

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

2
manager-api/src/main/java/cn/lili/controller/order/OrderComplaintManagerController.java
View File

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

3
manager-api/src/main/java/cn/lili/controller/order/OrderLogManagerController.java
View File

@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; 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.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@ -25,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
*/ */
@RestController @RestController
@Api(tags = "管理端,订单日志管理接口") @Api(tags = "管理端,订单日志管理接口")
@RequestMapping("/manager/orderLog") @RequestMapping("/manager/order/orderLog")
public class OrderLogManagerController { public class OrderLogManagerController {
@Autowired @Autowired
private OrderLogService orderLogService; private OrderLogService orderLogService;

2
manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java
View File

@ -32,7 +32,7 @@ import java.util.List;
* @since 2020/11/17 4:34 下午 * @since 2020/11/17 4:34 下午
*/ */
@RestController @RestController
@RequestMapping("/manager/orders") @RequestMapping("/manager/order/order")
@Api(tags = "管理端,订单API") @Api(tags = "管理端,订单API")
public class OrderManagerController { public class OrderManagerController {

3
manager-api/src/main/java/cn/lili/controller/order/PaymentLogManagerController.java
View File

@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; 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.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -26,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
*/ */
@RestController @RestController
@Api(tags = "管理端,收款日志接口") @Api(tags = "管理端,收款日志接口")
@RequestMapping("/manager/paymentLog") @RequestMapping("/manager/order/paymentLog")
public class PaymentLogManagerController { public class PaymentLogManagerController {
@Autowired @Autowired

2
manager-api/src/main/java/cn/lili/controller/order/ReceiptManagerController.java
View File

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

3
manager-api/src/main/java/cn/lili/controller/order/RefundLogManagerController.java
View File

@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; 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.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@ -25,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
*/ */
@RestController @RestController
@Api(tags = "管理端,退款日志接口") @Api(tags = "管理端,退款日志接口")
@RequestMapping("/manager/refundLog") @RequestMapping("/manager/order/refundLog")
public class RefundLogManagerController { public class RefundLogManagerController {
@Autowired @Autowired
private RefundLogService refundLogService; private RefundLogService refundLogService;

2
manager-api/src/main/java/cn/lili/controller/other/ArticleCategoryManagerController.java
View File

@ -24,7 +24,7 @@ import java.util.List;
@Slf4j @Slf4j
@RestController @RestController
@Api(tags = "管理端,文章分类管理接口") @Api(tags = "管理端,文章分类管理接口")
@RequestMapping("/manager/article-category") @RequestMapping("/manager/other/articleCategory")
public class ArticleCategoryManagerController { public class ArticleCategoryManagerController {
/** /**

2
manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java
View File

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

2
manager-api/src/main/java/cn/lili/controller/other/CustomWordsController.java
View File

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

2
manager-api/src/main/java/cn/lili/controller/other/ElasticsearchController.java
View File

@ -20,7 +20,7 @@ import java.util.Map;
*/ */
@RestController @RestController
@Api(tags = "ES初始化接口") @Api(tags = "ES初始化接口")
@RequestMapping("/manager/elasticsearch") @RequestMapping("/manager/other/elasticsearch")
public class ElasticsearchController { public class ElasticsearchController {
@Autowired @Autowired

2
manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java
View File

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

2
manager-api/src/main/java/cn/lili/controller/other/MessageManagerController.java
View File

@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
*/ */
@RestController @RestController
@Api(tags = "管理端,消息发送管理接口") @Api(tags = "管理端,消息发送管理接口")
@RequestMapping("/manager/message") @RequestMapping("/manager/other/message")
public class MessageManagerController { public class MessageManagerController {
@Autowired @Autowired
private MessageService messageService; private MessageService messageService;

2
manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java
View File

@ -27,7 +27,7 @@ import javax.validation.constraints.NotNull;
*/ */
@RestController @RestController
@Api(tags = "管理端,页面设置管理接口") @Api(tags = "管理端,页面设置管理接口")
@RequestMapping("/manager/pageData") @RequestMapping("/manager/other/pageData")
public class PageDataManagerController { public class PageDataManagerController {
@Autowired @Autowired

2
manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java
View File

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

2
manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java
View File

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

3
manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java
View File

@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
@ -26,7 +25,7 @@ import java.util.List;
*/ */
@RestController @RestController
@Api(tags = "管理端,验证码资源维护接口") @Api(tags = "管理端,验证码资源维护接口")
@RequestMapping("/manager/verificationSource") @RequestMapping("/manager/other/verificationSource")
public class VerificationSourceController { public class VerificationSourceController {
@Autowired @Autowired

2
manager-api/src/main/java/cn/lili/controller/other/broadcast/StudioManagerController.java
View File

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

2
manager-api/src/main/java/cn/lili/controller/other/purchase/PurchaseManagerController.java
View File

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

3
manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java
View File

@ -27,7 +27,6 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -45,7 +44,7 @@ import java.util.List;
@Slf4j @Slf4j
@RestController @RestController
@Api(tags = "管理员") @Api(tags = "管理员")
@RequestMapping("/manager/user") @RequestMapping("/manager/passport/user")
@Validated @Validated
public class AdminUserManagerController { public class AdminUserManagerController {
@Autowired @Autowired

4
manager-api/src/main/java/cn/lili/controller/passport/MemberManagerController.java
View File

@ -45,9 +45,9 @@ public class MemberManagerController {
@ApiOperation(value = "通过ID获取会员信息") @ApiOperation(value = "通过ID获取会员信息")
@ApiImplicitParam(name = "id", value = "会员ID", required = true, dataType = "String", paramType = "path") @ApiImplicitParam(name = "id", value = "会员ID", required = true, dataType = "String", paramType = "path")
@GetMapping(value = "/{id}") @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 = "添加会员") @ApiOperation(value = "添加会员")

2
manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java
View File

@ -23,7 +23,7 @@ import java.util.List;
*/ */
@RestController @RestController
@Api(tags = "管理端,部门管理接口") @Api(tags = "管理端,部门管理接口")
@RequestMapping("/manager/department") @RequestMapping("/manager/permission/department")
public class DepartmentManagerController { public class DepartmentManagerController {
@Autowired @Autowired
private DepartmentService departmentService; private DepartmentService departmentService;

2
manager-api/src/main/java/cn/lili/controller/permission/DepartmentRoleManagerController.java
View File

@ -20,7 +20,7 @@ import java.util.List;
*/ */
@RestController @RestController
@Api(tags = "管理端,部门角色接口") @Api(tags = "管理端,部门角色接口")
@RequestMapping("/manager/departmentRole") @RequestMapping("/manager/permission/departmentRole")
public class DepartmentRoleManagerController { public class DepartmentRoleManagerController {
@Autowired @Autowired
private DepartmentRoleService departmentRoleService; private DepartmentRoleService departmentRoleService;

2
manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java
View File

@ -26,7 +26,7 @@ import java.util.List;
@Slf4j @Slf4j
@RestController @RestController
@Api(tags = "管理端,菜单管理接口") @Api(tags = "管理端,菜单管理接口")
@RequestMapping("/manager/menu") @RequestMapping("/manager/permission/menu")
public class MenuManagerController { public class MenuManagerController {
@Autowired @Autowired

2
manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java
View File

@ -23,7 +23,7 @@ import java.util.List;
*/ */
@RestController @RestController
@Api(tags = "管理端,角色管理接口") @Api(tags = "管理端,角色管理接口")
@RequestMapping("/manager/role") @RequestMapping("/manager/permission/role")
public class RoleManagerController { public class RoleManagerController {
@Autowired @Autowired
private RoleService roleService; private RoleService roleService;

2
manager-api/src/main/java/cn/lili/controller/permission/RoleMenuManagerController.java
View File

@ -21,7 +21,7 @@ import java.util.List;
*/ */
@RestController @RestController
@Api(tags = "管理端,角色菜单接口") @Api(tags = "管理端,角色菜单接口")
@RequestMapping("/manager/roleMenu") @RequestMapping("/manager/permission/roleMenu")
public class RoleMenuManagerController { public class RoleMenuManagerController {
@Autowired @Autowired
private RoleMenuService roleMenuService; private RoleMenuService roleMenuService;

2
manager-api/src/main/java/cn/lili/controller/permission/UserRoleManagerController.java
View File

@ -21,7 +21,7 @@ import java.util.List;
*/ */
@RestController @RestController
@Api(tags = "管理端,管理员角色接口") @Api(tags = "管理端,管理员角色接口")
@RequestMapping("/manager/userRole") @RequestMapping("/manager/permission/userRole")
public class UserRoleManagerController { public class UserRoleManagerController {
@Autowired @Autowired
private UserRoleService userRoleService; private UserRoleService userRoleService;

2
manager-api/src/main/java/cn/lili/controller/promotion/KanJiaActivityGoodsManagerController.java
View File

@ -28,7 +28,7 @@ import java.util.Arrays;
**/ **/
@RestController @RestController
@Api(tags = "管理端,砍价促销接口") @Api(tags = "管理端,砍价促销接口")
@RequestMapping("/manager/promotion/kan-jia-goods") @RequestMapping("/manager/promotion/kanJiaGoods")
public class KanJiaActivityGoodsManagerController { public class KanJiaActivityGoodsManagerController {
@Autowired @Autowired

2
manager-api/src/main/java/cn/lili/controller/promotion/PromotionManagerController.java
View File

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

2
manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java
View File

@ -23,7 +23,7 @@ import java.util.List;
@Slf4j @Slf4j
@RestController @RestController
@Api(tags = "日志管理接口") @Api(tags = "日志管理接口")
@RequestMapping("/manager/log") @RequestMapping("/manager/setting/log")
public class LogManagerController { public class LogManagerController {
@Autowired @Autowired
private SystemLogService systemLogService; private SystemLogService systemLogService;

2
manager-api/src/main/java/cn/lili/controller/setting/NoticeMessageManagerController.java
View File

@ -35,7 +35,7 @@ import java.util.List;
@Slf4j @Slf4j
@RestController @RestController
@Api(tags = "管理端,会员站内信管理接口") @Api(tags = "管理端,会员站内信管理接口")
@RequestMapping("/manager/noticeMessage") @RequestMapping("/manager/setting/noticeMessage")
public class NoticeMessageManagerController { public class NoticeMessageManagerController {
@Autowired @Autowired
private NoticeMessageService noticeMessageService; private NoticeMessageService noticeMessageService;

3
manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java
View File

@ -9,7 +9,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.validation.Valid; import javax.validation.Valid;
@ -24,7 +23,7 @@ import java.util.List;
*/ */
@RestController @RestController
@Api(tags = "管理端,行政地区管理接口") @Api(tags = "管理端,行政地区管理接口")
@RequestMapping("/manager/region") @RequestMapping("/manager/setting/region")
public class RegionManagerController { public class RegionManagerController {
@Autowired @Autowired
private RegionService regionService; private RegionService regionService;

2
manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java
View File

@ -32,7 +32,7 @@ import java.util.Collections;
*/ */
@RestController @RestController
@Api(tags = "管理端,系统设置接口") @Api(tags = "管理端,系统设置接口")
@RequestMapping("/manager/system/setting") @RequestMapping("/manager/setting/setting")
public class SettingManagerController { public class SettingManagerController {
@Autowired @Autowired
private SettingService settingService; private SettingService settingService;

2
manager-api/src/main/java/cn/lili/controller/setting/SettingXManagerController.java
View File

@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
*/ */
@RestController @RestController
@Api(tags = "管理端,系统设置扩展接口") @Api(tags = "管理端,系统设置扩展接口")
@RequestMapping("/manager/system/settingx") @RequestMapping("/manager/setting/settingx")
public class SettingXManagerController { public class SettingXManagerController {
@ApiOperation(value = "支持支付方式表单") @ApiOperation(value = "支持支付方式表单")

2
manager-api/src/main/java/cn/lili/controller/sms/SmsManagerController.java
View File

@ -23,7 +23,7 @@ import java.util.List;
*/ */
@RestController @RestController
@Api(tags = "管理端,短信接口") @Api(tags = "管理端,短信接口")
@RequestMapping("/manager/sms") @RequestMapping("/manager/sms/sms")
public class SmsManagerController { public class SmsManagerController {
@Autowired @Autowired
private SmsReachService smsReachService; private SmsReachService smsReachService;

2
manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java
View File

@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
*/ */
@Api(tags = "管理端,退款统计接口") @Api(tags = "管理端,退款统计接口")
@RestController @RestController
@RequestMapping("/manager/statistics/refund/order") @RequestMapping("/manager/statistics/refundOrder")
public class RefundOrderStatisticsManagerController { public class RefundOrderStatisticsManagerController {
@Autowired @Autowired
private RefundOrderStatisticsService refundOrderStatisticsService; private RefundOrderStatisticsService refundOrderStatisticsService;

2
manager-api/src/main/java/cn/lili/controller/store/BillManagerController.java
View File

@ -27,7 +27,7 @@ import javax.validation.constraints.NotNull;
*/ */
@RestController @RestController
@Api(tags = "管理端,商家结算单接口") @Api(tags = "管理端,商家结算单接口")
@RequestMapping("/manager/store/bill") @RequestMapping("/manager/order/bill")
public class BillManagerController { public class BillManagerController {
@Autowired @Autowired
private BillService billService; private BillService billService;

2
manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java
View File

@ -33,7 +33,7 @@ import java.util.List;
*/ */
@Api(tags = "管理端,店铺管理接口") @Api(tags = "管理端,店铺管理接口")
@RestController @RestController
@RequestMapping("/manager/store") @RequestMapping("/manager/store/store")
public class StoreManagerController { public class StoreManagerController {
/** /**

3
manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java
View File

@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; 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.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -24,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
*/ */
@RestController @RestController
@Api(tags = "管理端,店铺消息消息管理接口") @Api(tags = "管理端,店铺消息消息管理接口")
@RequestMapping("/manager/message/store") @RequestMapping("/manager/other/storeMessage")
public class StoreMessageManagerController { public class StoreMessageManagerController {
@Autowired @Autowired

2
manager-api/src/main/java/cn/lili/controller/wallet/MemberWalletManagerController.java
View File

@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
*/ */
@RestController @RestController
@Api(tags = "管理端,预存款接口") @Api(tags = "管理端,预存款接口")
@RequestMapping("/manager/members/wallet") @RequestMapping("/manager/wallet/wallet")
public class MemberWalletManagerController { public class MemberWalletManagerController {
@Autowired @Autowired
private MemberWalletService memberWalletService; private MemberWalletService memberWalletService;

3
manager-api/src/main/java/cn/lili/controller/wallet/MemberWithdrawApplyManagerController.java
View File

@ -14,7 +14,6 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; 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.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@ -29,7 +28,7 @@ import org.springframework.web.bind.annotation.RestController;
*/ */
@RestController @RestController
@Api(tags = "管理端,余额提现记录接口") @Api(tags = "管理端,余额提现记录接口")
@RequestMapping("/manager/members/withdraw-apply") @RequestMapping("/manager/wallet/withdrawApply")
public class MemberWithdrawApplyManagerController { public class MemberWithdrawApplyManagerController {
@Autowired @Autowired
private MemberWithdrawApplyService memberWithdrawApplyService; private MemberWithdrawApplyService memberWithdrawApplyService;

3
manager-api/src/main/java/cn/lili/controller/wallet/RechargeManagerController.java
View File

@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; 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.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -24,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
*/ */
@RestController @RestController
@Api(tags = "管理端,预存款充值记录接口") @Api(tags = "管理端,预存款充值记录接口")
@RequestMapping("/manager/recharge") @RequestMapping("/manager/wallet/recharge")
public class RechargeManagerController { public class RechargeManagerController {
@Autowired @Autowired
private RechargeService rechargeService; private RechargeService rechargeService;

1
manager-api/src/main/java/cn/lili/controller/wallet/WalletLogManagerController.java
View File

@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; 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.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;

3
manager-api/src/main/java/cn/lili/controller/wechat/WechatMPMessageManagerController.java
View File

@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
@ -22,7 +21,7 @@ import java.util.List;
*/ */
@RestController @RestController
@Api(tags = "微信小程序消息订阅接口") @Api(tags = "微信小程序消息订阅接口")
@RequestMapping("/manager/message/wechatMPMessage") @RequestMapping("/manager/wechat/wechatMPMessage")
public class WechatMPMessageManagerController { public class WechatMPMessageManagerController {
@Autowired @Autowired
private WechatMPMessageService wechatMPMessageService; private WechatMPMessageService wechatMPMessageService;

2
manager-api/src/main/java/cn/lili/controller/wechat/WechatMessageManageController.java
View File

@ -23,7 +23,7 @@ import java.util.List;
*/ */
@RestController @RestController
@Api(tags = "管理端,微信消息接口") @Api(tags = "管理端,微信消息接口")
@RequestMapping("/manager/message/wechat") @RequestMapping("/manager/wechat/wechatMessage")
public class WechatMessageManageController { public class WechatMessageManageController {
@Autowired @Autowired
private WechatMessageService wechatMessageService; private WechatMessageService wechatMessageService;

7
manager-api/src/main/resources/application.yml
View File

@ -1,6 +1,5 @@
server: server:
# port: 8887 port: 8887
port: 30003
servlet: servlet:
context-path: / context-path: /
@ -29,7 +28,7 @@ spring:
boot: boot:
admin: admin:
client: client:
url: http://127.0.0.1:30000 url: http://127.0.0.1:8000
cache: cache:
type: redis type: redis
# Redis # Redis
@ -182,7 +181,7 @@ jasypt:
lili: lili:
system: system:
isDemoSite: true isDemoSite: false
# 脱敏级别： # 脱敏级别：
# 0：不做脱敏处理 # 0：不做脱敏处理
# 1：管理端用户手机号等信息脱敏 # 1：管理端用户手机号等信息脱敏

2
seller-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsStoreController.java
View File

@ -29,7 +29,7 @@ import java.util.Objects;
*/ */
@RestController @RestController
@Api(tags = "店铺端,分销商品接口") @Api(tags = "店铺端,分销商品接口")
@RequestMapping("/store/distributionGoods") @RequestMapping("/store/distribution/goods")
public class DistributionGoodsStoreController { public class DistributionGoodsStoreController {
/** /**

2
seller-api/src/main/java/cn/lili/controller/distribution/DistributionOrderStoreController.java
View File

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

3
seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java
View File

@ -6,7 +6,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; 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.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@ -22,7 +21,7 @@ import java.util.List;
*/ */
@RestController @RestController
@Api(tags = "店铺端,分类绑定参数组管理接口") @Api(tags = "店铺端,分类绑定参数组管理接口")
@RequestMapping("/store/goods/category/parameters") @RequestMapping("/store/goods/categoryParameters")
public class CategoryParameterGroupStoreController { public class CategoryParameterGroupStoreController {

3
seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java
View File

@ -6,7 +6,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; 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.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@ -22,7 +21,7 @@ import java.util.List;
*/ */
@RestController @RestController
@Api(tags = "店铺端,商品分类规格接口") @Api(tags = "店铺端,商品分类规格接口")
@RequestMapping("/store/goods/category/spec") @RequestMapping("/store/goods/categorySpec")
public class CategorySpecificationStoreController { public class CategorySpecificationStoreController {
@Autowired @Autowired
private CategorySpecificationService categorySpecificationService; private CategorySpecificationService categorySpecificationService;

1
seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java
View File

@ -14,7 +14,6 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheConfig; 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.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;

2
seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java
View File

@ -27,7 +27,7 @@ import java.util.Objects;
*/ */
@RestController @RestController
@Api(tags = "店铺端,草稿商品接口") @Api(tags = "店铺端,草稿商品接口")
@RequestMapping("/store/draft/goods") @RequestMapping("/store/goods/draftGoods")
public class DraftGoodsStoreController { public class DraftGoodsStoreController {
@Autowired @Autowired
private DraftGoodsService draftGoodsService; private DraftGoodsService draftGoodsService;

2
seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java
View File

@ -39,7 +39,7 @@ import java.util.stream.Collectors;
*/ */
@RestController @RestController
@Api(tags = "店铺端,商品接口") @Api(tags = "店铺端,商品接口")
@RequestMapping("/store/goods") @RequestMapping("/store/goods/goods")
public class GoodsStoreController { public class GoodsStoreController {
/** /**

5
seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java
View File

@ -1,17 +1,16 @@
package cn.lili.controller.goods; package cn.lili.controller.goods;
import cn.lili.mybatis.util.PageUtil;
import cn.lili.common.enums.ResultUtil; import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO; import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.goods.entity.dos.GoodsUnit; import cn.lili.modules.goods.entity.dos.GoodsUnit;
import cn.lili.modules.goods.service.GoodsUnitService; import cn.lili.modules.goods.service.GoodsUnitService;
import cn.lili.mybatis.util.PageUtil;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; 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.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -24,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
*/ */
@RestController @RestController
@Api(tags = "店铺端,商品计量单位接口") @Api(tags = "店铺端,商品计量单位接口")
@RequestMapping("/store/goods/unit") @RequestMapping("/store/goods/goodsUnit")
public class GoodsUnitStoreController { public class GoodsUnitStoreController {
@Autowired @Autowired
private GoodsUnitService goodsUnitService; private GoodsUnitService goodsUnitService;

2
seller-api/src/main/java/cn/lili/controller/member/BillStoreController.java
View File

@ -31,7 +31,7 @@ import java.util.Objects;
*/ */
@RestController @RestController
@Api(tags = "店铺端,结算单接口") @Api(tags = "店铺端,结算单接口")
@RequestMapping("/store/bill") @RequestMapping("/store/order/bill")
public class BillStoreController { public class BillStoreController {
@Autowired @Autowired

2
seller-api/src/main/java/cn/lili/controller/member/MemberEvaluationStoreController.java
View File

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

2
seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java
View File

@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
*/ */
@RestController @RestController
@Api(tags = "店铺端,管理员接口") @Api(tags = "店铺端,管理员接口")
@RequestMapping("/store/user") @RequestMapping("/store/member/user")
public class StoreUserController { public class StoreUserController {
@Autowired @Autowired
private MemberService memberService; private MemberService memberService;

2
seller-api/src/main/java/cn/lili/controller/message/StoreMessageController.java
View File

@ -29,7 +29,7 @@ import java.util.Objects;
*/ */
@RestController @RestController
@Api(tags = "店铺端,消息接口") @Api(tags = "店铺端,消息接口")
@RequestMapping("/store/message") @RequestMapping("/store/message/storeMessage")
public class StoreMessageController { public class StoreMessageController {
/** /**

2
seller-api/src/main/java/cn/lili/controller/order/AfterSaleStoreController.java
View File

@ -31,7 +31,7 @@ import java.util.Objects;
*/ */
@RestController @RestController
@Api(tags = "店铺端,售后管理接口") @Api(tags = "店铺端,售后管理接口")
@RequestMapping("/store/afterSale") @RequestMapping("/store/order/afterSale")
public class AfterSaleStoreController { public class AfterSaleStoreController {
@Autowired @Autowired

2
seller-api/src/main/java/cn/lili/controller/order/OrderComplaintStoreController.java
View File

@ -30,7 +30,7 @@ import java.util.Objects;
**/ **/
@RestController @RestController
@Api(tags = "店铺端,交易投诉接口") @Api(tags = "店铺端,交易投诉接口")
@RequestMapping("/store/complain") @RequestMapping("/store/order/complain")
public class OrderComplaintStoreController { public class OrderComplaintStoreController {
/** /**

2
seller-api/src/main/java/cn/lili/controller/order/OrderLogStoreController.java
View File

@ -25,7 +25,7 @@ import java.util.List;
**/ **/
@RestController @RestController
@Api(tags = "店铺端,订单日志接口") @Api(tags = "店铺端,订单日志接口")
@RequestMapping("/store/orderLog") @RequestMapping("/store/order/orderLog")
public class OrderLogStoreController { public class OrderLogStoreController {
@Autowired @Autowired

2
seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java
View File

@ -41,7 +41,7 @@ import java.util.Objects;
**/ **/
@Slf4j @Slf4j
@RestController @RestController
@RequestMapping("/store/orders") @RequestMapping("/store/order/order")
@Api(tags = "店铺端,订单接口") @Api(tags = "店铺端,订单接口")
public class OrderStoreController { public class OrderStoreController {

2
seller-api/src/main/java/cn/lili/controller/order/ReceiptStoreController.java
View File

@ -27,7 +27,7 @@ import java.util.Objects;
**/ **/
@RestController @RestController
@Api(tags = "店铺端,发票接口") @Api(tags = "店铺端,发票接口")
@RequestMapping("/store/receipt") @RequestMapping("/store/trade/receipt")
public class ReceiptStoreController { public class ReceiptStoreController {
@Autowired @Autowired

2
seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java
View File

@ -28,7 +28,7 @@ import javax.validation.constraints.NotNull;
@RestController @RestController
@Api(tags = "店铺端,商家登录接口 ") @Api(tags = "店铺端,商家登录接口 ")
@RequestMapping("/store/login") @RequestMapping("/store/passport/login")
public class StorePassportController { public class StorePassportController {
/** /**

2
seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java
View File

@ -24,7 +24,7 @@ import java.util.Objects;
**/ **/
@RestController @RestController
@Api(tags = "店铺端,运费模板接口") @Api(tags = "店铺端,运费模板接口")
@RequestMapping("/store/freightTemplate") @RequestMapping("/store/setting/freightTemplate")
public class FreightTemplateStoreController { public class FreightTemplateStoreController {
@Autowired @Autowired
private FreightTemplateService freightTemplateService; private FreightTemplateService freightTemplateService;

2
seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java
View File

@ -25,7 +25,7 @@ import java.util.Objects;
*/ */
@RestController @RestController
@Api(tags = "店铺端,日志管理接口") @Api(tags = "店铺端,日志管理接口")
@RequestMapping("/store/log") @RequestMapping("/store/settings/log")
public class LogStoreController { public class LogStoreController {
@Autowired @Autowired
private SystemLogService systemLogService; private SystemLogService systemLogService;

2
seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java
View File

@ -26,7 +26,7 @@ import java.util.Objects;
*/ */
@RestController @RestController
@Api(tags = "店铺端,商家地址（自提点）接口") @Api(tags = "店铺端,商家地址（自提点）接口")
@RequestMapping("/store/storeAddress") @RequestMapping("/store/member/storeAddress")
public class StoreAddressController { public class StoreAddressController {
/** /**

2
seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java
View File

@ -31,7 +31,7 @@ import java.util.Objects;
*/ */
@RestController @RestController
@Api(tags = "店铺端,页面接口") @Api(tags = "店铺端,页面接口")
@RequestMapping("/store/pageData") @RequestMapping("/store/settings/pageData")
public class StorePageDataController { public class StorePageDataController {
@Autowired @Autowired
private PageDataService pageDataService; private PageDataService pageDataService;

2
seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java
View File

@ -27,7 +27,7 @@ import javax.validation.Valid;
*/ */
@RestController @RestController
@Api(tags = "店铺端,店铺设置接口") @Api(tags = "店铺端,店铺设置接口")
@RequestMapping("/store/settings") @RequestMapping("/store/settings/storeSettings")
public class StoreSettingsController { public class StoreSettingsController {
/** /**

2
seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java
View File

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

7
seller-api/src/main/resources/application.yml
View File

@ -1,6 +1,5 @@
server: server:
# port: 8889 port: 8889
port: 30004
servlet: servlet:
context-path: / context-path: /
@ -29,7 +28,7 @@ spring:
boot: boot:
admin: admin:
client: client:
url: http://127.0.0.1:30000 url: http://127.0.0.1:8000
cache: cache:
type: redis type: redis
# Redis # Redis
@ -179,7 +178,7 @@ jasypt:
lili: lili:
system: system:
isDemoSite: true isDemoSite: false
statistics: statistics:
# 在线人数统计 X 小时。这里设置48，即统计过去48小时每小时在线人数 # 在线人数统计 X 小时。这里设置48，即统计过去48小时每小时在线人数
onlineMember: 48 onlineMember: 48