调整文件目录

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/Banner/domain/BannerVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.business.Banner.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * banner对象 t_banner
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class BannerVo extends Banner {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/Carts/domain/CartsVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.business.Carts.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 购物车对象 t_carts
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class CartsVo extends Carts {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/CopyrightApproval/domain/CopyrightApprovalVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.business.CopyrightApproval.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 著作权申请对象 t_copyright_approval
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class CopyrightApprovalVo extends CopyrightApproval {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/ExpressInfo/domain/ExpressInfoVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.business.ExpressInfo.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 快递信息对象 t_express_info
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class ExpressInfoVo extends ExpressInfo {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/MerchantWxpay/domain/MerchantWxpayVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.business.MerchantWxpay.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 店铺微信支付信息对象 t_merchant_wxpay
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class MerchantWxpayVo extends MerchantWxpay {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/NewProd/domain/NewProdVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.business.NewProd.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 最新上架商品对象 t_new_prod
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class NewProdVo extends NewProd {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/News/domain/NewsPicVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.business.News.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 新闻图片对象 t_news_pic
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class NewsPicVo extends NewsPic {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/News/domain/NewsVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.business.News.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 新闻广告对象 t_news
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class NewsVo extends News {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/Order/domain/Order.java

@@ -1,162 +0,0 @@
-package com.xingxi.web.controller.business.Order.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.xingxi.common.annotation.Excel;
-import com.xingxi.common.core.domain.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 订单对象 t_order
- *
- * @author xingxi
- * @date 2025-02-10
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class Order extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    // 订单ID
-    private Long orderId;
-
-    // 订单号
-    @Excel(name = "订单号")
-    private String orderNo;
-
-    // 订单时间
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "订单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date orderTime;
-
-    // 订单状态
-    @Excel(name = "订单状态", dictType = "orderStatus")
-    private String orderStatus;
-
-    // 订单类别
-    @Excel(name = "订单类别", dictType = "orderType")
-    private String orderType;
-
-    // 优定团编号
-    @Excel(name = "优定团编号")
-    private Long groupId;
-
-    // 楼号
-    @Excel(name = "楼号")
-    private String buildingNo;
-
-    // 房号
-    @Excel(name = "房号")
-    private String roomNo;
-
-    // 跟团号
-    @Excel(name = "跟团号")
-    private Integer groupNo;
-
-    // 订单总额
-    @Excel(name = "订单总额")
-    private BigDecimal orderAmount;
-
-    // 支付金额
-    @Excel(name = "支付金额")
-    private BigDecimal payAmount;
-
-    // 商品数量
-    @Excel(name = "商品数量")
-    private Integer prodQuantity;
-
-    // 购方用户ID
-    @Excel(name = "购方用户ID")
-    private Long buyerId;
-
-    // 购方用户角色
-    @Excel(name = "购方用户角色")
-    private String buyerRole;
-
-    // 销方用户ID
-    @Excel(name = "销方用户ID")
-    private Long sellerId;
-
-    // 销方用户角色
-    @Excel(name = "销方用户角色")
-    private String sellerRole;
-
-    // 收款方ID
-    @Excel(name = "收款方ID")
-    private Long payeeId;
-
-    // 收款方角色
-    @Excel(name = "收款方角色")
-    private String payeeRole;
-
-    // 推荐人用户ID
-    @Excel(name = "推荐人用户ID")
-    private Long referrerId;
-
-    // 推荐人用户角色
-    @Excel(name = "推荐人用户角色")
-    private String referrerRole;
-
-    // 推荐人分佣比率
-    @Excel(name = "推荐人分佣比率")
-    private BigDecimal referrerRate;
-
-    // 平台服务费率
-    @Excel(name = "平台服务费率")
-    private BigDecimal serviceRate;
-
-    // 取消时间
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "取消时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date cancelTime;
-
-    // 完成时间
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    // 收件人省
-    @Excel(name = "收件人省")
-    private Long recProvId;
-
-    // 收件人省名称
-    @Excel(name = "收件人省名称")
-    private String recProvName;
-
-    // 收件人市
-    @Excel(name = "收件人市")
-    private Long recCityId;
-
-    // 收件人市名称
-    @Excel(name = "收件人市名称")
-    private String recCityName;
-
-    // 收件人区
-    @Excel(name = "收件人区")
-    private Long recAreaId;
-
-    // 收件人区名称
-    @Excel(name = "收件人区名称")
-    private String recAreaName;
-
-    // 收件人地址
-    @Excel(name = "收件人地址")
-    private String recAddress;
-
-    // 收件人姓名
-    @Excel(name = "收件人姓名")
-    private String recName;
-
-    // 收件人联系方式
-    @Excel(name = "收件人联系方式")
-    private String recPhone;
-
-    // 删除标志（0代表存在 2代表删除）
-    @Excel(name = "删除标志", readConverterExp = "0=代表存在,2=代表删除")
-    private String delFlag;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/Order/domain/OrderDeliveryExprVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.business.Order.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 订单商品快递明细对象 t_order_delivery_expr
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class OrderDeliveryExprVo extends OrderDeliveryExpr {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/Order/domain/OrderDeliveryVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.business.Order.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 订单明细发货单对象 t_order_delivery
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class OrderDeliveryVo extends OrderDelivery {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/Order/domain/OrderDetail.java

@@ -1,133 +0,0 @@
-package com.xingxi.web.controller.business.Order.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.xingxi.common.annotation.Excel;
-import com.xingxi.common.core.domain.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 订单明细对象 t_order_detail
- *
- * @author xingxi
- * @date 2025-02-10
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class OrderDetail extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    // 订单明细ID
-    private Long orderDetailId;
-
-    // 订单ID
-    @Excel(name = "订单ID")
-    private Long orderId;
-
-    // 套组ID
-    @Excel(name = "套组ID")
-    private String suiteId;
-
-    // 商品ID
-    @Excel(name = "商品ID")
-    private Long prodId;
-
-    // 商品名
-    @Excel(name = "商品名")
-    private String prodName;
-
-    // 属性组合编号
-    @Excel(name = "属性组合编号")
-    private Long pprId;
-
-    // 属性组合名称
-    @Excel(name = "属性组合名称")
-    private String pprName;
-
-    // 用户设计编号
-    @Excel(name = "用户设计编号")
-    private String upId;
-
-    // 元商品ID
-    @Excel(name = "元商品ID")
-    private Long orgProdId;
-
-    // 商品区分
-    @Excel(name = "商品区分")
-    private String prodType;
-
-    // 素材ID
-    @Excel(name = "素材ID")
-    private Long mateId;
-
-    // 素材名称
-    @Excel(name = "素材名称")
-    private String mateName;
-
-    // 素材区分
-    @Excel(name = "素材区分")
-    private String mateType;
-
-    // 平台经销标志 0：供应商直销，1：平台经销
-    @Excel(name = "平台经销标志")
-    private String pfSellFlag;
-
-    // 平台服务费率（供应商）
-    @Excel(name = "平台服务费率（供应商）")
-    private BigDecimal vendorServiceRate;
-
-    // 供应商ID
-    @Excel(name = "供应商ID")
-    private Long vendorId;
-
-    // 设计面数量
-    @Excel(name = "设计面数量")
-    private Integer surfaceQty;
-
-    // 单位数量
-    @Excel(name = "单位数量")
-    private Integer unitQty;
-
-    // 购买数量
-    @Excel(name = "购买数量")
-    private Integer buyQty;
-
-    // 售后中数量
-    @Excel(name = "售后中数量")
-    private Integer afterQty;
-
-    // 已退货数量
-    @Excel(name = "已退货数量")
-    private Integer returnQty;
-
-    // 购买单价
-    @Excel(name = "购买单价")
-    private BigDecimal buyPrice;
-
-    // 销方结算价
-    @Excel(name = "销方结算价")
-    private BigDecimal salePrice;
-
-    // 确认收货时间
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "确认收货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date confirmTime;
-
-    // 完成时间
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
-
-    // 订单明细状态
-    @Excel(name = "订单明细状态")
-    private String orderDetailStatus;
-
-    // 删除标志（0代表存在 2代表删除）
-    @Excel(name = "删除标志", readConverterExp = "0=代表存在,2=代表删除")
-    private String delFlag;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/Order/domain/OrderDetailVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.business.Order.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 订单明细对象 t_order_detail
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class OrderDetailVo extends OrderDetail {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/Order/domain/OrderVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.business.Order.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 订单对象 t_order
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class OrderVo extends Order {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/PaymentInfo/domain/PaymentInfoVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.business.PaymentInfo.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 支付信息对象 t_payment_info
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class PaymentInfoVo extends PaymentInfo {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/PopularProd/domain/PopularProdVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.business.PopularProd.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 今日热门对象 t_popular_prod
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class PopularProdVo extends PopularProd {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/ProdInventory/domain/ProdInventoryBillVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.business.ProdInventory.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 商品库存流水对象 t_prod_inventory_bill
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class ProdInventoryBillVo extends ProdInventoryBill {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/ProdInventory/domain/ProdInventoryOrderDetailVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.business.ProdInventory.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 商品出入库明细单对象 t_prod_inventory_order_detail
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class ProdInventoryOrderDetailVo extends ProdInventoryOrderDetail {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/ProdInventory/domain/ProdInventoryOrderVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.business.ProdInventory.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 商品出入库单对象 t_prod_inventory_order
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class ProdInventoryOrderVo extends ProdInventoryOrder {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/ProdInventory/domain/ProdInventoryVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.business.ProdInventory.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 商品库存对象 t_prod_inventory
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class ProdInventoryVo extends ProdInventory {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/SuggestProd/domain/SuggestProdVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.business.SuggestProd.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 推荐商品对象 t_suggest_prod
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class SuggestProdVo extends SuggestProd {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/UserAddress/domain/UserAddressVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.business.UserAddress.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 用户地址对象 t_user_address
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class UserAddressVo extends UserAddress {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/UserFollow/domain/UserFollowVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.business.UserFollow.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 用户收藏对象 t_user_follow
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class UserFollowVo extends UserFollow {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/UserRefuseTag/domain/UserRefuseTagVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.business.UserRefuseTag.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 用户避雷标签对象 t_user_refuse_tag
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class UserRefuseTagVo extends UserRefuseTag {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/designer/controller/DesignerController.java

@@ -6,8 +6,8 @@ import com.xingxi.common.core.domain.AjaxResult;
 import com.xingxi.common.core.page.TableDataInfo;
 import com.xingxi.common.enums.BusinessType;
 import com.xingxi.common.utils.poi.ExcelUtil;
-import com.xingxi.web.controller.master.designer.domain.Designer;
-import com.xingxi.web.controller.master.designer.service.IDesignerService;
+import com.xingxi.master.designer.domain.Designer;
+import com.xingxi.master.designer.service.IDesignerService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/designer/domain/DesignerVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.master.designer.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 设计师对象 m_designer
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class DesignerVo extends Designer {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/ipInfo/controller/IpInfoController.java

@@ -6,8 +6,8 @@ import com.xingxi.common.core.domain.AjaxResult;
 import com.xingxi.common.core.page.TableDataInfo;
 import com.xingxi.common.enums.BusinessType;
 import com.xingxi.common.utils.poi.ExcelUtil;
-import com.xingxi.web.controller.master.ipInfo.domain.IpInfo;
-import com.xingxi.web.controller.master.ipInfo.service.IIpInfoService;
+import com.xingxi.master.ipInfo.domain.IpInfo;
+import com.xingxi.master.ipInfo.service.IIpInfoService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/ipInfo/domain/IpInfoVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.master.ipInfo.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 文创品牌对象 m_ipinfo
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class IpInfoVo extends IpInfo {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/merchant/controller/MerchantController.java

@@ -6,8 +6,8 @@ import com.xingxi.common.core.domain.AjaxResult;
 import com.xingxi.common.core.page.TableDataInfo;
 import com.xingxi.common.enums.BusinessType;
 import com.xingxi.common.utils.poi.ExcelUtil;
-import com.xingxi.web.controller.master.merchant.domain.Merchant;
-import com.xingxi.web.controller.master.merchant.service.IMerchantService;
+import com.xingxi.master.merchant.domain.Merchant;
+import com.xingxi.master.merchant.service.IMerchantService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/merchant/controller/MerchantProdController.java

@@ -6,8 +6,8 @@ import com.xingxi.common.core.domain.AjaxResult;
 import com.xingxi.common.core.page.TableDataInfo;
 import com.xingxi.common.enums.BusinessType;
 import com.xingxi.common.utils.poi.ExcelUtil;
-import com.xingxi.web.controller.master.merchant.domain.MerchantProd;
-import com.xingxi.web.controller.master.merchant.service.IMerchantProdService;
+import com.xingxi.master.merchant.domain.MerchantProd;
+import com.xingxi.master.merchant.service.IMerchantProdService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/merchant/domain/MerchantProdVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.master.merchant.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 店铺商品对象 m_merchant_prod
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class MerchantProdVo extends MerchantProd {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/merchant/domain/MerchantVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.master.merchant.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 商户对象 m_merchant
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class MerchantVo extends Merchant {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/product/domain/ProdAttrJointVo.java

@@ -1,19 +0,0 @@
-package com.xingxi.web.controller.master.product.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 商品属性组合对象 m_prod_attr_joint
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class ProdAttrJointVo extends ProdAttrJoint {
-    private static final long serialVersionUID = 1L;
-
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/product/domain/ProdAttrPriceVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.master.product.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 商品属性价格对象 m_prod_attr_price
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class ProdAttrPriceVo extends ProdAttrPrice {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/product/domain/ProdAttrVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.master.product.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 商品属性对象 m_prod_attr
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class ProdAttrVo extends ProdAttr {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/product/domain/ProdClassVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.master.product.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 商品分类对象 m_prod_class
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class ProdClassVo extends ProdClass {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/product/domain/ProdPicVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.master.product.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 商品图片对象 m_prod_pic
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class ProdPicVo extends ProdPic {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/product/domain/ProdTagVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.master.product.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 商品标签对象 m_prod_tag
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class ProdTagVo extends ProdTag {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/product/domain/ProdVendorVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.master.product.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 商品供应商对象 m_prod_vendor
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class ProdVendorVo extends ProdVendor {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/product/domain/ProdVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.master.product.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 商品对象 m_prod
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class ProdVo extends Prod {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/tag/controller/TagController.java

@@ -6,8 +6,8 @@ import com.xingxi.common.core.domain.AjaxResult;
 import com.xingxi.common.core.page.TableDataInfo;
 import com.xingxi.common.enums.BusinessType;
 import com.xingxi.common.utils.poi.ExcelUtil;
-import com.xingxi.web.controller.master.tag.domain.Tag;
-import com.xingxi.web.controller.master.tag.service.ITagService;
+import com.xingxi.master.tag.domain.Tag;
+import com.xingxi.master.tag.service.ITagService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/tag/domain/TagVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.master.tag.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 标签对象 m_tag
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class TagVo extends Tag {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/vendor/controller/VendorController.java

@@ -6,8 +6,8 @@ import com.xingxi.common.core.domain.AjaxResult;
 import com.xingxi.common.core.page.TableDataInfo;
 import com.xingxi.common.enums.BusinessType;
 import com.xingxi.common.utils.poi.ExcelUtil;
-import com.xingxi.web.controller.master.vendor.domain.Vendor;
-import com.xingxi.web.controller.master.vendor.service.IVendorService;
+import com.xingxi.master.vendor.domain.Vendor;
+import com.xingxi.master.vendor.service.IVendorService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/vendor/domain/VendorVo.java

@@ -1,18 +0,0 @@
-package com.xingxi.web.controller.master.vendor.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 供应商对象 m_vendor
- *
- * @author xingxi
- * @date 2025-03-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class VendorVo extends Vendor {
-    private static final long serialVersionUID = 1L;
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/common/AccessTokenDTO.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/common/AccessTokenDTO.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.common;
+package com.xingxi.api.common;
 
 
 import lombok.Value;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/common/ApiException.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/common/ApiException.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.common;
+package com.xingxi.api.common;
 
 public class ApiException extends RuntimeException {
 

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/common/BaseApiController.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/common/BaseApiController.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.common;
+package com.xingxi.api.common;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/common/BaseDTO.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/common/BaseDTO.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.common;
+package com.xingxi.api.common;
 
 public class BaseDTO extends PageDTO{
 //    @JsonIgnore

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/common/BizException.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/common/BizException.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.common;
+package com.xingxi.api.common;
 
 public class BizException extends ApiException{
     public BizException(String message, Object... args) {

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/common/DTO.java

@@ -0,0 +1,6 @@
+package com.xingxi.api.common;
+
+public interface DTO {
+
+
+}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/common/ImageUtils.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/common/ImageUtils.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.common;
+package com.xingxi.api.common;
 
 import com.jhlabs.image.*;
 import net.coobird.thumbnailator.Thumbnails;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/common/JWTUtils.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/common/JWTUtils.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.common;
+package com.xingxi.api.common;
 
 import com.xingxi.common.utils.DateUtils;
 import io.jsonwebtoken.*;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/common/LocaleMessageUtil.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/common/LocaleMessageUtil.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.common;
+package com.xingxi.api.common;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.MessageSource;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/common/NoHeaderDTO.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/common/NoHeaderDTO.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.common;
+package com.xingxi.api.common;
 
 public class NoHeaderDTO extends PageDTO {
 }

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/common/PageDTO.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/common/PageDTO.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.common;
+package com.xingxi.api.common;
 
 import lombok.Getter;
 import lombok.Setter;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/common/ResponseDTO.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/common/ResponseDTO.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.common;
+package com.xingxi.api.common;
 
 import lombok.Getter;
 import lombok.Setter;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/common/UserContext.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/common/UserContext.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.common;
+package com.xingxi.api.common;
 
 import com.xingxi.common.core.domain.entity.SysUser;
 import lombok.Value;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/AppConfiguration.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/configuration/AppConfiguration.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.configuration;
+package com.xingxi.api.configuration;
 
 import lombok.RequiredArgsConstructor;
 import org.mybatis.spring.annotation.MapperScan;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/CacheConfiguration.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/configuration/CacheConfiguration.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.configuration;
+package com.xingxi.api.configuration;
 
 
 import com.google.common.cache.Cache;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/ConsoleLogAspect.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/configuration/ConsoleLogAspect.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.configuration;
+package com.xingxi.api.configuration;
 
 import com.xingxi.common.utils.ServletUtils;
 import com.alibaba.fastjson.JSONObject;
@@ -34,7 +34,7 @@ public class ConsoleLogAspect {
     private static final String LINE_SEPARATOR = System.lineSeparator();
 
     // 配置织入点
-    @Pointcut("execution(* com.xingxi.store.controller.*Controller.*(..))")
+    @Pointcut("execution(* com.xingxi.api.controller.*Controller.*(..))")
     public void logPointCut() {
     }
 

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/ContentCachingRequestWrapper.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/configuration/ContentCachingRequestWrapper.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.configuration;
+package com.xingxi.api.configuration;
 
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StreamUtils;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/DefaultHandlerExceptionResolver.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/configuration/DefaultHandlerExceptionResolver.java

@@ -1,9 +1,9 @@
-package com.xingxi.store.configuration;
+package com.xingxi.api.configuration;
 
 
 import com.xingxi.common.exception.BusinessException;
-import com.xingxi.store.common.ApiException;
-import com.xingxi.store.common.ResponseDTO;
+import com.xingxi.api.common.ApiException;
+import com.xingxi.api.common.ResponseDTO;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.tomcat.util.http.fileupload.FileUploadException;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/MyErrorRestController.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/configuration/MyErrorRestController.java

@@ -1,6 +1,6 @@
-package com.xingxi.store.configuration;
+package com.xingxi.api.configuration;
 
-import com.xingxi.store.common.ResponseDTO;
+import com.xingxi.api.common.ResponseDTO;
 import org.springframework.boot.autoconfigure.web.ErrorProperties;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.autoconfigure.web.servlet.error.AbstractErrorController;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/OperLogAspect.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/configuration/OperLogAspect.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.configuration;
+package com.xingxi.api.configuration;
 
 import com.xingxi.common.annotation.Log;
 import lombok.RequiredArgsConstructor;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/OperLogService.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/configuration/OperLogService.java

@@ -1,8 +1,8 @@
-package com.xingxi.store.configuration;
+package com.xingxi.api.configuration;
 
 import com.xingxi.common.annotation.Log;
-import com.xingxi.store.common.DTO;
-import com.xingxi.store.common.ResponseDTO;
+import com.xingxi.api.common.DTO;
+import com.xingxi.api.common.ResponseDTO;
 import com.xingxi.system.domain.SysOperLog;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/RequestResultWrapperResponseAdvice.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/configuration/RequestResultWrapperResponseAdvice.java

@@ -1,6 +1,6 @@
-package com.xingxi.store.configuration;
+package com.xingxi.api.configuration;
 
-import com.xingxi.store.common.ResponseDTO;
+import com.xingxi.api.common.ResponseDTO;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/StoreApiRequestBodyAdvice.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/configuration/StoreApiRequestBodyAdvice.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.configuration;
+package com.xingxi.api.configuration;
 
 import com.xingxi.common.constant.Constants;
 import lombok.RequiredArgsConstructor;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/security/JwtAuthenticationConverter.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/configuration/security/JwtAuthenticationConverter.java

@@ -1,7 +1,7 @@
-package com.xingxi.store.configuration.security;
+package com.xingxi.api.configuration.security;
 
 import com.xingxi.common.core.domain.entity.SysUser;
-import com.xingxi.store.common.JWTUtils;
+import com.xingxi.api.common.JWTUtils;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jws;
 import org.springframework.http.HttpHeaders;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/security/JwtAuthenticationFilter.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/configuration/security/JwtAuthenticationFilter.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.configuration.security;
+package com.xingxi.api.configuration.security;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/security/JwtAuthenticationManager.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/configuration/security/JwtAuthenticationManager.java

@@ -1,9 +1,8 @@
-package com.xingxi.store.configuration.security;
+package com.xingxi.api.configuration.security;
 
 import com.xingxi.common.core.domain.entity.SysUser;
 import com.xingxi.common.utils.DateUtils;
-import com.xingxi.store.common.UserContext;
-import com.xingxi.system.mapper.SysDeptMapper;
+import com.xingxi.api.common.UserContext;
 import com.xingxi.system.mapper.SysUserMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/security/SpringWebSecurityConfiguration.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/configuration/security/SpringWebSecurityConfiguration.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.configuration.security;
+package com.xingxi.api.configuration.security;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/security/WxAccessDeniedHandler.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/configuration/security/WxAccessDeniedHandler.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.configuration.security;
+package com.xingxi.api.configuration.security;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/security/WxAuthenticationEntryPoint.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/configuration/security/WxAuthenticationEntryPoint.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.configuration.security;
+package com.xingxi.api.configuration.security;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/security/WxAuthenticationFailureHandler.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/configuration/security/WxAuthenticationFailureHandler.java

@@ -1,7 +1,7 @@
-package com.xingxi.store.configuration.security;
+package com.xingxi.api.configuration.security;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.xingxi.store.common.ResponseDTO;
+import com.xingxi.api.common.ResponseDTO;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.AuthenticationException;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/security/WxAuthenticationSuccessHandler.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/configuration/security/WxAuthenticationSuccessHandler.java

@@ -1,11 +1,11 @@
-package com.xingxi.store.configuration.security;
+package com.xingxi.api.configuration.security;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.xingxi.common.core.domain.entity.SysUser;
-import com.xingxi.store.common.ResponseDTO;
-import com.xingxi.store.common.AccessTokenDTO;
-import com.xingxi.store.common.JWTUtils;
-import com.xingxi.store.data.domain.UserProfileDTO;
+import com.xingxi.api.common.ResponseDTO;
+import com.xingxi.api.common.AccessTokenDTO;
+import com.xingxi.api.common.JWTUtils;
+import com.xingxi.api.data.domain.UserProfileDTO;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.Authentication;
@@ -17,7 +17,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 @Slf4j

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/security/WxLoginAuthenticationManager.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/configuration/security/WxLoginAuthenticationManager.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.configuration.security;
+package com.xingxi.api.configuration.security;
 
 import com.xingxi.common.core.domain.entity.SysUser;
 import com.xingxi.common.enums.EUserType;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/security/WxLoginAuthenticationProcessingFilter.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/configuration/security/WxLoginAuthenticationProcessingFilter.java

@@ -1,9 +1,9 @@
-package com.xingxi.store.configuration.security;
+package com.xingxi.api.configuration.security;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import com.xingxi.common.core.domain.entity.SysUser;
-import com.xingxi.store.common.ApiException;
+import com.xingxi.api.common.ApiException;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken;
 import me.chanjar.weixin.common.error.WxErrorException;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/controller/UserProfileApiController.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/controller/UserProfileApiController.java

@@ -1,8 +1,8 @@
-package com.xingxi.store.controller;
+package com.xingxi.api.controller;
 
-import com.xingxi.store.common.BaseApiController;
-import com.xingxi.store.model.*;
-import com.xingxi.store.service.UserProfileServiceI;
+import com.xingxi.api.common.BaseApiController;
+import com.xingxi.api.model.*;
+import com.xingxi.api.service.UserProfileServiceI;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/UserAddressDTO.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/data/domain/UserAddressDTO.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.data.domain;
+package com.xingxi.api.data.domain;
 
 import lombok.Data;
 

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/UserProfileDTO.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/data/domain/UserProfileDTO.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.data.domain;
+package com.xingxi.api.data.domain;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/model/UserProfileBindPhoneNumRequest.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/UserProfileBindPhoneNumRequest.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.model;
+package com.xingxi.api.model;
 
 import lombok.Getter;
 import lombok.Setter;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/model/UserProfileBindPhoneNumResponse.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/UserProfileBindPhoneNumResponse.java

@@ -1,7 +1,7 @@
-package com.xingxi.store.model;
+package com.xingxi.api.model;
 
 
-import com.xingxi.store.data.domain.UserProfileDTO;
+import com.xingxi.api.data.domain.UserProfileDTO;
 import lombok.Value;
 
 @Value

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/model/UserProfileRequest.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/UserProfileRequest.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.model;
+package com.xingxi.api.model;
 
 public class UserProfileRequest {
 }

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/model/UserProfileResponse.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/UserProfileResponse.java

@@ -1,9 +1,8 @@
-package com.xingxi.store.model;
+package com.xingxi.api.model;
 
-import com.xingxi.store.data.domain.UserProfileDTO;
+import com.xingxi.api.data.domain.UserProfileDTO;
 import lombok.Value;
 
-
 @Value
 public class UserProfileResponse {
 

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/model/UserProfileUpdateRequest.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/UserProfileUpdateRequest.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.model;
+package com.xingxi.api.model;
 
 import lombok.Getter;
 import lombok.Setter;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/model/UserProfileUpdateResponse.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/UserProfileUpdateResponse.java

@@ -1,7 +1,7 @@
-package com.xingxi.store.model;
+package com.xingxi.api.model;
 
 
-import com.xingxi.store.data.domain.UserProfileDTO;
+import com.xingxi.api.data.domain.UserProfileDTO;
 import lombok.Value;
 
 @Value

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/service/UserProfileServiceI.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/service/UserProfileServiceI.java

@@ -1,7 +1,7 @@
-package com.xingxi.store.service;
+package com.xingxi.api.service;
 
-import com.xingxi.store.common.UserContext;
-import com.xingxi.store.model.*;
+import com.xingxi.api.common.UserContext;
+import com.xingxi.api.model.*;
 
 public interface UserProfileServiceI  {
     UserProfileUpdateResponse updateUserProfile(UserContext userContext, UserProfileUpdateRequest request);

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/service/impl/UserProfileServiceImpl.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/service/impl/UserProfileServiceImpl.java

@@ -1,4 +1,4 @@
-package com.xingxi.store.service.impl;
+package com.xingxi.api.service.impl;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.WxMaUserService;
@@ -7,13 +7,13 @@ import com.xingxi.common.aliyun.oss.AliyunOSSClient;
 import com.xingxi.common.core.domain.entity.SysUser;
 import com.xingxi.common.utils.spring.SpringUtils;
 import com.xingxi.common.utils.uuid.IdUtils;
-import com.xingxi.store.common.UserContext;
-import com.xingxi.store.data.domain.UserProfileDTO;
-import com.xingxi.store.model.UserProfileRequest;
-import com.xingxi.store.model.UserProfileResponse;
-import com.xingxi.store.model.UserProfileUpdateRequest;
-import com.xingxi.store.model.UserProfileUpdateResponse;
-import com.xingxi.store.service.UserProfileServiceI;
+import com.xingxi.api.common.UserContext;
+import com.xingxi.api.data.domain.UserProfileDTO;
+import com.xingxi.api.model.UserProfileRequest;
+import com.xingxi.api.model.UserProfileResponse;
+import com.xingxi.api.model.UserProfileUpdateRequest;
+import com.xingxi.api.model.UserProfileUpdateResponse;
+import com.xingxi.api.service.UserProfileServiceI;
 import com.xingxi.system.mapper.SysUserMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/common/DTO.java

@@ -1,6 +0,0 @@
-package com.xingxi.store.common;
-
-public interface DTO {
-
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/OrderDTO.java

@@ -1,15 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-@Getter
-@Setter
-@JsonIgnoreProperties("params")
-public class OrderDTO extends Order {
-    private String buyerName;
-    private List<OrderDetailDTO> orderDetailDTOS;
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/OrderDetailDTO.java

@@ -1,14 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import lombok.Getter;
-import lombok.Setter;
-
-@Setter
-@Getter
-@JsonIgnoreProperties("params")
-public class OrderDetailDTO extends OrderDetail {
-    private String afterSalesType;
-    private String reason;
-    private String materialImageUrl;
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/OrderItemDTO.java

@@ -1,19 +0,0 @@
-package com.xingxi.store.data.domain;
-
-
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-@Data
-public class OrderItemDTO {
-
-    private Long shoppingCartsId;
-    @NotNull
-    private String skuId;
-    @NotNull
-    private Long prodId;
-//    private String resourceId;
-    @NotNull
-    private Integer count;
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/OrderPaySignDTO.java

@@ -1,11 +0,0 @@
-package com.xingxi.store.data.domain;
-
-
-import lombok.Value;
-
-@Value
-public class OrderPaySignDTO {
-    String orderId;
-    String orderNo;
-    Object wxpaySign;
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/model/OrderCloseRequest.java

@@ -1,14 +0,0 @@
-package com.xingxi.store.model;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotNull;
-
-public class OrderCloseRequest  {
-
-    @Getter
-    @Setter
-    @NotNull
-    private Long orderId;
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/model/OrderCloseResponse.java

@@ -1,4 +0,0 @@
-package com.xingxi.store.model;
-
-public class OrderCloseResponse {
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/model/OrderCreateRequest.java

@@ -1,28 +0,0 @@
-package com.xingxi.store.model;
-
-import com.xingxi.store.data.domain.OrderItemDTO;
-import com.xingxi.store.data.domain.UserAddressDTO;
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-
-@Getter
-@Setter
-public class OrderCreateRequest {
-
-    @Deprecated
-    private String userAddressId;
-    private Long ydtGroupId;
-
-    // 订单类型
-    private String orderType;
-
-    @NotNull
-    private UserAddressDTO userAddressDTO;
-
-    private List<OrderItemDTO> orderItemDTOS;
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/model/OrderCreateResponse.java

@@ -1,12 +0,0 @@
-package com.xingxi.store.model;
-
-
-import com.xingxi.store.data.domain.Order;
-import com.xingxi.store.data.domain.OrderPaySignDTO;
-import lombok.Value;
-
-@Value
-public class OrderCreateResponse {
-    Order createdOrder;
-    OrderPaySignDTO orderPaySignDTO;
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/model/OrderDeleteRequest.java

@@ -1,15 +0,0 @@
-package com.xingxi.store.model;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotNull;
-
-public class OrderDeleteRequest  {
-
-
-    @NotNull
-    @Getter
-    @Setter
-    private Long orderId;
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/model/OrderDeleteResponse.java

@@ -1,8 +0,0 @@
-package com.xingxi.store.model;
-
-
-import lombok.Value;
-
-@Value
-public class OrderDeleteResponse {
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/model/OrderDetailFinishRequest.java

@@ -1,18 +0,0 @@
-package com.xingxi.store.model;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-
-@Data
-public class OrderDetailFinishRequest {
-
-    @NotNull
-    private Long orderId;
-    @NotNull
-    private Long orderDetailId;
-    @NotBlank
-    private String suiteId;
-}