适配优化的api地址

2022-02-12 15:05:42 +08:00 · 2022-02-12 15:05:42 +08:00 · 1f1b534b13
commit 1f1b534b13
parent 5c78711d8e
23 changed files with 37 additions and 53 deletions
--- a/buyer-api/src/main/java/cn/lili/controller/other/broadcast/StudioController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/other/broadcast/StudioController.java
@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
@RestController
@Api(tags = "买家端,直播间接口")
-@RequestMapping("/buyer/other/broadcast/studio")
+@RequestMapping("/buyer/broadcast/studio")
 public class StudioController {

    @Autowired
--- a/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java
@ -28,7 +28,7 @@ import javax.validation.constraints.NotNull;
 */
@RestController
@Api(tags = "买家端,会员接口")
-@RequestMapping("/buyer/passport/members")
+@RequestMapping("/buyer/passport/member")
 public class MemberBuyerController {

    @Autowired
--- a/buyer-api/src/main/resources/application.yml
+++ b/buyer-api/src/main/resources/application.yml
@ -128,21 +128,21 @@ ignored:
    - /MP_verify_qSyvBPhDsPdxvOhC.txt
    - /weixin/**
    - /source/**
-    - /buyer/mini-program/**
-    - /buyer/cashier/**
-    - /buyer/pageData/**
-    - /buyer/article/**
+    - /buyer/payment/cashier/**
+    - /buyer/other/pageData/**
+    - /buyer/other/article/**
    - /buyer/goods/**
-    - /buyer/category/**
    - /buyer/store/**
-    - /buyer/connect/**
+    - /buyer/passport/connect/**
    - /buyer/members/**
+    - /buyer/passport/member/**
    - /buyer/promotion/pintuan/**
    - /buyer/promotion/seckill/**
    - /buyer/promotion/pointsGoods/**
-    - /buyer/memberEvaluation/**/goodsEvaluation
-    - /buyer/memberEvaluation/**/evaluationNumber
-    - /buyer/appVersion/**
+    - /buyer/promotion/coupon
+    - /buyer/member/evaluation/**/goodsEvaluation
+    - /buyer/member/evaluation/**/evaluationNumber
+    - /buyer/other/appVersion/**
    - /buyer/broadcast/studio/**
    - /druid/**
    - /swagger-ui.html
@ -183,7 +183,7 @@ logging:
  config: classpath:logback-spring.xml
  # 输出级别
  level:
-    root: error
+    root: info
 #    org.springframework: debug
  file:
    # 指定路径
--- a/common-api/src/main/resources/application.yml
+++ b/common-api/src/main/resources/application.yml
@ -119,24 +119,8 @@ ignored:
    - /MP_verify_qSyvBPhDsPdxvOhC.txt
    - /weixin/**
    - /source/**
-    - /buyer/mini-program/**
-    - /buyer/cashier/**
-    - /buyer/pageData/**
-    - /buyer/article/**
-    - /buyer/goods/**
-    - /buyer/category/**
-    - /buyer/shop/**
-    - /buyer/connect/**
-    - /buyer/members/smsLogin
-    - /buyer/members/refresh/*
-    - /buyer/members/refresh**
-    - /buyer/promotion/pintuan
-    - /buyer/promotion/seckill
-    - /buyer/memberEvaluation/**/goodsEvaluation
-    - /buyer/memberEvaluation/**/evaluationNumber
-    - /store/login/**
-    - /manager/user/login
-    - /manager/user/refresh/**
+    - /common/common/slider/**
+    - /common/common/sms/**
    - /druid/**
    - /swagger-ui.html
    - /doc.html
@ -176,7 +160,7 @@ logging:
  config: classpath:logback-spring.xml
  # 输出级别
  level:
-    root: error
+    root: info
  #    org.hibernate: debug
  #    org.springframework: debug
  file:
--- a/consumer/src/main/resources/application.yml
+++ b/consumer/src/main/resources/application.yml
@ -179,7 +179,7 @@ logging:
  config: classpath:logback-spring.xml
  # 输出级别
  level:
-    root: error
+    root: info
  #    org.hibernate: debug
  #    org.springframework: debug
  file:
--- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
@ -113,6 +113,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
    private ApplicationEventPublisher applicationEventPublisher;

    @Override
+    @Transactional(rollbackFor = Exception.class)
    public void add(List<Map<String, Object>> skuList, Goods goods) {
        // 检查是否需要生成索引
        List<GoodsSku> newSkuList;
@ -319,6 +320,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
     * @param goods 商品信息(Id,MarketEnable/AuthFlag)
     */
    @Override
+    @Transactional(rollbackFor = Exception.class)
    public void updateGoodsSkuStatus(Goods goods) {
        LambdaUpdateWrapper<GoodsSku> updateWrapper = new LambdaUpdateWrapper<>();
        updateWrapper.eq(GoodsSku::getGoodsId, goods.getId());
--- a/manager-api/src/main/java/cn/lili/controller/hotwords/HotWordsManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/hotwords/HotWordsManagerController.java
@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
 */
@RestController
@Api(tags = "管理端,系统设置扩展接口")
-@RequestMapping("/manager/hotwords")
+@RequestMapping("/manager/hotwords/hotwords")
 public class HotWordsManagerController {

    @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
@ -23,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/other/broadcast/CommodityManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/broadcast/CommodityManagerController.java
@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
@RestController
@Api(tags = "店铺端,直播商品接口")
-@RequestMapping("/manager/other/broadcast/commodity")
+@RequestMapping("/manager/broadcast/commodity")
 public class CommodityManagerController {

    @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
@ -27,7 +27,7 @@ import javax.validation.constraints.NotNull;
 */
@RestController
@Api(tags = "管理端,直播间接口")
-@RequestMapping("/manager/other/broadcast/studio")
+@RequestMapping("/manager/broadcast/studio")
 public class StudioManagerController {

    @Autowired
--- 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.*;

@ -46,7 +45,6 @@ import java.util.List;
@RestController
@Api(tags = "管理员")
@RequestMapping("/manager/passport/user")
-@Transactional(rollbackFor = Exception.class)
@Validated
 public class AdminUserManagerController {
    @Autowired
--- 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/StoreMessageManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java
@ -23,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/resources/application.yml
+++ b/manager-api/src/main/resources/application.yml
@ -119,10 +119,10 @@ ignored:
    - /MP_verify_qSyvBPhDsPdxvOhC.txt
    - /weixin/**
    - /source/**
-    - /manager/user/login
-    - /manager/user/refresh/**
-    - /manager/elasticsearch
-    - /manager/custom-words
+    - /manager/passport/user/login
+    - /manager/passport/user/refresh/**
+    - /manager/other/elasticsearch
+    - /manager/other/customWords
    - /druid/**
    - /swagger-ui.html
    - /doc.html
--- a/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java
@ -21,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
@ -21,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/GoodsUnitStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java
@ -23,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/member/bill")
+@RequestMapping("/store/order/bill")
 public class BillStoreController {

    @Autowired
--- a/seller-api/src/main/java/cn/lili/controller/other/broadcast/CommodityStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/other/broadcast/CommodityStoreController.java
@ -26,7 +26,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "店铺端,直播商品接口")
-@RequestMapping("/store/other/broadcast/commodity")
+@RequestMapping("/store/broadcast/commodity")
 public class CommodityStoreController {

    @Autowired
--- a/seller-api/src/main/java/cn/lili/controller/other/broadcast/StudioStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/other/broadcast/StudioStoreController.java
@ -29,7 +29,7 @@ import java.util.Objects;
 */
@RestController
@Api(tags = "店铺端,直播间接口")
-@RequestMapping("/store/other/broadcast/studio")
+@RequestMapping("/store/broadcast/studio")
 public class StudioStoreController {

    @Autowired
--- 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/settings/freightTemplate")
+@RequestMapping("/store/setting/freightTemplate")
 public class FreightTemplateStoreController {
    @Autowired
    private FreightTemplateService freightTemplateService;
--- 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/settings/storeAddress")
+@RequestMapping("/store/member/storeAddress")
 public class StoreAddressController {

    /**
--- a/seller-api/src/main/resources/application.yml
+++ b/seller-api/src/main/resources/application.yml
@ -119,7 +119,7 @@ ignored:
    - /MP_verify_qSyvBPhDsPdxvOhC.txt
    - /weixin/**
    - /source/**
-    - /store/login/**
+    - /store/passport/login/**
    - /druid/**
    - /swagger-ui.html
    - /doc.html