diff --git a/yudao-module-mall/yudao-module-coupon-biz/pom.xml b/yudao-module-mall/yudao-module-coupon-biz/pom.xml
index eda16bd16..225c24d4e 100644
--- a/yudao-module-mall/yudao-module-coupon-biz/pom.xml
+++ b/yudao-module-mall/yudao-module-coupon-biz/pom.xml
@@ -30,10 +30,6 @@
cn.iocoder.boot
yudao-spring-boot-starter-biz-operatelog
-
- cn.iocoder.boot
- yudao-spring-boot-starter-biz-tenant
-
@@ -42,7 +38,7 @@
cn.iocoder.boot
- yudao-spring-boot-starter-excel
+ yudao-spring-boot-starter-security
@@ -57,6 +53,12 @@
yudao-spring-boot-starter-test
+
+
+ cn.iocoder.boot
+ yudao-spring-boot-starter-excel
+
+
-
\ No newline at end of file
+
diff --git a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/coupon/CouponServiceImpl.java b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/coupon/CouponServiceImpl.java
index 0a1737a31..14f3cacc4 100644
--- a/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/coupon/CouponServiceImpl.java
+++ b/yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/service/coupon/CouponServiceImpl.java
@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.coupon.dal.dataobject.CouponTemplete.CouponTempleteDO;
import cn.iocoder.yudao.module.coupon.dal.mysql.CouponTemplete.CouponTempleteMapper;
-import io.micrometer.core.instrument.Counter;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
diff --git a/yudao-module-mall/yudao-module-market-biz/pom.xml b/yudao-module-mall/yudao-module-market-biz/pom.xml
index e7fa33e9d..e3f9f0670 100644
--- a/yudao-module-mall/yudao-module-market-biz/pom.xml
+++ b/yudao-module-mall/yudao-module-market-biz/pom.xml
@@ -34,16 +34,16 @@
cn.iocoder.boot
yudao-spring-boot-starter-biz-weixin
-
- cn.iocoder.boot
- yudao-spring-boot-starter-biz-tenant
-
cn.iocoder.boot
yudao-spring-boot-starter-web
+
+ cn.iocoder.boot
+ yudao-spring-boot-starter-security
+
@@ -56,6 +56,12 @@
cn.iocoder.boot
yudao-spring-boot-starter-test
+
+
+
+ cn.iocoder.boot
+ yudao-spring-boot-starter-excel
+
diff --git a/yudao-module-mall/yudao-module-product-biz/pom.xml b/yudao-module-mall/yudao-module-product-biz/pom.xml
index bb9a36f94..e89ed105e 100644
--- a/yudao-module-mall/yudao-module-product-biz/pom.xml
+++ b/yudao-module-mall/yudao-module-product-biz/pom.xml
@@ -29,10 +29,6 @@
cn.iocoder.boot
yudao-spring-boot-starter-biz-operatelog
-
- cn.iocoder.boot
- yudao-spring-boot-starter-biz-tenant
-
@@ -41,7 +37,7 @@
cn.iocoder.boot
- yudao-spring-boot-starter-excel
+ yudao-spring-boot-starter-security
@@ -56,6 +52,11 @@
yudao-spring-boot-starter-test
+
+
+ cn.iocoder.boot
+ yudao-spring-boot-starter-excel
+
diff --git a/yudao-module-mall/yudao-module-trade-biz/pom.xml b/yudao-module-mall/yudao-module-trade-biz/pom.xml
index c9b582d93..5a8512232 100644
--- a/yudao-module-mall/yudao-module-trade-biz/pom.xml
+++ b/yudao-module-mall/yudao-module-trade-biz/pom.xml
@@ -47,10 +47,6 @@
cn.iocoder.boot
yudao-spring-boot-starter-biz-operatelog
-
- cn.iocoder.boot
- yudao-spring-boot-starter-biz-tenant
-
@@ -59,7 +55,7 @@
cn.iocoder.boot
- yudao-spring-boot-starter-excel
+ yudao-spring-boot-starter-security
@@ -73,6 +69,12 @@
cn.iocoder.boot
yudao-spring-boot-starter-test
+
+
+
+ cn.iocoder.boot
+ yudao-spring-boot-starter-excel
+
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java
index e8e200911..9813d8c0a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java
@@ -6,7 +6,6 @@ import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.*;
import cn.iocoder.yudao.module.system.convert.permission.MenuConvert;
import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO;
import cn.iocoder.yudao.module.system.service.permission.MenuService;
-import cn.iocoder.yudao.module.system.service.tenant.TenantService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
@@ -29,8 +28,6 @@ public class MenuController {
@Resource
private MenuService menuService;
- @Resource
- private TenantService tenantService;
@PostMapping("/create")
@ApiOperation("创建菜单")
diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
index e7eb34999..2136e5e4f 100644
--- a/yudao-server/src/main/resources/application-local.yaml
+++ b/yudao-server/src/main/resources/application-local.yaml
@@ -68,10 +68,10 @@ spring:
# Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优
redis:
- host: 139.9.196.247 # 地址
+ host: 127.0.0.1 # 地址
port: 6379 # 端口
database: 0 # 数据库索引
- password: 123456 # 密码,建议生产环境开启
+# password: 123456 # 密码,建议生产环境开启
jasypt:
encryptor:
diff --git a/yudao-ui-admin/src/views/bpm/group/index.vue b/yudao-ui-admin/src/views/bpm/group/index.vue
index 775aecda1..c280179da 100644
--- a/yudao-ui-admin/src/views/bpm/group/index.vue
+++ b/yudao-ui-admin/src/views/bpm/group/index.vue
@@ -127,7 +127,6 @@ export default {
pageSize: 10,
name: null,
status: null,
- tenantId: null,
createTime: []
},
// 表单参数