From b160edca01f2d7d5bf4521cda59dc1d55b52dec7 Mon Sep 17 00:00:00 2001
From: yovinchen <gzh298255@gmail.com>
Date: Wed, 24 Jan 2024 17:03:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=B8=AD=E6=9D=83=E9=99=90=E5=88=86=E9=85=8D=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=99=BB=E5=BD=95=E6=97=A5=E5=BF=97=E8=A1=A8?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=20@Create=20=E6=A0=87=E8=AF=86=E4=B8=BA?=
 =?UTF-8?q?=20@since?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/jarRepositories.xml                     |  5 ++
 xlcs-admin/src/views/acl/role/roleAuth.vue    | 14 +--
 .../yovinchen/xlcs/common/utils/DateUtil.java |  2 +-
 .../xlcs/common/utils/JwtHelper.java          |  2 +-
 .../yovinchen/xlcs/mq/config/MQConfig.java    |  2 +-
 .../xlcs/mq/config/MQProducerAckConfig.java   |  2 +-
 .../yovinchen/xlcs/mq/constant/MqConst.java   |  2 +-
 .../xlcs/mq/service/RabbitService.java        |  2 +-
 .../xlcs/common/aspect/LogAspect.java         |  2 +-
 .../xlcs/common/auth/AuthContextHolder.java   |  2 +-
 .../auth/LoginMvcConfigurerAdapter.java       |  2 +-
 .../common/auth/UserLoginInterceptor.java     |  2 +-
 .../xlcs/common/config/MybatisPlusConfig.java |  2 +-
 .../xlcs/common/config/RedisConfig.java       |  2 +-
 .../xlcs/common/config/RedissonConfig.java    |  2 +-
 .../xlcs/common/config/Swagger2Config.java    |  2 +-
 .../xlcs/common/constant/RedisConst.java      |  2 +-
 .../exception/GlobalExceptionHandler.java     |  2 +-
 .../xlcs/common/exception/xlcsException.java  |  2 +-
 .../yovinchen/xlcs/common/result/Result.java  |  2 +-
 .../xlcs/common/result/ResultCodeEnum.java    |  2 +-
 .../test/java/com/yovinchen/xlcs/CodeGet.java | 14 +--
 .../com/yovinchen/xlcs/model/acl/Admin.java   |  6 +-
 .../xlcs/model/acl/AdminLoginLog.java         | 40 +++++++++
 .../yovinchen/xlcs/model/acl/AdminRole.java   |  6 +-
 .../yovinchen/xlcs/model/acl/Permission.java  |  6 +-
 .../com/yovinchen/xlcs/model/acl/Role.java    |  6 +-
 .../xlcs/model/acl/RolePermission.java        |  6 +-
 .../xlcs/model/activity/ActivityInfo.java     |  6 +-
 .../xlcs/model/activity/ActivityRule.java     |  6 +-
 .../xlcs/model/activity/ActivitySku.java      |  4 +-
 .../xlcs/model/activity/CouponRange.java      |  6 +-
 .../xlcs/model/activity/CouponUse.java        |  6 +-
 .../yovinchen/xlcs/vo/acl/AdminQueryVo.java   |  4 +-
 .../yovinchen/xlcs/vo/acl/RoleQueryVo.java    |  4 +-
 .../yovinchen/xlcs/vo/order/CartInfoVo.java   |  2 +-
 .../xlcs/vo/order/OrderConfirmVo.java         |  4 +-
 .../yovinchen/xlcs/vo/order/OrderMqVo.java    |  2 +-
 .../xlcs/vo/user/LeaderAddressVo.java         |  3 +-
 .../client/activity/ActivityFeignClient.java  |  2 +-
 .../xlcs/client/cart/CartFeignClient.java     |  2 +-
 .../xlcs/client/order/OrderFeignClient.java   |  2 +-
 .../client/product/ProductFeignClient.java    |  2 +-
 .../xlcs/client/search/SkuFeignClient.java    |  2 +-
 .../xlcs/client/user/UserFeignClient.java     |  2 +-
 .../xlcs/ServiceGatewayApplication.java       |  2 +-
 .../com/yovinchen/xlcs/config/CorsConfig.java |  2 +-
 .../yovinchen/xlcs/ServiceAclApplication.java |  2 +-
 .../xlcs/acl/controller/AdminController.java  |  6 +-
 .../xlcs/acl/controller/IndexController.java  |  2 +-
 .../acl/controller/PermissionController.java  | 31 ++++++-
 .../xlcs/acl/controller/RoleController.java   | 15 +---
 .../xlcs/acl/mapper/AdminMapper.java          |  4 +-
 .../xlcs/acl/mapper/AdminRoleMapper.java      |  4 +-
 .../xlcs/acl/mapper/PermissionMapper.java     |  4 +-
 .../yovinchen/xlcs/acl/mapper/RoleMapper.java |  4 +-
 .../xlcs/acl/mapper/RolePermissionMapper.java |  4 +-
 .../xlcs/acl/service/AdminRoleService.java    |  4 +-
 .../xlcs/acl/service/AdminService.java        |  6 +-
 .../xlcs/acl/service/PermissionService.java   |  8 +-
 .../xlcs/acl/service/RoleService.java         |  6 +-
 .../service/impl/AdminRoleServiceImpl.java    |  4 +-
 .../acl/service/impl/AdminServiceImpl.java    |  2 +-
 .../service/impl/PermissionServiceImpl.java   | 89 +++++++++++++++++--
 .../acl/service/impl/RoleServiceImpl.java     | 12 +--
 .../xlcs/acl/utils/PermissionHelper.java      |  2 +-
 .../xlcs/ServiceActivityApplication.java      |  2 +-
 .../activity/api/ActivityApiController.java   |  2 +-
 .../xlcs/ServiceCartApplication.java          |  2 +-
 .../cart/controller/CartApiController.java    |  2 +-
 .../xlcs/cart/receiver/CartReceiver.java      |  4 +-
 .../xlcs/cart/service/CartInfoService.java    |  2 +-
 .../service/impl/CartInfoServiceImpl.java     |  2 +-
 .../xlcs/ServiceHomeApplication.java          |  2 +-
 .../xlcs/home/config/ThreadPoolConfig.java    |  2 +-
 .../home/controller/HomeApiController.java    |  2 +-
 .../xlcs/home/service/HomeService.java        |  2 +-
 .../xlcs/home/service/ItemService.java        |  2 +-
 .../home/service/impl/HomeServiceImpl.java    |  2 +-
 .../home/service/impl/ItemServiceImpl.java    |  2 +-
 .../xlcs/ServiceOrderApplication.java         |  2 +-
 .../xlcs/order/receiver/OrderReceiver.java    |  4 +-
 .../xlcs/ServicePaymentApplication.java       |  2 +-
 .../payment/controller/WeiXinController.java  |  2 +-
 .../payment/service/PaymentInfoService.java   |  4 +-
 .../xlcs/payment/service/WeixinService.java   |  2 +-
 .../service/impl/WeXinServiceImpl.java        |  4 +-
 .../utils/ConstantPropertiesUtils.java        |  2 +-
 .../xlcs/payment/utils/HttpClient.java        |  2 +-
 .../xlcs/ServiceProductApplication.java       |  2 +-
 .../product/api/ProductInnnerController.java  |  2 +-
 .../controller/FileUploadController.java      |  2 +-
 .../xlcs/product/receiver/StockReceiver.java  |  4 +-
 .../product/service/FileUploadService.java    |  2 +-
 .../service/impl/FileUploadServiceImpl.java   |  2 +-
 .../xlcs/product/utils/FileUploader.java      |  2 +-
 .../xlcs/ServiceSearchApplication.java        |  2 +-
 .../xlcs/search/api/SearchApiController.java  |  2 +-
 .../search/controller/SkuApiController.java   |  2 +-
 .../xlcs/search/receiver/SkuReceiver.java     |  4 +-
 .../xlcs/search/repository/SkuRepository.java |  2 +-
 .../xlcs/search/service/SkuService.java       |  2 +-
 .../search/service/impl/SkuServiceImpl.java   |  2 +-
 .../yovinchen/xlcs/ServiceSysApplication.java |  2 +-
 .../xlcs/ServiceUserApplication.java          |  2 +-
 .../user/api/LeaderAddressController.java     |  2 +-
 .../user/controller/WeixinApiController.java  |  2 +-
 .../xlcs/user/mapper/LeaderMapper.java        |  4 +-
 .../xlcs/user/mapper/UserDeliveryMapper.java  |  4 +-
 .../xlcs/user/mapper/UserMapper.java          |  4 +-
 .../xlcs/user/service/LoginWxService.java     |  2 +-
 .../xlcs/user/service/UserService.java        |  4 +-
 .../user/service/impl/UserServiceImpl.java    |  6 +-
 .../user/utils/ConstantPropertiesUtil.java    |  2 +-
 .../xlcs/user/utils/HttpClientUtils.java      |  2 +-
 .../dist/dev/mp-weixin/common/vendor.js       |  1 -
 116 files changed, 339 insertions(+), 197 deletions(-)
 create mode 100644 xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/acl/AdminLoginLog.java

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 8c84b40..fc4b716 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="central" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Central Repository" />
diff --git a/xlcs-admin/src/views/acl/role/roleAuth.vue b/xlcs-admin/src/views/acl/role/roleAuth.vue
index e359a22..69fa54e 100644
--- a/xlcs-admin/src/views/acl/role/roleAuth.vue
+++ b/xlcs-admin/src/views/acl/role/roleAuth.vue
@@ -1,14 +1,15 @@
 <template>
   <div>
-    <el-input disabled :value="$route.query.roleName" />
+    <el-input :value="$route.query.roleName" disabled/>
     <el-tree
       ref="tree"
-      style="margin: 20px 0"
       :data="allPermissions"
+      :default-checked-keys="assignPermission"
+      :props="defaultProps"
+      default-expand-all
       node-key="id"
       show-checkbox
-      default-expand-all
-      :props="defaultProps"
+      style="margin: 20px 0"
     />
     <el-button :loading="loading" type="primary" @click="save">保存</el-button>
     <el-button @click="$router.replace({name: 'Role'})">取消</el-button>
