diff --git a/muyu-common/muyu-common-system/pom.xml b/muyu-common/muyu-common-system/pom.xml index 62fdc74..3dd7aa3 100644 --- a/muyu-common/muyu-common-system/pom.xml +++ b/muyu-common/muyu-common-system/pom.xml @@ -23,5 +23,9 @@ com.muyu muyu-common-core + + com.muyu + muyu-common-security + diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java index 3359d86..84d56bd 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java @@ -234,7 +234,7 @@ public class SysRole extends BaseEntity { .append("deptCheckStrictly", isDeptCheckStrictly()) .append("status", getStatus()) .append("delFlag", getDelFlag()) - .append("createBy", SecurityUtils.getUsername()) +// .append("createBy", SecurityUtils.getUsername()) .append("createTime", getCreateTime()) .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java index 892d1d5..1e012ff 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java @@ -317,7 +317,7 @@ public class SysUser extends BaseEntity { .append("delFlag", getDelFlag()) .append("loginIp", getLoginIp()) .append("loginDate", getLoginDate()) - .append("createBy", SecurityUtils.getUsername()) +// .append("createBy", SecurityUtils.getUsername()) .append("createTime", getCreateTime()) .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/结构 b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/结构 index 5e4fbdb..a8a1828 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/结构 +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/结构 @@ -109,7 +109,36 @@ updateTime: "2024-03-10 16:06:52" - +{ + "product": { + "id":null, + "name":null, + "states":null, + "brandId":null, + "remark":null, + "image":null, + "imgs":null, + }, + "attributeGroupList":[ + { + "id":null + } + ], + "attributeList":[ + { + "attributeId":null, + "attributeValue":bull + } + ], + "rule":[ + { + "sku":null, ("1,2,3") + "image":null, + "inventoryValue":null, + "priceValue":null + } + ] +} diff --git a/pom.xml b/pom.xml index aea0b18..1289e58 100644 --- a/pom.xml +++ b/pom.xml @@ -218,6 +218,10 @@ ${muyu.version} + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel +