From 9d9e457d7a9fa1f0591479311b287ea30b51b6e8 Mon Sep 17 00:00:00 2001
From: Saisai Liu <1374434128@qq.com>
Date: Thu, 21 Mar 2024 20:40:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 muyu-common/muyu-common-system/pom.xml        |  4 +++
 .../muyu/common/system/domain/SysRole.java    |  2 +-
 .../muyu/common/system/domain/SysUser.java    |  2 +-
 .../main/java/com/muyu/product/domain/结构    | 31 ++++++++++++++++++-
 pom.xml                                       |  4 +++
 5 files changed, 40 insertions(+), 3 deletions(-)

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 @@
             <groupId>com.muyu</groupId>
             <artifactId>muyu-common-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-security</artifactId>
+        </dependency>
     </dependencies>
 </project>
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 @@
                 <version>${muyu.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.alibaba.cloud</groupId>
+                <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+            </dependency>
 
 
         </dependencies>