@@ -48,8 +49,11 @@ export default {
       */
     getPermissions(roleId) {
       this.$API.permission.toAssign(roleId).then(result => {
-        const allPermissions = result.data
+        const allPermissions = result.data.allPermissionList
         this.allPermissions = allPermissions
+        const assignPermission = result.data.assignPermission
+        this.assignPermission = assignPermission
+
         const checkedIds = this.getCheckedIds(allPermissions)
         // console.log('getPermissions() checkedIds', checkedIds)
         this.$refs.tree.setCheckedKeys(checkedIds)
diff --git a/xlcs-parent/common/common-util/src/main/java/com/yovinchen/xlcs/common/utils/DateUtil.java b/xlcs-parent/common/common-util/src/main/java/com/yovinchen/xlcs/common/utils/DateUtil.java
index 4b968fd..bcb7fbc 100644
--- a/xlcs-parent/common/common-util/src/main/java/com/yovinchen/xlcs/common/utils/DateUtil.java
+++ b/xlcs-parent/common/common-util/src/main/java/com/yovinchen/xlcs/common/utils/DateUtil.java
@@ -13,7 +13,7 @@ import java.util.Date;
  * 日期操作工具类
  *
  * @author yovinchen
- * @Create 2023/10/12 18:04
+ * @since 2023/10/12 18:04
  */
 public class DateUtil {
 
diff --git a/xlcs-parent/common/common-util/src/main/java/com/yovinchen/xlcs/common/utils/JwtHelper.java b/xlcs-parent/common/common-util/src/main/java/com/yovinchen/xlcs/common/utils/JwtHelper.java
index 09f43b3..fb4e1e4 100644
--- a/xlcs-parent/common/common-util/src/main/java/com/yovinchen/xlcs/common/utils/JwtHelper.java
+++ b/xlcs-parent/common/common-util/src/main/java/com/yovinchen/xlcs/common/utils/JwtHelper.java
@@ -10,7 +10,7 @@ import java.util.Date;
  * Package: com.yovinchen.xlcs.common.utils
  *
  * @author yovinchen
- * @Create 2023/9/22 15:50
+ * @since 2023/9/22 15:50
  */
 public class JwtHelper {
 
diff --git a/xlcs-parent/common/rabbit_util/src/main/java/com/yovinchen/xlcs/mq/config/MQConfig.java b/xlcs-parent/common/rabbit_util/src/main/java/com/yovinchen/xlcs/mq/config/MQConfig.java
index 59ac89a..ced5000 100644
--- a/xlcs-parent/common/rabbit_util/src/main/java/com/yovinchen/xlcs/mq/config/MQConfig.java
+++ b/xlcs-parent/common/rabbit_util/src/main/java/com/yovinchen/xlcs/mq/config/MQConfig.java
@@ -10,7 +10,7 @@ import org.springframework.context.annotation.Configuration;
  * Package: com.yovinchen.xlcs.mq.config
  *
  * @author yovinchen
- * @Create 2023/9/16 23:32
+ * @since 2023/9/16 23:32
  */
 @Configuration
 public class MQConfig {
diff --git a/xlcs-parent/common/rabbit_util/src/main/java/com/yovinchen/xlcs/mq/config/MQProducerAckConfig.java b/xlcs-parent/common/rabbit_util/src/main/java/com/yovinchen/xlcs/mq/config/MQProducerAckConfig.java
index e54ac70..47f88bd 100644
--- a/xlcs-parent/common/rabbit_util/src/main/java/com/yovinchen/xlcs/mq/config/MQProducerAckConfig.java
+++ b/xlcs-parent/common/rabbit_util/src/main/java/com/yovinchen/xlcs/mq/config/MQProducerAckConfig.java
@@ -13,7 +13,7 @@ import javax.annotation.PostConstruct;
  * Package: com.yovinchen.xlcs.mq.config
  *
  * @author yovinchen
- * @Create 2023/9/16 23:33
+ * @since 2023/9/16 23:33
  */
 @Component
 public class MQProducerAckConfig implements RabbitTemplate.ReturnCallback, RabbitTemplate.ConfirmCallback {
diff --git a/xlcs-parent/common/rabbit_util/src/main/java/com/yovinchen/xlcs/mq/constant/MqConst.java b/xlcs-parent/common/rabbit_util/src/main/java/com/yovinchen/xlcs/mq/constant/MqConst.java
index 967529d..0b63f7c 100644
--- a/xlcs-parent/common/rabbit_util/src/main/java/com/yovinchen/xlcs/mq/constant/MqConst.java
+++ b/xlcs-parent/common/rabbit_util/src/main/java/com/yovinchen/xlcs/mq/constant/MqConst.java
@@ -5,7 +5,7 @@ package com.yovinchen.xlcs.mq.constant;
  * Package: com.yovinchen.xlcs.mq.constant
  *
  * @author yovinchen
- * @Create 2023/9/16 23:34
+ * @since 2023/9/16 23:34
  */
 public class MqConst {
     /**
diff --git a/xlcs-parent/common/rabbit_util/src/main/java/com/yovinchen/xlcs/mq/service/RabbitService.java b/xlcs-parent/common/rabbit_util/src/main/java/com/yovinchen/xlcs/mq/service/RabbitService.java
index 80a8c14..a111546 100644
--- a/xlcs-parent/common/rabbit_util/src/main/java/com/yovinchen/xlcs/mq/service/RabbitService.java
+++ b/xlcs-parent/common/rabbit_util/src/main/java/com/yovinchen/xlcs/mq/service/RabbitService.java
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
  * Package: com.yovinchen.xlcs.common.service
  *
  * @author yovinchen
- * @Create 2023/9/16 18:12
+ * @since 2023/9/16 18:12
  */
 @Service
 public class RabbitService {
diff --git a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/aspect/LogAspect.java b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/aspect/LogAspect.java
index 74888c3..577beb9 100644
--- a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/aspect/LogAspect.java
+++ b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/aspect/LogAspect.java
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRequest;
  * Package: com.yovinchen.xlcs.common.aspect
  *
  * @author yovinchen
- * @Create 2024/1/23 10:43
+ * @since 2024/1/23 10:43
  */
 @Aspect
 @Component
diff --git a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/auth/AuthContextHolder.java b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/auth/AuthContextHolder.java
index 2097543..b43d8e3 100644
--- a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/auth/AuthContextHolder.java
+++ b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/auth/AuthContextHolder.java
@@ -7,7 +7,7 @@ import com.yovinchen.xlcs.vo.user.UserLoginVo;
  * Package: com.yovinchen.xlcs.common.auth
  *
  * @author yovinchen
- * @Create 2023/9/22 17:40
+ * @since 2023/9/22 17:40
  */
 //ThreadLocal工具类
 public class AuthContextHolder {
diff --git a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/auth/LoginMvcConfigurerAdapter.java b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/auth/LoginMvcConfigurerAdapter.java
index 5915232..bab7d05 100644
--- a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/auth/LoginMvcConfigurerAdapter.java
+++ b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/auth/LoginMvcConfigurerAdapter.java
@@ -12,7 +12,7 @@ import javax.annotation.Resource;
  * Package: com.yovinchen.xlcs.common.auth
  *
  * @author yovinchen
- * @Create 2023/9/22 23:58
+ * @since 2023/9/22 23:58
  */
 @Configuration
 public class LoginMvcConfigurerAdapter extends WebMvcConfigurationSupport {
diff --git a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/auth/UserLoginInterceptor.java b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/auth/UserLoginInterceptor.java
index 34648c5..e376f81 100644
--- a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/auth/UserLoginInterceptor.java
+++ b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/auth/UserLoginInterceptor.java
@@ -15,7 +15,7 @@ import javax.servlet.http.HttpServletResponse;
  * Package: com.yovinchen.xlcs.common.auth
  *
  * @author yovinchen
- * @Create 2023/9/22 23:47
+ * @since 2023/9/22 23:47
  */
 public class UserLoginInterceptor implements HandlerInterceptor {
 
diff --git a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/config/MybatisPlusConfig.java b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/config/MybatisPlusConfig.java
index 40c0f02..196cd3d 100644
--- a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/config/MybatisPlusConfig.java
+++ b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/config/MybatisPlusConfig.java
@@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
  * MybatisPlus配置类
  *
  * @author yovinchen
- * @Create 2023/9/13 12:56
+ * @since 2023/9/13 12:56
  */
 @EnableTransactionManagement
 @Configuration
diff --git a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/config/RedisConfig.java b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/config/RedisConfig.java
index c22f632..8b6ac6b 100644
--- a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/config/RedisConfig.java
+++ b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/config/RedisConfig.java
@@ -26,7 +26,7 @@ import java.time.Duration;
  * Redis配置类
  *
  * @author yovinchen
- * @Create 2023/9/22 15:55
+ * @since 2023/9/22 15:55
  */
 
 @Configuration
diff --git a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/config/RedissonConfig.java b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/config/RedissonConfig.java
index f88941d..72940d5 100644
--- a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/config/RedissonConfig.java
+++ b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/config/RedissonConfig.java
@@ -15,7 +15,7 @@ import org.springframework.util.StringUtils;
  * Package: com.yovinchen.xlcs.common.config
  *
  * @author yovinchen
- * @Create 2023/10/12 16:48
+ * @since 2023/10/12 16:48
  */
 @Data
 @Configuration
diff --git a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/config/Swagger2Config.java b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/config/Swagger2Config.java
index d15c58e..3c7f305 100644
--- a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/config/Swagger2Config.java
+++ b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/config/Swagger2Config.java
@@ -22,7 +22,7 @@ import java.util.List;
  * Package: com.yovinchen.xlcs.common.config
  *
  * @author yovinchen
- * @Create 2023/9/13 13:18
+ * @since 2023/9/13 13:18
  */
 @Configuration
 @EnableSwagger2WebMvc
diff --git a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/constant/RedisConst.java b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/constant/RedisConst.java
index 62492cb..1024079 100644
--- a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/constant/RedisConst.java
+++ b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/constant/RedisConst.java
@@ -6,7 +6,7 @@ package com.yovinchen.xlcs.common.constant;
  * Redis常量配置类
  *
  * @author yovinchen
- * @Create 2023/9/22 15:57
+ * @since 2023/9/22 15:57
  */
 public class RedisConst {
 
diff --git a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/exception/GlobalExceptionHandler.java b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/exception/GlobalExceptionHandler.java
index 77e1b47..70d4347 100644
--- a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/exception/GlobalExceptionHandler.java
+++ b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/exception/GlobalExceptionHandler.java
@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
  * 统一异常处理类
  *
  * @author yovinchen
- * @Create 2023/9/13 13:03
+ * @since 2023/9/13 13:03
  */
 
 @ControllerAdvice
diff --git a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/exception/xlcsException.java b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/exception/xlcsException.java
index 832c510..558e54b 100644
--- a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/exception/xlcsException.java
+++ b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/exception/xlcsException.java
@@ -9,7 +9,7 @@ import lombok.Data;
  * 自定义异常类
  *
  * @author yovinchen
- * @Create 2023/9/13 13:05
+ * @since 2023/9/13 13:05
  */
 
 @Data
diff --git a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/result/Result.java b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/result/Result.java
index d3b5155..ae0c317 100644
--- a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/result/Result.java
+++ b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/result/Result.java
@@ -8,7 +8,7 @@ import lombok.Data;
  * 统一返回结果类
  *
  * @author yovinchen
- * @Create 2023/9/13 13:01
+ * @since 2023/9/13 13:01
  */
 @Data
 public class Result<T> {
diff --git a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/result/ResultCodeEnum.java b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/result/ResultCodeEnum.java
index 4962ab3..fc5b958 100644
--- a/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/result/ResultCodeEnum.java
+++ b/xlcs-parent/common/service-util/src/main/java/com/yovinchen/xlcs/common/result/ResultCodeEnum.java
@@ -8,7 +8,7 @@ import lombok.Getter;
  * 统一返回结果状态信息类
  *
  * @author yovinchen
- * @Create 2023/9/13 12:59
+ * @since 2023/9/13 12:59
  */
 @Getter
 public enum ResultCodeEnum {
diff --git a/xlcs-parent/common/service-util/src/test/java/com/yovinchen/xlcs/CodeGet.java b/xlcs-parent/common/service-util/src/test/java/com/yovinchen/xlcs/CodeGet.java
index d369471..9f4870a 100644
--- a/xlcs-parent/common/service-util/src/test/java/com/yovinchen/xlcs/CodeGet.java
+++ b/xlcs-parent/common/service-util/src/test/java/com/yovinchen/xlcs/CodeGet.java
@@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
  * Package: com.yovinchen.xlcs
  *
  * @author yovinchen
- * @Create 2023/9/14 08:49
+ * @since 2023/9/14 08:49
  */
 public class CodeGet {
 
@@ -25,7 +25,7 @@ public class CodeGet {
         // 2、全局配置
         // 全局配置
         GlobalConfig gc = new GlobalConfig();
-        gc.setOutputDir("yovinchen-xlcs-parent/service/service-order" + "/src/main/java");
+        gc.setOutputDir("xlcs-parent/service/service-acl" + "/src/main/java");
 
         gc.setServiceName("%sService");    //去掉Service接口的首字母I
         gc.setAuthor("yovinchen");
@@ -34,17 +34,17 @@ public class CodeGet {
 
         // 3、数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://82.157.68.223:3306/shequ-order?serverTimezone=GMT%2B8&useSSL=false");
+        dsc.setUrl("jdbc:mysql://82.157.68.223:3306/shequ-acl?serverTimezone=GMT%2B8&useSSL=false");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
-        dsc.setUsername("shequ-order");
-        dsc.setPassword("shequ-order");
+        dsc.setUsername("shequ-acl");
+        dsc.setPassword("shequ-acl");
         dsc.setDbType(DbType.MYSQL);
         mpg.setDataSource(dsc);
 
         // 4、包配置
         PackageConfig pc = new PackageConfig();
         pc.setParent("com.yovinchen.xlcs");
-        pc.setModuleName("order"); //模块名
+        pc.setModuleName("acl"); //模块名
         pc.setController("controller");
         pc.setService("service");
         pc.setMapper("mapper");
@@ -53,7 +53,7 @@ public class CodeGet {
         // 5、策略配置
         StrategyConfig strategy = new StrategyConfig();
 
-        strategy.setInclude("cart_info", "order_info", "order_deliver", "order_item", "order_log", "order_return_apply", "order_return_reason", "order_set", "payment_info", "refund_info");
+        strategy.setInclude("role_permission", "admin_login_log");
 
         strategy.setNaming(NamingStrategy.underline_to_camel);//数据库表映射到实体的命名策略
 
diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/acl/Admin.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/acl/Admin.java
index e2844a1..c039584 100644
--- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/acl/Admin.java
+++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/acl/Admin.java
@@ -1,8 +1,8 @@
 package com.yovinchen.xlcs.model.acl;
 
-import com.yovinchen.xlcs.model.base.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yovinchen.xlcs.model.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,8 +12,8 @@ import lombok.Data;
  * 用户
  * </p>
  *
- * @author qy
- * @since 2019-11-08
+ * @author yovinchen
+ * @since 2023-09-21
  */
 @Data
 @ApiModel(description = "用户")
diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/acl/AdminLoginLog.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/acl/AdminLoginLog.java
new file mode 100644
index 0000000..bd95b50
--- /dev/null
+++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/acl/AdminLoginLog.java
@@ -0,0 +1,40 @@
+package com.yovinchen.xlcs.model.acl;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yovinchen.xlcs.model.base.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 后台用户登录日志表
+ * </p>
+ *
+ * @author yovinchen
+ * @since 2024-01-24
+ */
+@Data
+@ApiModel(description = "后台用户登录日志表")
+@TableName("admin_login_log")
+public class AdminLoginLog extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "用户id")
+    @TableField("admin_id")
+    private Long adminId;
+
+    @ApiModelProperty(value = "IP地址")
+    @TableField("ip")
+    private String ip;
+
+    @ApiModelProperty(value = "地址")
+    @TableField("address")
+    private String address;
+
+    @ApiModelProperty(value = "浏览器登录类型")
+    @TableField("user_agent")
+    private String userAgent;
+}
diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/acl/AdminRole.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/acl/AdminRole.java
index 1b4463c..0381057 100644
--- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/acl/AdminRole.java
+++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/acl/AdminRole.java
@@ -1,8 +1,8 @@
 package com.yovinchen.xlcs.model.acl;
 
-import com.yovinchen.xlcs.model.base.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yovinchen.xlcs.model.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,8 +12,8 @@ import lombok.Data;
  * 用户角色
  * </p>
  *
- * @author qy
- * @since 2019-11-08
+ * @author yovinchen
+ * @since 2023-09-21
  */
 @Data
 @ApiModel(description = "用户角色")
diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/acl/Permission.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/acl/Permission.java
index 26b4258..d248044 100644
--- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/acl/Permission.java
+++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/acl/Permission.java
@@ -2,9 +2,9 @@
 //
 package com.yovinchen.xlcs.model.acl;
 
-import com.yovinchen.xlcs.model.base.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yovinchen.xlcs.model.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,8 +16,8 @@ import java.util.List;
  * 权限
  * </p>
  *
- * @author qy
- * @since 2019-11-08
+ * @author yovinchen
+ * @since 2023-09-21
  */
 @Data
 @ApiModel(description = "权限")
diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/acl/Role.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/acl/Role.java
index e2767e6..881dc80 100644
--- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/acl/Role.java
+++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/acl/Role.java
@@ -2,9 +2,9 @@
 //
 package com.yovinchen.xlcs.model.acl;
 
-import com.yovinchen.xlcs.model.base.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yovinchen.xlcs.model.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,8 +14,8 @@ import lombok.Data;
  * 角色
  * </p>
  *
- * @author qy
- * @since 2019-11-08
+ * @author yovinchen
+ * @since 2023-09-21
  */
 @Data
 @ApiModel(description = "角色")
diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/acl/RolePermission.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/acl/RolePermission.java
index 2520f04..fb1dde8 100644
--- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/acl/RolePermission.java
+++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/acl/RolePermission.java
@@ -2,9 +2,9 @@
 //
 package com.yovinchen.xlcs.model.acl;
 
-import com.yovinchen.xlcs.model.base.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yovinchen.xlcs.model.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,8 +14,8 @@ import lombok.Data;
  * 角色权限
  * </p>
  *
- * @author qy
- * @since 2019-11-08
+ * @author yovinchen
+ * @since 2023-09-21
  */
 @Data
 @ApiModel(description = "角色权限")
diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/activity/ActivityInfo.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/activity/ActivityInfo.java
index 31534e9..240e0f6 100644
--- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/activity/ActivityInfo.java
+++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/activity/ActivityInfo.java
@@ -1,10 +1,10 @@
 package com.yovinchen.xlcs.model.activity;
 
-import com.yovinchen.xlcs.enums.ActivityType;
-import com.yovinchen.xlcs.model.base.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yovinchen.xlcs.enums.ActivityType;
+import com.yovinchen.xlcs.model.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,7 +16,7 @@ import java.util.Date;
  * ActivityInfo
  * </p>
  *
- * @author qy
+ * @author yovinchen
  */
 @Data
 @ApiModel(description = "ActivityInfo")
diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/activity/ActivityRule.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/activity/ActivityRule.java
index df0fbfa..dbfde9f 100644
--- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/activity/ActivityRule.java
+++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/activity/ActivityRule.java
@@ -1,9 +1,9 @@
 package com.yovinchen.xlcs.model.activity;
 
-import com.yovinchen.xlcs.enums.ActivityType;
-import com.yovinchen.xlcs.model.base.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yovinchen.xlcs.enums.ActivityType;
+import com.yovinchen.xlcs.model.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,7 +15,7 @@ import java.math.BigDecimal;
  * ActivityRule
  * </p>
  *
- * @author qy
+ * @author yovinchen
  */
 @Data
 @ApiModel(description = "ActivityRule")
diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/activity/ActivitySku.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/activity/ActivitySku.java
index 5e34416..7dde56a 100644
--- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/activity/ActivitySku.java
+++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/activity/ActivitySku.java
@@ -1,8 +1,8 @@
 package com.yovinchen.xlcs.model.activity;
 
-import com.yovinchen.xlcs.model.base.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yovinchen.xlcs.model.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,7 +12,7 @@ import lombok.Data;
  * ActivitySku
  * </p>
  *
- * @author qy
+ * @author yovinchen
  */
 @Data
 @ApiModel(description = "ActivitySku")
diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/activity/CouponRange.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/activity/CouponRange.java
index e7c482a..f877b87 100644
--- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/activity/CouponRange.java
+++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/activity/CouponRange.java
@@ -1,9 +1,9 @@
 package com.yovinchen.xlcs.model.activity;
 
-import com.yovinchen.xlcs.enums.CouponRangeType;
-import com.yovinchen.xlcs.model.base.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yovinchen.xlcs.enums.CouponRangeType;
+import com.yovinchen.xlcs.model.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,7 +13,7 @@ import lombok.Data;
  * CouponRange
  * </p>
  *
- * @author qy
+ * @author yovinchen
  */
 @Data
 @ApiModel(description = "CouponRange")
diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/activity/CouponUse.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/activity/CouponUse.java
index cf6b874..bdddd48 100644
--- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/activity/CouponUse.java
+++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/activity/CouponUse.java
@@ -1,9 +1,9 @@
 package com.yovinchen.xlcs.model.activity;
 
-import com.yovinchen.xlcs.enums.CouponStatus;
-import com.yovinchen.xlcs.model.base.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yovinchen.xlcs.enums.CouponStatus;
+import com.yovinchen.xlcs.model.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,7 +15,7 @@ import java.util.Date;
  * CouponUse
  * </p>
  *
- * @author qy
+ * @author yovinchen
  */
 @Data
 @ApiModel(description = "优惠券领取记录表")
diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/acl/AdminQueryVo.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/acl/AdminQueryVo.java
index aa793a0..f57c3c3 100644
--- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/acl/AdminQueryVo.java
+++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/acl/AdminQueryVo.java
@@ -13,8 +13,8 @@ import java.io.Serializable;
  * 用户查询实体
  * </p>
  *
- * @author qy
- * @since 2019-11-08
+ * @author yovinchen
+ * @since 2023-09-21
  */
 @Data
 @ApiModel(description = "用户查询实体")
diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/acl/RoleQueryVo.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/acl/RoleQueryVo.java
index a8f5d65..28e492b 100644
--- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/acl/RoleQueryVo.java
+++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/acl/RoleQueryVo.java
@@ -13,8 +13,8 @@ import java.io.Serializable;
  * 角色查询实体
  * </p>
  *
- * @author qy
- * @since 2019-11-08
+ * @author yovinchen
+ * @since 2023-09-21
  */
 @Data
 @ApiModel(description = "角色查询实体")
diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/CartInfoVo.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/CartInfoVo.java
index 4a881a1..05f67df 100644
--- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/CartInfoVo.java
+++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/CartInfoVo.java
@@ -13,7 +13,7 @@ import java.util.List;
  * OrderDetailActivity
  * </p>
  *
- * @author qy
+ * @author yovinchen
  */
 @Data
 public class CartInfoVo implements Serializable {
diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderConfirmVo.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderConfirmVo.java
index 063efac..768e33e 100644
--- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderConfirmVo.java
+++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderConfirmVo.java
@@ -1,7 +1,7 @@
 package com.yovinchen.xlcs.vo.order;
 
-import com.yovinchen.xlcs.vo.user.LeaderAddressVo;
 import com.yovinchen.xlcs.model.activity.CouponInfo;
+import com.yovinchen.xlcs.vo.user.LeaderAddressVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -14,7 +14,7 @@ import java.util.List;
  * OrderDetailActivity
  * </p>
  *
- * @author qy
+ * @author yovinchen
  */
 @Data
 public class OrderConfirmVo implements Serializable {
diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderMqVo.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderMqVo.java
index 03e1909..8f25baa 100644
--- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderMqVo.java
+++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderMqVo.java
@@ -12,7 +12,7 @@ import java.util.List;
  * OrderDetailActivity
  * </p>
  *
- * @author qy
+ * @author yovinchen
  */
 @Data
 public class OrderMqVo implements Serializable {
diff --git a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/user/LeaderAddressVo.java b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/user/LeaderAddressVo.java
index 3cb81eb..fadc647 100644
--- a/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/user/LeaderAddressVo.java
+++ b/xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/user/LeaderAddressVo.java
@@ -1,6 +1,5 @@
 package com.yovinchen.xlcs.vo.user;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,7 +9,7 @@ import lombok.Data;
  * UserAddress
  * </p>
  *
- * @author qy
+ * @author yovinchen
  */
 @Data
 @ApiModel(description = "用户地址")
diff --git a/xlcs-parent/service-client/service-activity-client/src/main/java/com/yovinchen/xlcs/client/activity/ActivityFeignClient.java b/xlcs-parent/service-client/service-activity-client/src/main/java/com/yovinchen/xlcs/client/activity/ActivityFeignClient.java
index 3c8e2fd..89b2c03 100644
--- a/xlcs-parent/service-client/service-activity-client/src/main/java/com/yovinchen/xlcs/client/activity/ActivityFeignClient.java
+++ b/xlcs-parent/service-client/service-activity-client/src/main/java/com/yovinchen/xlcs/client/activity/ActivityFeignClient.java
@@ -19,7 +19,7 @@ import java.util.Map;
  * Package: com.yovinchen.xlcs.client.activity
  *
  * @author yovinchen
- * @Create 2023/9/26 14:10
+ * @since 2023/9/26 14:10
  */
 @FeignClient(value = "service-activity")
 public interface ActivityFeignClient {
diff --git a/xlcs-parent/service-client/service-cart-client/src/main/java/com/yovinchen/xlcs/client/cart/CartFeignClient.java b/xlcs-parent/service-client/service-cart-client/src/main/java/com/yovinchen/xlcs/client/cart/CartFeignClient.java
index 1b373e0..b86747a 100644
--- a/xlcs-parent/service-client/service-cart-client/src/main/java/com/yovinchen/xlcs/client/cart/CartFeignClient.java
+++ b/xlcs-parent/service-client/service-cart-client/src/main/java/com/yovinchen/xlcs/client/cart/CartFeignClient.java
@@ -13,7 +13,7 @@ import java.util.List;
  * Package: com.yovinchen.xlcs.client.cart
  *
  * @author yovinchen
- * @Create 2023/10/12 15:49
+ * @since 2023/10/12 15:49
  */
 @FeignClient(value = "service-cart")
 public interface CartFeignClient {
diff --git a/xlcs-parent/service-client/service-order-client/src/main/java/com/yovinchen/xlcs/client/order/OrderFeignClient.java b/xlcs-parent/service-client/service-order-client/src/main/java/com/yovinchen/xlcs/client/order/OrderFeignClient.java
index 6d0b7de..d65d73a 100644
--- a/xlcs-parent/service-client/service-order-client/src/main/java/com/yovinchen/xlcs/client/order/OrderFeignClient.java
+++ b/xlcs-parent/service-client/service-order-client/src/main/java/com/yovinchen/xlcs/client/order/OrderFeignClient.java
@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.PathVariable;
  * Package: com.yovinchen.xlcs.client.order
  *
  * @author yovinchen
- * @Create 2023/10/13 11:03
+ * @since 2023/10/13 11:03
  */
 @FeignClient(value = "service-order")
 public interface OrderFeignClient {
diff --git a/xlcs-parent/service-client/service-product-client/src/main/java/com/yovinchen/xlcs/client/product/ProductFeignClient.java b/xlcs-parent/service-client/service-product-client/src/main/java/com/yovinchen/xlcs/client/product/ProductFeignClient.java
index 15c00d7..4bbd063 100644
--- a/xlcs-parent/service-client/service-product-client/src/main/java/com/yovinchen/xlcs/client/product/ProductFeignClient.java
+++ b/xlcs-parent/service-client/service-product-client/src/main/java/com/yovinchen/xlcs/client/product/ProductFeignClient.java
@@ -17,7 +17,7 @@ import java.util.List;
  * Package: com.yovinchen.xlcs.client.product
  *
  * @author yovinchen
- * @Create 2023/9/16 17:45
+ * @since 2023/9/16 17:45
  */
 @FeignClient(value = "service-product")
 public interface ProductFeignClient {
diff --git a/xlcs-parent/service-client/service-search-client/src/main/java/com/yovinchen/xlcs/client/search/SkuFeignClient.java b/xlcs-parent/service-client/service-search-client/src/main/java/com/yovinchen/xlcs/client/search/SkuFeignClient.java
index 766ac50..8c0d9ca 100644
--- a/xlcs-parent/service-client/service-search-client/src/main/java/com/yovinchen/xlcs/client/search/SkuFeignClient.java
+++ b/xlcs-parent/service-client/service-search-client/src/main/java/com/yovinchen/xlcs/client/search/SkuFeignClient.java
@@ -13,7 +13,7 @@ import java.util.List;
  * Package: com.yovinchen.xlcs.client.search
  *
  * @author yovinchen
- * @Create 2023/9/25 22:44
+ * @since 2023/9/25 22:44
  */
 @FeignClient("service-search")
 public interface SkuFeignClient {
diff --git a/xlcs-parent/service-client/service-user-client/src/main/java/com/yovinchen/xlcs/client/user/UserFeignClient.java b/xlcs-parent/service-client/service-user-client/src/main/java/com/yovinchen/xlcs/client/user/UserFeignClient.java
index a246cdd..38936b1 100644
--- a/xlcs-parent/service-client/service-user-client/src/main/java/com/yovinchen/xlcs/client/user/UserFeignClient.java
+++ b/xlcs-parent/service-client/service-user-client/src/main/java/com/yovinchen/xlcs/client/user/UserFeignClient.java
@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.PathVariable;
  * Package: com.yovinchen.xlcs.client.user
  *
  * @author yovinchen
- * @Create 2023/9/25 12:27
+ * @since 2023/9/25 12:27
  */
 @FeignClient(value = "service-user")
 public interface UserFeignClient {
diff --git a/xlcs-parent/service-gateway/src/main/java/com/yovinchen/xlcs/ServiceGatewayApplication.java b/xlcs-parent/service-gateway/src/main/java/com/yovinchen/xlcs/ServiceGatewayApplication.java
index f46c314..d22d0a8 100644
--- a/xlcs-parent/service-gateway/src/main/java/com/yovinchen/xlcs/ServiceGatewayApplication.java
+++ b/xlcs-parent/service-gateway/src/main/java/com/yovinchen/xlcs/ServiceGatewayApplication.java
@@ -9,7 +9,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
  * Package: com.yovinchen.xlcs
  *
  * @author yovinchen
- * @Create 2023/9/20 16:51
+ * @since 2023/9/20 16:51
  */
 
 @SpringBootApplication
diff --git a/xlcs-parent/service-gateway/src/main/java/com/yovinchen/xlcs/config/CorsConfig.java b/xlcs-parent/service-gateway/src/main/java/com/yovinchen/xlcs/config/CorsConfig.java
index 5dbcf3b..3ad0ea2 100644
--- a/xlcs-parent/service-gateway/src/main/java/com/yovinchen/xlcs/config/CorsConfig.java
+++ b/xlcs-parent/service-gateway/src/main/java/com/yovinchen/xlcs/config/CorsConfig.java
@@ -12,7 +12,7 @@ import org.springframework.web.util.pattern.PathPatternParser;
  * Package: com.yovinchen.xlcs.config.config
  *
  * @author yovinchen
- * @Create 2023/9/20 16:52
+ * @since 2023/9/20 16:52
  */
 @Configuration
 public class CorsConfig {
diff --git a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/ServiceAclApplication.java b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/ServiceAclApplication.java
index 5480c81..1924eaf 100644
--- a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/ServiceAclApplication.java
+++ b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/ServiceAclApplication.java
@@ -10,7 +10,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
  * 权限管理模块启动类
  *
  * @author yovinchen
- * @Create 2023/9/13 17:38
+ * @since 2023/9/13 17:38
  */
 @SpringBootApplication
 @EnableDiscoveryClient
diff --git a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/controller/AdminController.java b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/controller/AdminController.java
index 70c98c8..cf0deb0 100644
--- a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/controller/AdminController.java
+++ b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/controller/AdminController.java
@@ -1,14 +1,14 @@
 package com.yovinchen.xlcs.acl.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yovinchen.xlcs.acl.service.AdminService;
 import com.yovinchen.xlcs.acl.service.RoleService;
 import com.yovinchen.xlcs.common.result.Result;
 import com.yovinchen.xlcs.common.utils.MD5;
 import com.yovinchen.xlcs.model.acl.Admin;
 import com.yovinchen.xlcs.vo.acl.AdminQueryVo;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -25,7 +25,7 @@ import java.util.Map;
  * 用户管理 前端控制器
  *
  * @author yovinchen
- * @Create 2023/9/14 10:38
+ * @since 2023/9/14 10:38
  */
 @RestController
 @RequestMapping("/admin/acl/user")
diff --git a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/controller/IndexController.java b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/controller/IndexController.java
index 4b2f33e..e405632 100644
--- a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/controller/IndexController.java
+++ b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/controller/IndexController.java
@@ -15,7 +15,7 @@ import java.util.Map;
  * Package: com.yovinchen.xlcs.acl.controller
  *
  * @author yovinchen
- * @Create 2023/9/13 18:00
+ * @since 2023/9/13 18:00
  */
 
 @Api(tags = "登录接口")
diff --git a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/controller/PermissionController.java b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/controller/PermissionController.java
index 0bb2fa2..3e71fdc 100644
--- a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/controller/PermissionController.java
+++ b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/controller/PermissionController.java
@@ -1,6 +1,7 @@
 package com.yovinchen.xlcs.acl.controller;
 
 import com.yovinchen.xlcs.acl.service.PermissionService;
+import com.yovinchen.xlcs.acl.service.RoleService;
 import com.yovinchen.xlcs.common.result.Result;
 import com.yovinchen.xlcs.model.acl.Permission;
 import io.swagger.annotations.Api;
@@ -10,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * ClassName: PermissionController
@@ -17,7 +19,7 @@ import java.util.List;
  * 菜单服务
  *
  * @author yovinchen
- * @Create 2023/9/14 14:03
+ * @since 2023/9/14 14:03
  */
 @RestController
 @RequestMapping("/admin/acl/permission")
@@ -28,6 +30,8 @@ public class PermissionController {
     @Autowired
     private PermissionService permissionService;
 
+    @Autowired
+    private RoleService roleService;
     @ApiOperation(value = "获取菜单")
     @GetMapping
     public Result index() {
@@ -71,4 +75,29 @@ public class PermissionController {
             throw new RuntimeException("递归删除菜单异常", e);
         }
     }
+
+    @ApiOperation(value = "根据角色获取菜单数据")
+    @GetMapping("/toAssign/{roleId}")
+    public Result toAssign(@PathVariable Long roleId) {
+        Map<String, Object> roleMap = permissionService.findPermissionByRoleId(roleId);
+        return Result.ok(roleMap);
+    }
+
+    @ApiOperation(value = "根据用户分配角色")
+    @PostMapping("/doAssign")
+    public Result doAssign(@RequestParam Long roleId, @RequestParam Long[] permissionId) {
+        permissionService.saveRolePermissionRealtionShip(roleId, permissionId);
+        return Result.ok(null);
+    }
+//    @ApiOperation(value = "获取一个角色的所有权限列表")
+//    @GetMapping("toAssign/{id}")
+//    public Result toAssign(@PathVariable Long id) {
+//        try {
+//            Map<String, Object> result = permissionService.getPermissionById(id);
+//            return Result.ok(result);
+//        } catch (Exception e) {
+//            // 处理异常，例如记录日志或者抛出自定义异常
+//            throw new RuntimeException("获取一个角色的所有权限列表异常", e);
+//        }
+//    }
 }
diff --git a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/controller/RoleController.java b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/controller/RoleController.java
index df2bab9..84e7b6e 100644
--- a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/controller/RoleController.java
+++ b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/controller/RoleController.java
@@ -15,7 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * ClassName: RoleController
@@ -23,7 +22,7 @@ import java.util.Map;
  * 角色管理 前端控制器
  *
  * @author yovinchen
- * @Create 2023/9/14 09:09
+ * @since 2023/9/14 09:09
  */
 @RestController
 @RequestMapping("/admin/acl/role")
@@ -111,16 +110,4 @@ public class RoleController {
             throw new RuntimeException("根据id列表删除角色异常", e);
         }
     }
-
-    @ApiOperation(value = "获取一个角色的所有权限列表")
-    @GetMapping("toAssign/{id}")
-    public Result toAssign(@PathVariable Long id) {
-        try {
-            Map<String, Object> result = permissionService.getPermissionById(id);
-            return Result.ok(result);
-        } catch (Exception e) {
-            // 处理异常，例如记录日志或者抛出自定义异常
-            throw new RuntimeException("获取一个角色的所有权限列表异常", e);
-        }
-    }
 }
diff --git a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/mapper/AdminMapper.java b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/mapper/AdminMapper.java
index 5ade727..7e88b26 100644
--- a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/mapper/AdminMapper.java
+++ b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/mapper/AdminMapper.java
@@ -1,7 +1,7 @@
 package com.yovinchen.xlcs.acl.mapper;
 
-import com.yovinchen.xlcs.model.acl.Admin;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yovinchen.xlcs.model.acl.Admin;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository;
  * 用户管理
  *
  * @author yovinchen
- * @Create 2023/9/14 10:45
+ * @since 2023/9/14 10:45
  */
 @Repository
 public interface AdminMapper extends BaseMapper<Admin> {
diff --git a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/mapper/AdminRoleMapper.java b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/mapper/AdminRoleMapper.java
index e81288f..450cc15 100644
--- a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/mapper/AdminRoleMapper.java
+++ b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/mapper/AdminRoleMapper.java
@@ -1,7 +1,7 @@
 package com.yovinchen.xlcs.acl.mapper;
 
-import com.yovinchen.xlcs.model.acl.AdminRole;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yovinchen.xlcs.model.acl.AdminRole;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository;
  * Package: com.yovinchen.xlcs.acl.mapper
  *
  * @author yovinchen
- * @Create 2023/9/14 11:15
+ * @since 2023/9/14 11:15
  */
 @Repository
 public interface AdminRoleMapper extends BaseMapper<AdminRole> {
diff --git a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/mapper/PermissionMapper.java b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/mapper/PermissionMapper.java
index 4e4901e..f1cb974 100644
--- a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/mapper/PermissionMapper.java
+++ b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/mapper/PermissionMapper.java
@@ -1,7 +1,7 @@
 package com.yovinchen.xlcs.acl.mapper;
 
-import com.yovinchen.xlcs.model.acl.Permission;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yovinchen.xlcs.model.acl.Permission;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository;
  * 菜单Mapper接口
  *
  * @author yovinchen
- * @Create 2023/9/14 13:59
+ * @since 2023/9/14 13:59
  */
 @Repository
 public interface PermissionMapper extends BaseMapper<Permission> {
diff --git a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/mapper/RoleMapper.java b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/mapper/RoleMapper.java
index 3890070..134b1e1 100644
--- a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/mapper/RoleMapper.java
+++ b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/mapper/RoleMapper.java
@@ -1,7 +1,7 @@
 package com.yovinchen.xlcs.acl.mapper;
 
-import com.yovinchen.xlcs.model.acl.Role;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yovinchen.xlcs.model.acl.Role;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository;
  * 角色管理
  *
  * @author yovinchen
- * @Create 2023/9/14 09:11
+ * @since 2023/9/14 09:11
  */
 @Repository
 public interface RoleMapper extends BaseMapper<Role> {
diff --git a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/mapper/RolePermissionMapper.java b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/mapper/RolePermissionMapper.java
index e706882..d3f0f48 100644
--- a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/mapper/RolePermissionMapper.java
+++ b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/mapper/RolePermissionMapper.java
@@ -1,14 +1,14 @@
 package com.yovinchen.xlcs.acl.mapper;
 
-import com.yovinchen.xlcs.model.acl.RolePermission;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yovinchen.xlcs.model.acl.RolePermission;
 
 /**
  * ClassName: RolePermissionMapper
  * Package: com.yovinchen.xlcs.acl.mapper
  *
  * @author yovinchen
- * @Create 2023/9/14 15:07
+ * @since 2023/9/14 15:07
  */
 public interface RolePermissionMapper extends BaseMapper<RolePermission> {
 }
diff --git a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/AdminRoleService.java b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/AdminRoleService.java
index 294d121..0807cf6 100644
--- a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/AdminRoleService.java
+++ b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/AdminRoleService.java
@@ -1,14 +1,14 @@
 package com.yovinchen.xlcs.acl.service;
 
-import com.yovinchen.xlcs.model.acl.AdminRole;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yovinchen.xlcs.model.acl.AdminRole;
 
 /**
  * ClassName: AdminRoleService
  * Package: com.yovinchen.xlcs.acl.service
  *
  * @author yovinchen
- * @Create 2023/9/14 11:15
+ * @since 2023/9/14 11:15
  */
 public interface AdminRoleService extends IService<AdminRole> {
 }
diff --git a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/AdminService.java b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/AdminService.java
index 0a1e7e7..c753a2e 100644
--- a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/AdminService.java
+++ b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/AdminService.java
@@ -1,10 +1,10 @@
 package com.yovinchen.xlcs.acl.service;
 
-import com.yovinchen.xlcs.model.acl.Admin;
-import com.yovinchen.xlcs.vo.acl.AdminQueryVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yovinchen.xlcs.model.acl.Admin;
+import com.yovinchen.xlcs.vo.acl.AdminQueryVo;
 
 /**
  * ClassName: AdminService
@@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 用户管理
  *
  * @author yovinchen
- * @Create 2023/9/14 10:44
+ * @since 2023/9/14 10:44
  */
 public interface AdminService extends IService<Admin> {
 
diff --git a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/PermissionService.java b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/PermissionService.java
index ed04fca..3e3cb45 100644
--- a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/PermissionService.java
+++ b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/PermissionService.java
@@ -1,7 +1,7 @@
 package com.yovinchen.xlcs.acl.service;
 
-import com.yovinchen.xlcs.model.acl.Permission;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yovinchen.xlcs.model.acl.Permission;
 
 import java.util.List;
 import java.util.Map;
@@ -12,7 +12,7 @@ import java.util.Map;
  * 权限服务
  *
  * @author yovinchen
- * @Create 2023/9/14 14:01
+ * @since 2023/9/14 14:01
  */
 public interface PermissionService extends IService<Permission> {
 
@@ -23,4 +23,8 @@ public interface PermissionService extends IService<Permission> {
     boolean removeChildById(Long id);
 
     Map<String, Object> getPermissionById(Long id);
+
+    void saveRolePermissionRealtionShip(Long roleId, Long[] permissionId);
+
+    Map<String, Object> findPermissionByRoleId(Long roleId);
 }
diff --git a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/RoleService.java b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/RoleService.java
index 5084f21..912a66a 100644
--- a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/RoleService.java
+++ b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/RoleService.java
@@ -1,10 +1,10 @@
 package com.yovinchen.xlcs.acl.service;
 
-import com.yovinchen.xlcs.model.acl.Role;
-import com.yovinchen.xlcs.vo.acl.RoleQueryVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yovinchen.xlcs.model.acl.Role;
+import com.yovinchen.xlcs.vo.acl.RoleQueryVo;
 
 import java.util.Map;
 
@@ -14,7 +14,7 @@ import java.util.Map;
  * 用户管理
  *
  * @author yovinchen
- * @Create 2023/9/14 09:10
+ * @since 2023/9/14 09:10
  */
 public interface RoleService extends IService<Role> {
 
diff --git a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/impl/AdminRoleServiceImpl.java b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/impl/AdminRoleServiceImpl.java
index e4939b1..7285a92 100644
--- a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/impl/AdminRoleServiceImpl.java
+++ b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/impl/AdminRoleServiceImpl.java
@@ -1,9 +1,9 @@
 package com.yovinchen.xlcs.acl.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yovinchen.xlcs.acl.mapper.AdminRoleMapper;
 import com.yovinchen.xlcs.acl.service.AdminRoleService;
 import com.yovinchen.xlcs.model.acl.AdminRole;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -11,7 +11,7 @@ import org.springframework.stereotype.Service;
  * Package: com.yovinchen.xlcs.acl.service.impl
  *
  * @author yovinchen
- * @Create 2023/9/14 11:15
+ * @since 2023/9/14 11:15
  */
 @Service
 public class AdminRoleServiceImpl extends ServiceImpl<AdminRoleMapper, AdminRole>
diff --git a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/impl/AdminServiceImpl.java b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/impl/AdminServiceImpl.java
index 394e51f..c1c242a 100644
--- a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/impl/AdminServiceImpl.java
+++ b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/impl/AdminServiceImpl.java
@@ -20,7 +20,7 @@ import org.springframework.util.StringUtils;
  * 用户管理
  *
  * @author yovinchen
- * @Create 2023/9/14 10:44
+ * @since 2023/9/14 10:44
  */
 @Slf4j
 @Service
diff --git a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/impl/PermissionServiceImpl.java b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/impl/PermissionServiceImpl.java
index 0cf531c..a6804bb 100644
--- a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/impl/PermissionServiceImpl.java
+++ b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/impl/PermissionServiceImpl.java
@@ -1,27 +1,38 @@
 package com.yovinchen.xlcs.acl.service.impl;
 
-import com.yovinchen.xlcs.acl.mapper.PermissionMapper;
-import com.yovinchen.xlcs.acl.service.PermissionService;
-import com.yovinchen.xlcs.acl.utils.PermissionHelper;
-import com.yovinchen.xlcs.model.acl.Permission;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yovinchen.xlcs.acl.mapper.PermissionMapper;
+import com.yovinchen.xlcs.acl.service.PermissionService;
+import com.yovinchen.xlcs.acl.service.RolePermissionService;
+import com.yovinchen.xlcs.acl.utils.PermissionHelper;
+import com.yovinchen.xlcs.model.acl.Permission;
+import com.yovinchen.xlcs.model.acl.RolePermission;
+import com.yovinchen.xlcs.model.base.BaseEntity;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * ClassName: PermissionServiceImpl
  * Package: com.yovinchen.xlcs.acl.service.impl
  *
  * @author yovinchen
- * @Create 2023/9/14 14:02
+ * @since 2023/9/14 14:02
  */
 @Service
 public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permission> implements PermissionService {
 
+    @Autowired
+    private RolePermissionService rolePermissionService;
 
     /**
      * 获取所有菜单
@@ -57,6 +68,71 @@ public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permiss
         return null;
     }
 
+    /**
+     * 分配菜单
+     *
+     * @param roleId
+     * @param permissionIds
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveRolePermissionRealtionShip(Long roleId, Long[] permissionIds) {
+        //删除用户分配的角色数据
+        rolePermissionService.remove(new LambdaQueryWrapper<RolePermission>().eq(RolePermission::getRoleId, roleId));
+
+        //分配新的角色
+        List<RolePermission> rolePermissionList = new ArrayList<>();
+        for (Long permissionId : permissionIds) {
+            if (StringUtils.isEmpty(roleId)) {
+                continue;
+            }
+            RolePermission rolePermission = new RolePermission();
+            rolePermission.setRoleId(roleId);
+            rolePermission.setPermissionId(permissionId);
+            rolePermissionList.add(rolePermission);
+        }
+        rolePermissionService.saveBatch(rolePermissionList);
+    }
+
+    /**
+     * 根据用户获取菜单数据
+     *
+     * @param roleId
+     * @return
+     */
+    @Override
+    public Map<String, Object> findPermissionByRoleId(Long roleId) {
+        //查询所有的角色
+        List<Permission> allPermissionList = queryAllMenu();
+        List<Permission> assignPermission1 = baseMapper.selectList(null);
+
+        //拥有的角色id
+        List<RolePermission> existRolePermissionList = rolePermissionService.list(new LambdaQueryWrapper<RolePermission>().eq(RolePermission::getRoleId, roleId)
+                .select(RolePermission::getPermissionId));
+
+        List<Long> existPermissionList = existRolePermissionList.stream()
+                .map(RolePermission::getPermissionId)
+                .collect(Collectors.toList());
+
+        //对角色进行分类
+        List<Permission> assignPermission2 = new ArrayList<>();
+        for (Permission permission : assignPermission1) {
+            //已分配
+            if (existPermissionList.contains(permission.getId())) {
+                assignPermission2.add(permission);
+            }
+        }
+        List<Long> assignPermission = assignPermission2.stream()
+                .map(BaseEntity::getId)
+                .collect(Collectors.toList());
+
+        Map<String, Object> roleMap = new HashMap<>();
+        roleMap.put("assignPermission", assignPermission);
+        roleMap.put("allPermissionList", allPermissionList);
+        return roleMap;
+    }
+
+
     /**
      * 递归获取子节点
      *
@@ -64,8 +140,7 @@ public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permiss
      * @param idList
      */
     private void selectChildListById(Long id, List<Long> idList) {
-        List<Permission> childList = baseMapper.selectList(new QueryWrapper<Permission>()
-                .eq("pid", id)
+        List<Permission> childList = baseMapper.selectList(new QueryWrapper<Permission>().eq("pid", id)
                 .select("id"));
         childList.forEach(item -> {
             idList.add(item.getId());
diff --git a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/impl/RoleServiceImpl.java b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/impl/RoleServiceImpl.java
index b4a375b..e47b62c 100644
--- a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/impl/RoleServiceImpl.java
+++ b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/impl/RoleServiceImpl.java
@@ -1,16 +1,16 @@
 package com.yovinchen.xlcs.acl.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yovinchen.xlcs.acl.mapper.RoleMapper;
 import com.yovinchen.xlcs.acl.service.AdminRoleService;
 import com.yovinchen.xlcs.acl.service.RoleService;
 import com.yovinchen.xlcs.model.acl.AdminRole;
 import com.yovinchen.xlcs.model.acl.Role;
 import com.yovinchen.xlcs.vo.acl.RoleQueryVo;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -28,7 +28,7 @@ import java.util.stream.Collectors;
  * 角色管理
  *
  * @author yovinchen
- * @Create 2023/9/14 09:11
+ * @since 2023/9/14 09:11
  */
 @Service
 public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements RoleService {
diff --git a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/utils/PermissionHelper.java b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/utils/PermissionHelper.java
index 4b4ddd2..501d353 100644
--- a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/utils/PermissionHelper.java
+++ b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/utils/PermissionHelper.java
@@ -10,7 +10,7 @@ import java.util.List;
  * Package: com.yovinchen.xlcs.acl.utils
  *
  * @author yovinchen
- * @Create 2023/9/14 14:23
+ * @since 2023/9/14 14:23
  */
 public class PermissionHelper {
 
diff --git a/xlcs-parent/service/service-activity/src/main/java/com/yovinchen/xlcs/ServiceActivityApplication.java b/xlcs-parent/service/service-activity/src/main/java/com/yovinchen/xlcs/ServiceActivityApplication.java
index 2d942de..34b01ba 100644
--- a/xlcs-parent/service/service-activity/src/main/java/com/yovinchen/xlcs/ServiceActivityApplication.java
+++ b/xlcs-parent/service/service-activity/src/main/java/com/yovinchen/xlcs/ServiceActivityApplication.java
@@ -10,7 +10,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * Package: com.yovinchen.xlcs
  *
  * @author yovinchen
- * @Create 2023/9/17 12:08
+ * @since 2023/9/17 12:08
  */
 @SpringBootApplication
 @EnableDiscoveryClient
diff --git a/xlcs-parent/service/service-activity/src/main/java/com/yovinchen/xlcs/activity/api/ActivityApiController.java b/xlcs-parent/service/service-activity/src/main/java/com/yovinchen/xlcs/activity/api/ActivityApiController.java
index 689637f..0ba20a6 100644
--- a/xlcs-parent/service/service-activity/src/main/java/com/yovinchen/xlcs/activity/api/ActivityApiController.java
+++ b/xlcs-parent/service/service-activity/src/main/java/com/yovinchen/xlcs/activity/api/ActivityApiController.java
@@ -21,7 +21,7 @@ import java.util.Map;
  * Package: com.yovinchen.xlcs.activity.api
  *
  * @author yovinchen
- * @Create 2023/9/26 14:12
+ * @since 2023/9/26 14:12
  */
 @Api(tags = "促销与优惠券接口")
 @RestController
diff --git a/xlcs-parent/service/service-cart/src/main/java/com/yovinchen/xlcs/ServiceCartApplication.java b/xlcs-parent/service/service-cart/src/main/java/com/yovinchen/xlcs/ServiceCartApplication.java
index 20aabec..5456690 100644
--- a/xlcs-parent/service/service-cart/src/main/java/com/yovinchen/xlcs/ServiceCartApplication.java
+++ b/xlcs-parent/service/service-cart/src/main/java/com/yovinchen/xlcs/ServiceCartApplication.java
@@ -11,7 +11,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * Package: com.yovinchen.xlcs
  *
  * @author yovinchen
- * @Create 2023/10/8 22:26
+ * @since 2023/10/8 22:26
  */
 @SpringBootApplication(exclude = DataSourceAutoConfiguration.class)//取消数据源自动配置
 @EnableDiscoveryClient
diff --git a/xlcs-parent/service/service-cart/src/main/java/com/yovinchen/xlcs/cart/controller/CartApiController.java b/xlcs-parent/service/service-cart/src/main/java/com/yovinchen/xlcs/cart/controller/CartApiController.java
index db2a75a..25c2fc6 100644
--- a/xlcs-parent/service/service-cart/src/main/java/com/yovinchen/xlcs/cart/controller/CartApiController.java
+++ b/xlcs-parent/service/service-cart/src/main/java/com/yovinchen/xlcs/cart/controller/CartApiController.java
@@ -17,7 +17,7 @@ import java.util.List;
  * Package: com.yovinchen.xlcs.cart.cart.controller
  *
  * @author yovinchen
- * @Create 2023/10/8 22:32
+ * @since 2023/10/8 22:32
  */
 @RestController
 @RequestMapping("/api/cart")
diff --git a/xlcs-parent/service/service-cart/src/main/java/com/yovinchen/xlcs/cart/receiver/CartReceiver.java b/xlcs-parent/service/service-cart/src/main/java/com/yovinchen/xlcs/cart/receiver/CartReceiver.java
index 9aeaaf6..9b9681f 100644
--- a/xlcs-parent/service/service-cart/src/main/java/com/yovinchen/xlcs/cart/receiver/CartReceiver.java
+++ b/xlcs-parent/service/service-cart/src/main/java/com/yovinchen/xlcs/cart/receiver/CartReceiver.java
@@ -1,8 +1,8 @@
 package com.yovinchen.xlcs.cart.receiver;
 
+import com.rabbitmq.client.Channel;
 import com.yovinchen.xlcs.cart.service.CartInfoService;
 import com.yovinchen.xlcs.mq.constant.MqConst;
-import com.rabbitmq.client.Channel;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.Exchange;
 import org.springframework.amqp.rabbit.annotation.Queue;
@@ -18,7 +18,7 @@ import java.io.IOException;
  * Package: com.yovinchen.xlcs.cart.cart.receiver
  *
  * @author yovinchen
- * @Create 2023/10/13 08:56
+ * @since 2023/10/13 08:56
  */
 @Component
 public class CartReceiver {
diff --git a/xlcs-parent/service/service-cart/src/main/java/com/yovinchen/xlcs/cart/service/CartInfoService.java b/xlcs-parent/service/service-cart/src/main/java/com/yovinchen/xlcs/cart/service/CartInfoService.java
index eb87864..daab837 100644
--- a/xlcs-parent/service/service-cart/src/main/java/com/yovinchen/xlcs/cart/service/CartInfoService.java
+++ b/xlcs-parent/service/service-cart/src/main/java/com/yovinchen/xlcs/cart/service/CartInfoService.java
@@ -9,7 +9,7 @@ import java.util.List;
  * Package: com.yovinchen.xlcs.cart.cart.service
  *
  * @author yovinchen
- * @Create 2023/10/8 22:33
+ * @since 2023/10/8 22:33
  */
 public interface CartInfoService {
     /**
diff --git a/xlcs-parent/service/service-cart/src/main/java/com/yovinchen/xlcs/cart/service/impl/CartInfoServiceImpl.java b/xlcs-parent/service/service-cart/src/main/java/com/yovinchen/xlcs/cart/service/impl/CartInfoServiceImpl.java
index 40f25ca..d9142aa 100644
--- a/xlcs-parent/service/service-cart/src/main/java/com/yovinchen/xlcs/cart/service/impl/CartInfoServiceImpl.java
+++ b/xlcs-parent/service/service-cart/src/main/java/com/yovinchen/xlcs/cart/service/impl/CartInfoServiceImpl.java
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
  * Package: com.yovinchen.xlcs.cart.cart.service.impl
  *
  * @author yovinchen
- * @Create 2023/10/8 22:34
+ * @since 2023/10/8 22:34
  */
 @Service
 public class CartInfoServiceImpl implements CartInfoService {
diff --git a/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/ServiceHomeApplication.java b/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/ServiceHomeApplication.java
index 61d520f..2433c9b 100644
--- a/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/ServiceHomeApplication.java
+++ b/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/ServiceHomeApplication.java
@@ -11,7 +11,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * Package: com.yovinchen.xlcs
  *
  * @author yovinchen
- * @Create 2023/9/25 12:06
+ * @since 2023/9/25 12:06
  */
 @SpringBootApplication(exclude = DataSourceAutoConfiguration.class)//取消数据源自动配置
 @EnableDiscoveryClient
diff --git a/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/home/config/ThreadPoolConfig.java b/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/home/config/ThreadPoolConfig.java
index fcbbbcf..a355eff 100644
--- a/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/home/config/ThreadPoolConfig.java
+++ b/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/home/config/ThreadPoolConfig.java
@@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit;
  * Package: com.yovinchen.xlcs.home.config
  *
  * @author yovinchen
- * @Create 2023/10/8 14:47
+ * @since 2023/10/8 14:47
  */
 
 @Configuration
diff --git a/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/home/controller/HomeApiController.java b/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/home/controller/HomeApiController.java
index 0609f21..cc16e33 100644
--- a/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/home/controller/HomeApiController.java
+++ b/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/home/controller/HomeApiController.java
@@ -22,7 +22,7 @@ import java.util.Map;
  * Package: com.yovinchen.xlcs.home.controller
  *
  * @author yovinchen
- * @Create 2023/9/25 12:10
+ * @since 2023/9/25 12:10
  */
 
 @Api(tags = "首页接口")
diff --git a/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/home/service/HomeService.java b/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/home/service/HomeService.java
index 8a418f7..ce1ea12 100644
--- a/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/home/service/HomeService.java
+++ b/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/home/service/HomeService.java
@@ -7,7 +7,7 @@ import java.util.Map;
  * Package: com.yovinchen.xlcs.home.service
  *
  * @author yovinchen
- * @Create 2023/9/25 12:12
+ * @since 2023/9/25 12:12
  */
 public interface HomeService {
     /**
diff --git a/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/home/service/ItemService.java b/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/home/service/ItemService.java
index a1fa432..fe8ebb0 100644
--- a/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/home/service/ItemService.java
+++ b/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/home/service/ItemService.java
@@ -7,7 +7,7 @@ import java.util.Map;
  * Package: com.yovinchen.xlcs.home.service
  *
  * @author yovinchen
- * @Create 2023/10/7 15:01
+ * @since 2023/10/7 15:01
  */
 public interface ItemService {
     /**
diff --git a/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/home/service/impl/HomeServiceImpl.java b/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/home/service/impl/HomeServiceImpl.java
index c6e201c..12bb205 100644
--- a/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/home/service/impl/HomeServiceImpl.java
+++ b/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/home/service/impl/HomeServiceImpl.java
@@ -20,7 +20,7 @@ import java.util.Map;
  * Package: com.yovinchen.xlcs.home.service.impl
  *
  * @author yovinchen
- * @Create 2023/9/25 12:12
+ * @since 2023/9/25 12:12
  */
 @Service
 public class HomeServiceImpl implements HomeService {
diff --git a/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/home/service/impl/ItemServiceImpl.java b/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/home/service/impl/ItemServiceImpl.java
index 038ac2b..2a3e878 100644
--- a/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/home/service/impl/ItemServiceImpl.java
+++ b/xlcs-parent/service/service-home/src/main/java/com/yovinchen/xlcs/home/service/impl/ItemServiceImpl.java
@@ -19,7 +19,7 @@ import java.util.concurrent.ThreadPoolExecutor;
  * Package: com.yovinchen.xlcs.home.service.impl
  *
  * @author yovinchen
- * @Create 2023/10/7 15:02
+ * @since 2023/10/7 15:02
  */
 @Service
 public class ItemServiceImpl implements ItemService {
diff --git a/xlcs-parent/service/service-order/src/main/java/com/yovinchen/xlcs/ServiceOrderApplication.java b/xlcs-parent/service/service-order/src/main/java/com/yovinchen/xlcs/ServiceOrderApplication.java
index 9d11e2f..958d586 100644
--- a/xlcs-parent/service/service-order/src/main/java/com/yovinchen/xlcs/ServiceOrderApplication.java
+++ b/xlcs-parent/service/service-order/src/main/java/com/yovinchen/xlcs/ServiceOrderApplication.java
@@ -10,7 +10,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * Package: com.yovinchen.xlcs
  *
  * @author yovinchen
- * @Create 2023/10/11 19:09
+ * @since 2023/10/11 19:09
  */
 @SpringBootApplication
 @EnableDiscoveryClient
diff --git a/xlcs-parent/service/service-order/src/main/java/com/yovinchen/xlcs/order/receiver/OrderReceiver.java b/xlcs-parent/service/service-order/src/main/java/com/yovinchen/xlcs/order/receiver/OrderReceiver.java
index c9f9500..26ab397 100644
--- a/xlcs-parent/service/service-order/src/main/java/com/yovinchen/xlcs/order/receiver/OrderReceiver.java
+++ b/xlcs-parent/service/service-order/src/main/java/com/yovinchen/xlcs/order/receiver/OrderReceiver.java
@@ -1,8 +1,8 @@
 package com.yovinchen.xlcs.order.receiver;
 
+import com.rabbitmq.client.Channel;
 import com.yovinchen.xlcs.mq.constant.MqConst;
 import com.yovinchen.xlcs.order.service.OrderInfoService;
-import com.rabbitmq.client.Channel;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.Exchange;
 import org.springframework.amqp.rabbit.annotation.Queue;
@@ -19,7 +19,7 @@ import java.io.IOException;
  * Package: com.yovinchen.xlcs.order.receiver
  *
  * @author yovinchen
- * @Create 2023/10/13 14:15
+ * @since 2023/10/13 14:15
  */
 @Component
 public class OrderReceiver {
diff --git a/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/ServicePaymentApplication.java b/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/ServicePaymentApplication.java
index 5f6b17e..860a2c1 100644
--- a/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/ServicePaymentApplication.java
+++ b/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/ServicePaymentApplication.java
@@ -10,7 +10,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * Package: vom.yovinchen.xlcs
  *
  * @author yovinchen
- * @Create 2023/10/13 10:29
+ * @since 2023/10/13 10:29
  */
 @SpringBootApplication
 @EnableDiscoveryClient
diff --git a/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/payment/controller/WeiXinController.java b/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/payment/controller/WeiXinController.java
index 8db277a..2db3b43 100644
--- a/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/payment/controller/WeiXinController.java
+++ b/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/payment/controller/WeiXinController.java
@@ -21,7 +21,7 @@ import java.util.Map;
  * 微信支付API
  *
  * @author yovinchen
- * @Create 2023/10/13 10:32
+ * @since 2023/10/13 10:32
  */
 @Api(tags = "微信支付接口")
 @RestController
diff --git a/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/payment/service/PaymentInfoService.java b/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/payment/service/PaymentInfoService.java
index 6e8601f..fae0948 100644
--- a/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/payment/service/PaymentInfoService.java
+++ b/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/payment/service/PaymentInfoService.java
@@ -1,7 +1,7 @@
 package com.yovinchen.xlcs.payment.service;
 
-import com.yovinchen.xlcs.model.order.PaymentInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yovinchen.xlcs.model.order.PaymentInfo;
 
 import java.util.Map;
 
@@ -10,7 +10,7 @@ import java.util.Map;
  * Package: com.yovinchen.xlcs.payment.payment.service
  *
  * @author yovinchen
- * @Create 2023/10/13 10:33
+ * @since 2023/10/13 10:33
  */
 
 public interface PaymentInfoService extends IService<PaymentInfo> {
diff --git a/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/payment/service/WeixinService.java b/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/payment/service/WeixinService.java
index ceb79f6..8f8723a 100644
--- a/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/payment/service/WeixinService.java
+++ b/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/payment/service/WeixinService.java
@@ -7,7 +7,7 @@ import java.util.Map;
  * Package: com.yovinchen.xlcs.payment.payment.controller.payment.service
  *
  * @author yovinchen
- * @Create 2023/10/13 10:32
+ * @since 2023/10/13 10:32
  */
 public interface WeixinService {
     /**
diff --git a/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/payment/service/impl/WeXinServiceImpl.java b/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/payment/service/impl/WeXinServiceImpl.java
index d094bb7..50875a8 100644
--- a/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/payment/service/impl/WeXinServiceImpl.java
+++ b/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/payment/service/impl/WeXinServiceImpl.java
@@ -1,5 +1,6 @@
 package com.yovinchen.xlcs.payment.service.impl;
 
+import com.github.wxpay.sdk.WXPayUtil;
 import com.yovinchen.xlcs.common.constant.RedisConst;
 import com.yovinchen.xlcs.model.order.PaymentInfo;
 import com.yovinchen.xlcs.payment.service.PaymentInfoService;
@@ -7,7 +8,6 @@ import com.yovinchen.xlcs.payment.service.WeixinService;
 import com.yovinchen.xlcs.payment.utils.ConstantPropertiesUtils;
 import com.yovinchen.xlcs.payment.utils.HttpClient;
 import com.yovinchen.xlcs.vo.user.UserLoginVo;
-import com.github.wxpay.sdk.WXPayUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
@@ -23,7 +23,7 @@ import java.util.Map;
  * Package: com.yovinchen.xlcs.payment.payment.service.impl
  *
  * @author yovinchen
- * @Create 2023/10/13 10:33
+ * @since 2023/10/13 10:33
  */
 @Service
 public class WeXinServiceImpl implements WeixinService {
diff --git a/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/payment/utils/ConstantPropertiesUtils.java b/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/payment/utils/ConstantPropertiesUtils.java
index 8e838f2..b429f5f 100644
--- a/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/payment/utils/ConstantPropertiesUtils.java
+++ b/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/payment/utils/ConstantPropertiesUtils.java
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
  * Package: com.yovinchen.xlcs.payment.payment.utils
  *
  * @author yovinchen
- * @Create 2023/10/13 10:48
+ * @since 2023/10/13 10:48
  */
 @Component
 public class ConstantPropertiesUtils implements InitializingBean {
diff --git a/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/payment/utils/HttpClient.java b/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/payment/utils/HttpClient.java
index 0625d76..07d4a8d 100644
--- a/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/payment/utils/HttpClient.java
+++ b/xlcs-parent/service/service-payment/src/main/java/com/yovinchen/xlcs/payment/utils/HttpClient.java
@@ -33,7 +33,7 @@ import java.util.Map;
  * Package: com.yovinchen.xlcs.payment.payment.utils
  *
  * @author yovinchen
- * @Create 2023/10/13 10:47
+ * @since 2023/10/13 10:47
  */
 public class HttpClient {
 
diff --git a/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/ServiceProductApplication.java b/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/ServiceProductApplication.java
index 793d1c0..27c1c5f 100644
--- a/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/ServiceProductApplication.java
+++ b/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/ServiceProductApplication.java
@@ -9,7 +9,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
  * Package: com.yovinchen.xlcs
  *
  * @author yovinchen
- * @Create 2023/9/15 09:47
+ * @since 2023/9/15 09:47
  */
 @SpringBootApplication
 @EnableDiscoveryClient
diff --git a/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/api/ProductInnnerController.java b/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/api/ProductInnnerController.java
index a943a5c..2566957 100644
--- a/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/api/ProductInnnerController.java
+++ b/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/api/ProductInnnerController.java
@@ -17,7 +17,7 @@ import java.util.List;
  * Package: com.yovinchen.xlcs.product.api
  *
  * @author yovinchen
- * @Create 2023/9/16 17:28
+ * @since 2023/9/16 17:28
  */
 @RestController
 @RequestMapping("api/product")
diff --git a/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/controller/FileUploadController.java b/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/controller/FileUploadController.java
index 29a347f..db93d3f 100644
--- a/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/controller/FileUploadController.java
+++ b/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/controller/FileUploadController.java
@@ -15,7 +15,7 @@ import org.springframework.web.multipart.MultipartFile;
  * Package: com.yovinchen.xlcs.product.controller
  *
  * @author yovinchen
- * @Create 2023/9/15 13:56
+ * @since 2023/9/15 13:56
  */
 @Api(tags = "文件上传接口")
 @RestController
diff --git a/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/receiver/StockReceiver.java b/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/receiver/StockReceiver.java
index ba92bc6..e0bc6ed 100644
--- a/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/receiver/StockReceiver.java
+++ b/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/receiver/StockReceiver.java
@@ -1,8 +1,8 @@
 package com.yovinchen.xlcs.product.receiver;
 
+import com.rabbitmq.client.Channel;
 import com.yovinchen.xlcs.mq.constant.MqConst;
 import com.yovinchen.xlcs.product.service.SkuInfoService;
-import com.rabbitmq.client.Channel;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.Exchange;
 import org.springframework.amqp.rabbit.annotation.Queue;
@@ -19,7 +19,7 @@ import java.io.IOException;
  * Package: com.yovinchen.xlcs.product.receiver
  *
  * @author yovinchen
- * @Create 2023/10/13 15:05
+ * @since 2023/10/13 15:05
  */
 @Component
 public class StockReceiver {
diff --git a/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/service/FileUploadService.java b/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/service/FileUploadService.java
index 2cfba82..03ecd1e 100644
--- a/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/service/FileUploadService.java
+++ b/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/service/FileUploadService.java
@@ -7,7 +7,7 @@ import org.springframework.web.multipart.MultipartFile;
  * Package: com.yovinchen.xlcs.product.service
  *
  * @author yovinchen
- * @Create 2023/9/15 13:57
+ * @since 2023/9/15 13:57
  */
 public interface FileUploadService {
     String fileUpload(MultipartFile file) throws Exception;
diff --git a/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/service/impl/FileUploadServiceImpl.java b/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/service/impl/FileUploadServiceImpl.java
index 3755579..099e64c 100644
--- a/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/service/impl/FileUploadServiceImpl.java
+++ b/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/service/impl/FileUploadServiceImpl.java
@@ -16,7 +16,7 @@ import java.util.UUID;
  * Package: com.yovinchen.xlcs.product.service.impl
  *
  * @author yovinchen
- * @Create 2023/9/15 13:57
+ * @since 2023/9/15 13:57
  */
 @Service
 public class FileUploadServiceImpl implements FileUploadService {
diff --git a/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/utils/FileUploader.java b/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/utils/FileUploader.java
index a9c2b0a..33fca6c 100644
--- a/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/utils/FileUploader.java
+++ b/xlcs-parent/service/service-product/src/main/java/com/yovinchen/xlcs/product/utils/FileUploader.java
@@ -15,7 +15,7 @@ import java.security.NoSuchAlgorithmException;
  * Package: com.yovinchen.xlcs.product.utils
  *
  * @author yovinchen
- * @Create 2023/10/13 17:55
+ * @since 2023/10/13 17:55
  */
 public class FileUploader {
 
diff --git a/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/ServiceSearchApplication.java b/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/ServiceSearchApplication.java
index 87af0bd..4fbaaab 100644
--- a/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/ServiceSearchApplication.java
+++ b/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/ServiceSearchApplication.java
@@ -11,7 +11,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * Package: com.yovinchen.xlcs
  *
  * @author yovinchen
- * @Create 2023/9/16 17:20
+ * @since 2023/9/16 17:20
  */
 @SpringBootApplication(exclude = DataSourceAutoConfiguration.class)//取消数据源自动配置
 @EnableDiscoveryClient
diff --git a/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/search/api/SearchApiController.java b/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/search/api/SearchApiController.java
index 0facf21..af4d464 100644
--- a/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/search/api/SearchApiController.java
+++ b/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/search/api/SearchApiController.java
@@ -5,7 +5,7 @@ package com.yovinchen.xlcs.search.api;
  * Package: com.yovinchen.xlcs.search.api
  *
  * @author yovinchen
- * @Create 2023/9/26 14:21
+ * @since 2023/9/26 14:21
  */
 public class SearchApiController {
 }
diff --git a/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/search/controller/SkuApiController.java b/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/search/controller/SkuApiController.java
index b9a3999..d50d3ca 100644
--- a/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/search/controller/SkuApiController.java
+++ b/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/search/controller/SkuApiController.java
@@ -22,7 +22,7 @@ import java.util.List;
  * Package: com.yovinchen.xlcs.search.controller
  *
  * @author yovinchen
- * @Create 2023/9/16 17:22
+ * @since 2023/9/16 17:22
  */
 @RestController
 @RequestMapping("api/search/sku")
diff --git a/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/search/receiver/SkuReceiver.java b/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/search/receiver/SkuReceiver.java
index c9286c8..0b89270 100644
--- a/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/search/receiver/SkuReceiver.java
+++ b/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/search/receiver/SkuReceiver.java
@@ -1,8 +1,8 @@
 package com.yovinchen.xlcs.search.receiver;
 
+import com.rabbitmq.client.Channel;
 import com.yovinchen.xlcs.mq.constant.MqConst;
 import com.yovinchen.xlcs.search.service.SkuService;
-import com.rabbitmq.client.Channel;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.Exchange;
 import org.springframework.amqp.rabbit.annotation.Queue;
@@ -18,7 +18,7 @@ import java.io.IOException;
  * Package: com.yovinchen.xlcs.search.receiver
  *
  * @author yovinchen
- * @Create 2023/9/16 23:57
+ * @since 2023/9/16 23:57
  */
 @Component
 public class SkuReceiver {
diff --git a/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/search/repository/SkuRepository.java b/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/search/repository/SkuRepository.java
index b26f38f..26cf273 100644
--- a/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/search/repository/SkuRepository.java
+++ b/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/search/repository/SkuRepository.java
@@ -11,7 +11,7 @@ import org.springframework.data.elasticsearch.repository.ElasticsearchRepository
  * Package: com.yovinchen.xlcs.search.repository
  *
  * @author yovinchen
- * @Create 2023/9/16 17:24
+ * @since 2023/9/16 17:24
  */
 public interface SkuRepository extends ElasticsearchRepository<SkuEs, Long> {
     //获取爆款商品
diff --git a/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/search/service/SkuService.java b/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/search/service/SkuService.java
index 97ff2d8..e1e723a 100644
--- a/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/search/service/SkuService.java
+++ b/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/search/service/SkuService.java
@@ -13,7 +13,7 @@ import java.util.List;
  * Package: com.yovinchen.xlcs.search.service
  *
  * @author yovinchen
- * @Create 2023/9/16 17:23
+ * @since 2023/9/16 17:23
  */
 
 @Service
diff --git a/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/search/service/impl/SkuServiceImpl.java b/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/search/service/impl/SkuServiceImpl.java
index e4968c9..61652c3 100644
--- a/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/search/service/impl/SkuServiceImpl.java
+++ b/xlcs-parent/service/service-search/src/main/java/com/yovinchen/xlcs/search/service/impl/SkuServiceImpl.java
@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
  * Package: com.yovinchen.xlcs.search.service.impl
  *
  * @author yovinchen
- * @Create 2023/9/16 17:23
+ * @since 2023/9/16 17:23
  */
 @Slf4j
 @Service
diff --git a/xlcs-parent/service/service-sys/src/main/java/com/yovinchen/xlcs/ServiceSysApplication.java b/xlcs-parent/service/service-sys/src/main/java/com/yovinchen/xlcs/ServiceSysApplication.java
index 516fc2d..7fc2dbb 100644
--- a/xlcs-parent/service/service-sys/src/main/java/com/yovinchen/xlcs/ServiceSysApplication.java
+++ b/xlcs-parent/service/service-sys/src/main/java/com/yovinchen/xlcs/ServiceSysApplication.java
@@ -9,7 +9,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
  * Package: com.yovinchen.xlcs.sys
  *
  * @author yovinchen
- * @Create 2023/9/14 15:36
+ * @since 2023/9/14 15:36
  */
 @SpringBootApplication
 @EnableDiscoveryClient
diff --git a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/ServiceUserApplication.java b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/ServiceUserApplication.java
index d1e2d89..8572f6d 100644
--- a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/ServiceUserApplication.java
+++ b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/ServiceUserApplication.java
@@ -10,7 +10,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * Package: com.yovinchen.xlcs
  *
  * @author yovinchen
- * @Create 2023/9/22 15:39
+ * @since 2023/9/22 15:39
  */
 @SpringBootApplication
 @EnableDiscoveryClient
diff --git a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/api/LeaderAddressController.java b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/api/LeaderAddressController.java
index 9375b0d..79c187e 100644
--- a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/api/LeaderAddressController.java
+++ b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/api/LeaderAddressController.java
@@ -16,7 +16,7 @@ import javax.annotation.Resource;
  * Package: com.yovinchen.xlcs.user.api
  *
  * @author yovinchen
- * @Create 2023/9/25 12:23
+ * @since 2023/9/25 12:23
  */
 @Api(tags = "配送员接口")
 @RestController
diff --git a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/controller/WeixinApiController.java b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/controller/WeixinApiController.java
index 0d2f4ef..ee93a2c 100644
--- a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/controller/WeixinApiController.java
+++ b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/controller/WeixinApiController.java
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*;
  * Package: com.yovinchen.xlcs.user.controller
  *
  * @author yovinchen
- * @Create 2023/9/22 16:23
+ * @since 2023/9/22 16:23
  */
 @RestController
 @RequestMapping("api/user/weixin")
diff --git a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/mapper/LeaderMapper.java b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/mapper/LeaderMapper.java
index b1527b2..a520f6a 100644
--- a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/mapper/LeaderMapper.java
+++ b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/mapper/LeaderMapper.java
@@ -1,7 +1,7 @@
 package com.yovinchen.xlcs.user.mapper;
 
-import com.yovinchen.xlcs.model.user.Leader;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yovinchen.xlcs.model.user.Leader;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository;
  * Package: com.yovinchen.xlcs.user.mapper
  *
  * @author yovinchen
- * @Create 2023/9/22 16:57
+ * @since 2023/9/22 16:57
  */
 @Repository
 public interface LeaderMapper extends BaseMapper<Leader> {
diff --git a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/mapper/UserDeliveryMapper.java b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/mapper/UserDeliveryMapper.java
index c394b21..804a69a 100644
--- a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/mapper/UserDeliveryMapper.java
+++ b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/mapper/UserDeliveryMapper.java
@@ -1,7 +1,7 @@
 package com.yovinchen.xlcs.user.mapper;
 
-import com.yovinchen.xlcs.model.user.UserDelivery;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yovinchen.xlcs.model.user.UserDelivery;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository;
  * Package: com.yovinchen.xlcs.user.mapper
  *
  * @author yovinchen
- * @Create 2023/9/22 16:57
+ * @since 2023/9/22 16:57
  */
 @Repository
 public interface UserDeliveryMapper extends BaseMapper<UserDelivery> {
diff --git a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/mapper/UserMapper.java b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/mapper/UserMapper.java
index bf98b98..416fe74 100644
--- a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/mapper/UserMapper.java
+++ b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/mapper/UserMapper.java
@@ -1,7 +1,7 @@
 package com.yovinchen.xlcs.user.mapper;
 
-import com.yovinchen.xlcs.model.user.User;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yovinchen.xlcs.model.user.User;
 import org.springframework.stereotype.Repository;
 
 
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository;
  * Package: com.yovinchen.xlcs.user.mapper
  *
  * @author yovinchen
- * @Create 2023/9/22 16:50
+ * @since 2023/9/22 16:50
  */
 @Repository
 public interface UserMapper extends BaseMapper<User> {
diff --git a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/LoginWxService.java b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/LoginWxService.java
index 24002ab..65f6dc5 100644
--- a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/LoginWxService.java
+++ b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/LoginWxService.java
@@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit;
  * Package: com.yovinchen.xlcs.user.service
  *
  * @author yovinchen
- * @Create 2023/9/22 17:08
+ * @since 2023/9/22 17:08
  */
 @Service
 public class LoginWxService {
diff --git a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/UserService.java b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/UserService.java
index 7a98709..4f694b2 100644
--- a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/UserService.java
+++ b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/UserService.java
@@ -1,16 +1,16 @@
 package com.yovinchen.xlcs.user.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yovinchen.xlcs.model.user.User;
 import com.yovinchen.xlcs.vo.user.LeaderAddressVo;
 import com.yovinchen.xlcs.vo.user.UserLoginVo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * ClassName: UserService
  * Package: com.yovinchen.xlcs.user.service
  *
  * @author yovinchen
- * @Create 2023/9/22 16:33
+ * @since 2023/9/22 16:33
  */
 public interface UserService extends IService<User> {
     /**
diff --git a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/impl/UserServiceImpl.java b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/impl/UserServiceImpl.java
index 1326946..70311fd 100644
--- a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/impl/UserServiceImpl.java
+++ b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/service/impl/UserServiceImpl.java
@@ -1,5 +1,7 @@
 package com.yovinchen.xlcs.user.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yovinchen.xlcs.common.auth.AuthContextHolder;
 import com.yovinchen.xlcs.model.user.Leader;
 import com.yovinchen.xlcs.model.user.User;
@@ -10,8 +12,6 @@ import com.yovinchen.xlcs.user.mapper.UserMapper;
 import com.yovinchen.xlcs.user.service.UserService;
 import com.yovinchen.xlcs.vo.user.LeaderAddressVo;
 import com.yovinchen.xlcs.vo.user.UserLoginVo;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Service;
  * Package: com.yovinchen.xlcs.user.service.impl
  *
  * @author yovinchen
- * @Create 2023/9/22 16:34
+ * @since 2023/9/22 16:34
  */
 @Service
 public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
diff --git a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/utils/ConstantPropertiesUtil.java b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/utils/ConstantPropertiesUtil.java
index 25d4607..9982de2 100644
--- a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/utils/ConstantPropertiesUtil.java
+++ b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/utils/ConstantPropertiesUtil.java
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
  * Package: com.yovinchen.xlcs.user.utils
  *
  * @author yovinchen
- * @Create 2023/9/22 16:19
+ * @since 2023/9/22 16:19
  */
 @Component
 public class ConstantPropertiesUtil implements InitializingBean {
diff --git a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/utils/HttpClientUtils.java b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/utils/HttpClientUtils.java
index fafa124..6a83e09 100644
--- a/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/utils/HttpClientUtils.java
+++ b/xlcs-parent/service/service-user/src/main/java/com/yovinchen/xlcs/user/utils/HttpClientUtils.java
@@ -44,7 +44,7 @@ import java.util.Set;
  * Package: com.yovinchen.xlcs.user.utils
  *
  * @author yovinchen
- * @Create 2023/9/22 16:20
+ * @since 2023/9/22 16:20
  */
 public class HttpClientUtils {
 
diff --git a/xlcs-user/unpackage/dist/dev/mp-weixin/common/vendor.js b/xlcs-user/unpackage/dist/dev/mp-weixin/common/vendor.js
index 109671a..f5f301d 100644
--- a/xlcs-user/unpackage/dist/dev/mp-weixin/common/vendor.js
+++ b/xlcs-user/unpackage/dist/dev/mp-weixin/common/vendor.js
@@ -22187,7 +22187,6 @@ function type2icon() {
   // 如果非预置值,默认为success
   if (['primary', 'info', 'error', 'warning', 'success'].indexOf(type) == -1) type = 'success';
   var iconName = '';
-  // 目前(2019-12-12),info和primary使用同一个图标
   switch (type) {
     case 'primary':
       iconName = 'info-circle';