From b1e3fabea3e0b7f2e1885ef340fa2f0de74bca71 Mon Sep 17 00:00:00 2001 From: Loki <654612@qq.com> Date: Thu, 28 Apr 2022 23:55:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=92=8C=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=A7=84=E5=88=99=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/common/exception}/ApiCode.java | 2 +- .../common/exception}/YshopException.java | 3 +- .../config/YudaoMybatisAutoConfiguration.java | 22 ++- .../mybatis/core/dataobject}/BaseDomain.java | 2 +- .../core/handler/DefaultDBFieldHandler.java | 91 ++++++------ .../YudaoWebSecurityConfigurerAdapter.java | 2 +- .../security/core/annotations}/AuthCheck.java | 2 +- .../core/handler/GlobalExceptionHandler.java | 7 + .../config/SecurityConfiguration.java | 34 +++++ .../system/convert/auth/AuthConvert.java | 13 +- .../service/permission/MenuServiceImpl.java | 10 +- .../permission/PermissionServiceImpl.java | 4 + .../src/main/resources/application-local.yaml | 2 +- .../main/java/co/yixiang/api/ApiResult.java | 1 + .../co/yixiang/api/BusinessException.java | 4 +- .../java/co/yixiang/api/DaoException.java | 3 + .../yixiang/api/UnAuthenticatedException.java | 3 + .../co/yixiang/app/common/bean/LocalUser.java | 2 +- .../interceptor/PermissionInterceptor.java | 4 +- .../rest/AppStoreBargainController.java | 5 +- .../rest/AppStoreCombinationController.java | 5 +- .../rest/AppStoreSeckillController.java | 4 +- .../auth/rest/LetterAppAuthController.java | 5 +- .../cart/rest/StoreCartController.java | 2 +- .../modules/coupon/rest/CouponController.java | 4 +- .../modules/manage/rest/ShoperController.java | 4 +- .../order/rest/AppStoreOrderController.java | 5 +- .../rest/AppStoreProductController.java | 5 +- .../app/modules/services/AppAuthService.java | 2 +- .../services/CreatShareProductService.java | 2 +- .../modules/services/OrderSupplyService.java | 2 +- .../modules/shop/rest/IndexController.java | 2 +- .../user/rest/AppUserBillController.java | 5 +- .../user/rest/AppUserExtractController.java | 2 +- .../user/rest/AppUserRechargeController.java | 4 +- .../user/rest/LetterAppUserController.java | 2 +- .../user/rest/UserAddressController.java | 4 +- .../user/rest/UserLevelController.java | 4 +- .../rest/controller/WxMaUserController.java | 4 +- .../rest/AppStoreAfterSalesController.java | 4 +- .../exception/BadLimitRequestException.java | 4 +- .../handler/GlobalExceptionHandler.java | 130 ------------------ .../java/co/yixiang/logging/domain/Log.java | 2 +- .../activity/domain/YxStoreBargain.java | 2 +- .../activity/domain/YxStoreBargainUser.java | 2 +- .../domain/YxStoreBargainUserHelp.java | 2 +- .../activity/domain/YxStoreCombination.java | 2 +- .../activity/domain/YxStoreCoupon.java | 2 +- .../activity/domain/YxStoreCouponIssue.java | 2 +- .../domain/YxStoreCouponIssueUser.java | 2 +- .../activity/domain/YxStoreCouponUser.java | 2 +- .../modules/activity/domain/YxStorePink.java | 2 +- .../activity/domain/YxStoreSeckill.java | 4 +- .../activity/domain/YxUserExtract.java | 2 +- .../activity/rest/StoreBargainController.java | 8 +- .../rest/StoreCombinationController.java | 8 +- .../activity/rest/StoreCouponController.java | 2 +- .../rest/StoreCouponIssueUserController.java | 4 +- .../rest/StoreCouponUserController.java | 2 +- .../activity/rest/StoreSeckillController.java | 8 +- .../activity/rest/UserExtractController.java | 4 +- .../impl/YxStoreBargainServiceImpl.java | 2 +- .../impl/YxStoreBargainUserServiceImpl.java | 2 +- .../impl/YxStoreCombinationServiceImpl.java | 5 +- .../impl/YxStoreCouponIssueServiceImpl.java | 2 +- .../impl/YxStoreCouponUserServiceImpl.java | 2 +- .../service/impl/YxStorePinkServiceImpl.java | 2 +- .../impl/YxStoreSeckillServiceImpl.java | 4 +- .../impl/YxUserExtractServiceImpl.java | 2 +- .../modules/canvas/domain/StoreCanvas.java | 2 +- .../canvas/rest/StoreCanvasController.java | 2 +- .../modules/cart/domain/YxStoreCart.java | 2 +- .../service/impl/YxStoreCartServiceImpl.java | 2 +- .../category/domain/YxStoreCategory.java | 2 +- .../rest/StoreCategoryController.java | 10 +- .../customer/domain/YxStoreCustomer.java | 4 +- .../monitor/rest/BxgRedisController.java | 6 +- .../yixiang/modules/mp/domain/YxArticle.java | 2 +- .../modules/mp/domain/YxWechatTemplate.java | 2 +- .../mp/service/WeiXinSubscribeService.java | 2 +- .../modules/mp/service/WeixinPayService.java | 2 +- .../mp/service/WeixinTemplateService.java | 2 +- .../modules/order/domain/YxExpress.java | 2 +- .../modules/order/domain/YxStoreOrder.java | 2 +- .../order/rest/StoreOrderController.java | 18 +-- .../service/impl/YxStoreOrderServiceImpl.java | 2 +- .../product/domain/YxStoreProduct.java | 2 +- .../domain/YxStoreProductRelation.java | 2 +- .../product/domain/YxStoreProductReply.java | 2 +- .../product/domain/YxStoreProductRule.java | 2 +- .../product/rest/StoreProductController.java | 6 +- .../rest/StoreProductReplyController.java | 6 +- .../rest/StoreProductRuleController.java | 2 +- .../impl/YxStoreProductAttrServiceImpl.java | 3 +- .../YxStoreProductRelationServiceImpl.java | 2 +- .../impl/YxStoreProductServiceImpl.java | 2 +- .../impl/StoreAfterSalesServiceImpl.java | 2 +- .../modules/shop/domain/YxAppVersion.java | 4 +- .../modules/shop/domain/YxMaterial.java | 2 +- .../modules/shop/domain/YxMaterialGroup.java | 2 +- .../shop/domain/YxSystemAttachment.java | 2 +- .../shop/domain/YxSystemGroupData.java | 2 +- .../modules/shop/domain/YxSystemStore.java | 2 +- .../shop/domain/YxSystemStoreStaff.java | 2 +- .../shop/domain/YxSystemUserLevel.java | 2 +- .../modules/shop/rest/ExpressController.java | 8 +- .../shop/rest/SystemConfigController.java | 4 +- .../shop/rest/SystemGroupDataController.java | 8 +- .../modules/shop/vo/YxAppVersionVo.java | 3 - .../yixiang/modules/system/domain/Menu.java | 2 +- .../service/impl/BxgMenuServiceImpl.java | 3 +- .../template/domain/YxShippingTemplates.java | 2 +- .../rest/ShippingTemplatesController.java | 2 +- .../impl/YxShippingTemplatesServiceImpl.java | 2 +- .../modules/user/domain/YxSystemUserTask.java | 2 +- .../yixiang/modules/user/domain/YxUser.java | 2 +- .../modules/user/domain/YxUserAddress.java | 2 +- .../modules/user/domain/YxUserBill.java | 2 +- .../modules/user/domain/YxUserLevel.java | 2 +- .../modules/user/domain/YxUserRecharge.java | 2 +- .../modules/user/domain/YxUserSign.java | 2 +- .../modules/user/domain/YxUserTaskFinish.java | 2 +- .../modules/user/rest/MemberController.java | 10 +- .../user/rest/SystemUserLevelController.java | 8 +- .../user/rest/SystemUserTaskController.java | 8 +- .../modules/user/rest/UserBillController.java | 2 +- .../impl/YxSystemUserLevelServiceImpl.java | 2 +- .../impl/YxUserRechargeServiceImpl.java | 2 +- .../user/service/impl/YxUserServiceImpl.java | 2 +- .../service/impl/YxUserSignServiceImpl.java | 2 +- .../wechat/rest/WechatArticleController.java | 12 +- .../wechat/rest/WechatMenuController.java | 4 +- .../yixiang/tools/rest/UploadController.java | 3 +- 133 files changed, 328 insertions(+), 394 deletions(-) rename {zsw-bxg/src/main/java/co/yixiang/api => yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception}/ApiCode.java (98%) rename {zsw-bxg/src/main/java/co/yixiang/api => yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception}/YshopException.java (93%) rename {zsw-bxg/src/main/java/co/yixiang/domain => yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/dataobject}/BaseDomain.java (94%) rename {zsw-bxg/src/main/java/co/yixiang/app/common/interceptor => yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/annotations}/AuthCheck.java (92%) delete mode 100644 zsw-bxg/src/main/java/co/yixiang/handler/GlobalExceptionHandler.java diff --git a/zsw-bxg/src/main/java/co/yixiang/api/ApiCode.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/ApiCode.java similarity index 98% rename from zsw-bxg/src/main/java/co/yixiang/api/ApiCode.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/ApiCode.java index 2356fada..ab1b3c2e 100644 --- a/zsw-bxg/src/main/java/co/yixiang/api/ApiCode.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/ApiCode.java @@ -6,7 +6,7 @@ * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台） * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ -package co.yixiang.api; +package cn.iocoder.yudao.framework.common.exception; /** diff --git a/zsw-bxg/src/main/java/co/yixiang/api/YshopException.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/YshopException.java similarity index 93% rename from zsw-bxg/src/main/java/co/yixiang/api/YshopException.java rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/YshopException.java index f0adfc27..b52f0ab9 100644 --- a/zsw-bxg/src/main/java/co/yixiang/api/YshopException.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/YshopException.java @@ -6,7 +6,7 @@ * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台） * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ -package co.yixiang.api; +package cn.iocoder.yudao.framework.common.exception; import lombok.Data; @@ -32,6 +32,7 @@ public class YshopException extends RuntimeException{ public YshopException(String message) { super(message); + this.errorCode = ApiCode.FAIL.getCode(); this.message = message; } diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/config/YudaoMybatisAutoConfiguration.java b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/config/YudaoMybatisAutoConfiguration.java index 76d69431..3412ab70 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/config/YudaoMybatisAutoConfiguration.java +++ b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/config/YudaoMybatisAutoConfiguration.java @@ -3,11 +3,13 @@ package cn.iocoder.yudao.framework.mybatis.config; import cn.iocoder.yudao.framework.mybatis.core.handler.DefaultDBFieldHandler; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.provider.DynamicDataSourceProvider; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.core.config.GlobalConfig; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; +import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; @@ -34,6 +36,7 @@ import java.util.Map; lazyInitialization = "${mybatis.lazy-initialization:false}") // Mapper 懒加载，目前仅用于单元测试 }) @Configuration +@Slf4j public class YudaoMybatisAutoConfiguration { @Bean @@ -55,11 +58,7 @@ public class YudaoMybatisAutoConfiguration { MybatisSqlSessionFactoryBean factory = new MybatisSqlSessionFactoryBean(); Map map = dynamicDataSourceProvider.loadDataSources(); factory.setDataSource(map.get("master")); - GlobalConfig globalConfig = new GlobalConfig(); - globalConfig.setMetaObjectHandler(defaultMetaObjectHandler()); - factory.setPlugins(mybatisPlusInterceptor()); - factory.setGlobalConfig(globalConfig); - return factory.getObject(); + return getSqlSessionFactory(factory); } @Bean("shangcheng") @@ -67,8 +66,19 @@ public class YudaoMybatisAutoConfiguration { MybatisSqlSessionFactoryBean factory = new MybatisSqlSessionFactoryBean(); Map map = dynamicDataSourceProvider.loadDataSources(); factory.setDataSource(map.get("xiaohui")); - return factory.getObject(); + return getSqlSessionFactory(factory); + } + private SqlSessionFactory getSqlSessionFactory(MybatisSqlSessionFactoryBean factory) throws Exception { + GlobalConfig globalConfig = new GlobalConfig(); + GlobalConfig.DbConfig dbConfig = new GlobalConfig.DbConfig(); + dbConfig.setIdType(IdType.AUTO); + log.error("dbConfig:{}",dbConfig); + globalConfig.setDbConfig(dbConfig); + globalConfig.setMetaObjectHandler(defaultMetaObjectHandler()); + factory.setPlugins(mybatisPlusInterceptor()); + factory.setGlobalConfig(globalConfig); + return factory.getObject(); } } diff --git a/zsw-bxg/src/main/java/co/yixiang/domain/BaseDomain.java b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/dataobject/BaseDomain.java similarity index 94% rename from zsw-bxg/src/main/java/co/yixiang/domain/BaseDomain.java rename to yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/dataobject/BaseDomain.java index cb3ec4a3..89d5efef 100644 --- a/zsw-bxg/src/main/java/co/yixiang/domain/BaseDomain.java +++ b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/dataobject/BaseDomain.java @@ -1,4 +1,4 @@ -package co.yixiang.domain; +package cn.iocoder.yudao.framework.mybatis.core.dataobject; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/handler/DefaultDBFieldHandler.java b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/handler/DefaultDBFieldHandler.java index 2e929fca..b646413b 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/handler/DefaultDBFieldHandler.java +++ b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/handler/DefaultDBFieldHandler.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.framework.mybatis.core.handler; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; +import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; import java.sql.Timestamp; @@ -16,57 +17,61 @@ import java.util.Objects; * * @author hexiaowu */ +@Slf4j public class DefaultDBFieldHandler implements MetaObjectHandler { @Override public void insertFill(MetaObject metaObject) { - if (Objects.nonNull(metaObject) && metaObject.getOriginalObject() instanceof BaseDO) { - BaseDO baseDO = (BaseDO) metaObject.getOriginalObject(); +// if (Objects.nonNull(metaObject) && metaObject.getOriginalObject() instanceof BaseDO) { +// BaseDO baseDO = (BaseDO) metaObject.getOriginalObject(); +// +// Date current = new Date(); +// // 创建时间为空，则以当前时间为插入时间 +// if (Objects.isNull(baseDO.getCreateTime())) { +// baseDO.setCreateTime(current); +// } +// // 更新时间为空，则以当前时间为更新时间 +// if (Objects.isNull(baseDO.getUpdateTime())) { +// baseDO.setUpdateTime(current); +// } +// +// +// } - Date current = new Date(); - // 创建时间为空，则以当前时间为插入时间 - if (Objects.isNull(baseDO.getCreateTime())) { - baseDO.setCreateTime(current); - } - // 更新时间为空，则以当前时间为更新时间 - if (Objects.isNull(baseDO.getUpdateTime())) { - baseDO.setUpdateTime(current); - } + Long userId = WebFrameworkUtils.getLoginUserId(); + // 当前登录用户不为空，创建人为空，则当前登录用户为创建人 + if (metaObject.hasSetter("creator")) { + this.setFieldValByName("creator", userId.toString(), metaObject); + } - Long userId = WebFrameworkUtils.getLoginUserId(); - // 当前登录用户不为空，创建人为空，则当前登录用户为创建人 - if (Objects.nonNull(userId) && Objects.isNull(baseDO.getCreator())) { - baseDO.setCreator(userId.toString()); - } - // 当前登录用户不为空，更新人为空，则当前登录用户为更新人 - if (Objects.nonNull(userId) && Objects.isNull(baseDO.getUpdater())) { - baseDO.setUpdater(userId.toString()); - } + if (metaObject.hasSetter("updater")) { + this.setFieldValByName("updater", userId.toString(), metaObject); + } - Timestamp time=new Timestamp(System.currentTimeMillis()); - if (metaObject.hasSetter("createTime")) { - this.setFieldValByName("createTime", time, metaObject); - } - if (metaObject.hasSetter("updateTime")) { - this.setFieldValByName("updateTime", time, metaObject); - } - if (metaObject.hasSetter("createDate")) { - this.setFieldValByName("createDate", time, metaObject); - } - if (metaObject.hasSetter("updateDate")) { - this.setFieldValByName("updateDate", time, metaObject); - } - if (metaObject.hasSetter("delFlag")) { - this.setFieldValByName("delFlag", false, metaObject); - } - if (metaObject.hasSetter("isDel")) { - this.setFieldValByName("isDel", 0, metaObject); - } - if (metaObject.hasSetter("addTime")) { - String timestamp = String.valueOf(System.currentTimeMillis() / 1000); - this.setFieldValByName("addTime", Integer.valueOf(timestamp), metaObject); - } + Timestamp time=new Timestamp(System.currentTimeMillis()); + if (metaObject.hasSetter("createTime")) { + this.setFieldValByName("createTime", time, metaObject); + } + if (metaObject.hasSetter("updateTime")) { + this.setFieldValByName("updateTime", time, metaObject); + } + if (metaObject.hasSetter("createDate")) { + this.setFieldValByName("createDate", time, metaObject); } + if (metaObject.hasSetter("updateDate")) { + this.setFieldValByName("updateDate", time, metaObject); + } + if (metaObject.hasSetter("delFlag")) { + this.setFieldValByName("delFlag", false, metaObject); + } + if (metaObject.hasSetter("isDel")) { + this.setFieldValByName("isDel", 0, metaObject); + } + if (metaObject.hasSetter("addTime")) { + String timestamp = String.valueOf(System.currentTimeMillis() / 1000); + this.setFieldValByName("addTime", Integer.valueOf(timestamp), metaObject); + } + } @Override diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java b/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java index 14d85fdd..75aca632 100644 --- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java +++ b/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java @@ -132,7 +132,7 @@ public class YudaoWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdap .antMatchers("/common/**").permitAll() // 忽略宝享购全部 - .antMatchers("/bxgApp/**","/bxg/**").permitAll() +// .antMatchers("/bxgApp/**","/bxg/**").hasAnyRole() // ②：每个项目的自定义规则 .and().authorizeRequests(registry -> // 下面，循环设置自定义规则 diff --git a/zsw-bxg/src/main/java/co/yixiang/app/common/interceptor/AuthCheck.java b/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/annotations/AuthCheck.java similarity index 92% rename from zsw-bxg/src/main/java/co/yixiang/app/common/interceptor/AuthCheck.java rename to yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/annotations/AuthCheck.java index 3c11ffb7..e8633f9f 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/common/interceptor/AuthCheck.java +++ b/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/annotations/AuthCheck.java @@ -6,7 +6,7 @@ * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台） * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ -package co.yixiang.app.common.interceptor; +package cn.iocoder.yudao.framework.security.core.annotations; import java.lang.annotation.ElementType; diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java index 578ad76f..95a38520 100644 --- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java +++ b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java @@ -4,6 +4,7 @@ import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.extra.servlet.ServletUtil; import cn.iocoder.yudao.framework.common.exception.ServiceException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.apilog.core.service.ApiErrorLogFrameworkService; import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiErrorLogCreateReqDTO; @@ -215,6 +216,12 @@ public class GlobalExceptionHandler { return CommonResult.error(ex.getCode(), ex.getMessage()); } + @ExceptionHandler(value = YshopException.class) + public CommonResult yshopException(YshopException ex){ + log.info("[YshopException]",ex); + return CommonResult.error(ex.getErrorCode(), ex.getMessage()); + } + /** * 处理系统异常，兜底处理所有的一切 */ diff --git a/yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/framework/security/config/SecurityConfiguration.java b/yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/framework/security/config/SecurityConfiguration.java index 04841176..cf491614 100644 --- a/yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/framework/security/config/SecurityConfiguration.java +++ b/yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/framework/security/config/SecurityConfiguration.java @@ -1,27 +1,61 @@ package cn.iocoder.yudao.module.infra.framework.security.config; import cn.iocoder.yudao.framework.security.config.AuthorizeRequestsCustomizer; +import cn.iocoder.yudao.framework.security.core.annotations.AuthCheck; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer; +import org.springframework.web.method.HandlerMethod; +import org.springframework.web.servlet.mvc.condition.PatternsRequestCondition; +import org.springframework.web.servlet.mvc.method.RequestMappingInfo; +import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; + +import javax.annotation.Resource; +import java.util.HashSet; +import java.util.Map; +import java.util.Optional; +import java.util.Set; /** * Infra 模块的 Security 配置 */ @Configuration("infraSecurityConfiguration") +@Slf4j public class SecurityConfiguration { @Value("${spring.boot.admin.context-path:''}") private String adminSeverContextPath; + @Resource + private ApplicationContext applicationContext; + @Bean("infraAuthorizeRequestsCustomizer") public AuthorizeRequestsCustomizer authorizeRequestsCustomizer() { return new AuthorizeRequestsCustomizer() { @Override public void customize(ExpressionUrlAuthorizationConfigurer.ExpressionInterceptUrlRegistry registry) { + + // 查找全部宝象购的链接 + Map handlerMethods = applicationContext.getBean(RequestMappingHandlerMapping.class).getHandlerMethods(); + Set anonymousUrls = new HashSet<>(); + + for (Map.Entry infoEntry : handlerMethods.entrySet()) { + HandlerMethod handlerMethod = infoEntry.getValue(); + // 宝象购app包下 并且没有登录标识 放行 + if (handlerMethod.getBeanType().getPackage().getName().startsWith("co.yixiang.app") + && !handlerMethod.hasMethodAnnotation(AuthCheck.class)){ + PatternsRequestCondition requestCondition = infoEntry.getKey().getPatternsCondition(); + Optional.ofNullable(requestCondition).orElseThrow(RuntimeException::new); + anonymousUrls.addAll(requestCondition.getPatterns()); + } + } + anonymousUrls.forEach(s -> log.warn("宝象购可以匿名访问的url：{}", s)); + registry.antMatchers(anonymousUrls.toArray(new String[0])).anonymous(); // Swagger 接口文档 registry.antMatchers("/swagger-ui.html").anonymous() .antMatchers("/swagger-resources/**").anonymous() diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/auth/AuthConvert.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/auth/AuthConvert.java index c52328cc..9ec92475 100644 --- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/auth/AuthConvert.java +++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/auth/AuthConvert.java @@ -10,12 +10,15 @@ import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO; import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import cn.iocoder.yudao.module.system.enums.permission.MenuIdEnum; +import com.google.common.collect.Sets; +import lombok.extern.slf4j.Slf4j; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; import org.slf4j.LoggerFactory; import java.util.*; +import java.util.function.Function; @Mapper public interface AuthConvert { @@ -31,10 +34,18 @@ public interface AuthConvert { } default AuthPermissionInfoRespVO convert(AdminUserDO user, List roleList, List menuList) { + Set permissions = CollectionUtils.convertSet(menuList, MenuDO::getPermission); + // 兼容了一个菜单多个权限。包含逗号分为多块写入 + menuList.forEach(menuDO -> { + if (menuDO.getPermission().contains(",")){ + permissions.remove(menuDO.getPermission()); + permissions.addAll( Sets.newHashSet(Arrays.asList(menuDO.getPermission().split(",")))); + } + }); return AuthPermissionInfoRespVO.builder() .user(AuthPermissionInfoRespVO.UserVO.builder().id(user.getId()).nickname(user.getNickname()).avatar(user.getAvatar()).build()) .roles(CollectionUtils.convertSet(roleList, RoleDO::getCode)) - .permissions(CollectionUtils.convertSet(menuList, MenuDO::getPermission)) + .permissions(permissions) .build(); } diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java index 149f6c7b..8cc7b7b5 100644 --- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java +++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java @@ -95,7 +95,15 @@ public class MenuServiceImpl implements MenuService { ImmutableMultimap.Builder permMenuCacheBuilder = ImmutableMultimap.builder(); menuList.forEach(menuDO -> { menuCacheBuilder.put(menuDO.getId(), menuDO); - permMenuCacheBuilder.put(menuDO.getPermission(), menuDO); + // 兼容了一个菜单多个权限。包含逗号分为多块写入 + if (menuDO.getPermission().contains(",")){ + Arrays.asList(menuDO.getPermission().split(",")).forEach(s -> { + permMenuCacheBuilder.put(s, menuDO); + }); + }else { + permMenuCacheBuilder.put(menuDO.getPermission(), menuDO); + } + }); menuCache = menuCacheBuilder.build(); permissionMenuCache = permMenuCacheBuilder.build(); diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceImpl.java index 4f93879a..e19a02be 100644 --- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceImpl.java +++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceImpl.java @@ -317,6 +317,10 @@ public class PermissionServiceImpl implements PermissionService { if (ArrayUtil.isEmpty(permissions)) { return true; } + //如果带角色字段 也过 + if (hasAnyRoles(permissions)){ + return true; + } // 获得当前登录的角色。如果为空，说明没有权限 Set roleIds = SecurityFrameworkUtils.getLoginUserRoleIds(); diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml index 10390d64..0016ba75 100644 --- a/yudao-server/src/main/resources/application-local.yaml +++ b/yudao-server/src/main/resources/application-local.yaml @@ -69,7 +69,7 @@ spring: # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 redis: - host: 192.168.10.129 # 地址 + host: 127.0.0.1 # 地址 port: 6379 # 端口 database: 0 # 数据库索引 diff --git a/zsw-bxg/src/main/java/co/yixiang/api/ApiResult.java b/zsw-bxg/src/main/java/co/yixiang/api/ApiResult.java index 0ea84a84..8ff06e2e 100644 --- a/zsw-bxg/src/main/java/co/yixiang/api/ApiResult.java +++ b/zsw-bxg/src/main/java/co/yixiang/api/ApiResult.java @@ -9,6 +9,7 @@ package co.yixiang.api; +import cn.iocoder.yudao.framework.common.exception.ApiCode; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/zsw-bxg/src/main/java/co/yixiang/api/BusinessException.java b/zsw-bxg/src/main/java/co/yixiang/api/BusinessException.java index 42775d43..b536178f 100644 --- a/zsw-bxg/src/main/java/co/yixiang/api/BusinessException.java +++ b/zsw-bxg/src/main/java/co/yixiang/api/BusinessException.java @@ -9,8 +9,8 @@ package co.yixiang.api; - - +import cn.iocoder.yudao.framework.common.exception.ApiCode; +import cn.iocoder.yudao.framework.common.exception.YshopException; /** * 业务异常 diff --git a/zsw-bxg/src/main/java/co/yixiang/api/DaoException.java b/zsw-bxg/src/main/java/co/yixiang/api/DaoException.java index 07b8c2ad..45353921 100644 --- a/zsw-bxg/src/main/java/co/yixiang/api/DaoException.java +++ b/zsw-bxg/src/main/java/co/yixiang/api/DaoException.java @@ -9,6 +9,9 @@ package co.yixiang.api; +import cn.iocoder.yudao.framework.common.exception.ApiCode; +import cn.iocoder.yudao.framework.common.exception.YshopException; + /** * DAO异常 * @author hupeng diff --git a/zsw-bxg/src/main/java/co/yixiang/api/UnAuthenticatedException.java b/zsw-bxg/src/main/java/co/yixiang/api/UnAuthenticatedException.java index cef14ecf..24ddc4f3 100644 --- a/zsw-bxg/src/main/java/co/yixiang/api/UnAuthenticatedException.java +++ b/zsw-bxg/src/main/java/co/yixiang/api/UnAuthenticatedException.java @@ -8,6 +8,9 @@ */ package co.yixiang.api; +import cn.iocoder.yudao.framework.common.exception.ApiCode; +import cn.iocoder.yudao.framework.common.exception.YshopException; + /** * 认证异常 * @author hupeng diff --git a/zsw-bxg/src/main/java/co/yixiang/app/common/bean/LocalUser.java b/zsw-bxg/src/main/java/co/yixiang/app/common/bean/LocalUser.java index 9ffb95fc..2cccd6b4 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/common/bean/LocalUser.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/common/bean/LocalUser.java @@ -9,7 +9,7 @@ package co.yixiang.app.common.bean; -import co.yixiang.api.ApiCode; +import cn.iocoder.yudao.framework.common.exception.ApiCode; import co.yixiang.api.UnAuthenticatedException; import co.yixiang.app.common.util.JwtToken; import co.yixiang.app.common.util.RequestUtils; diff --git a/zsw-bxg/src/main/java/co/yixiang/app/common/interceptor/PermissionInterceptor.java b/zsw-bxg/src/main/java/co/yixiang/app/common/interceptor/PermissionInterceptor.java index a6ff95f6..119f3d61 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/common/interceptor/PermissionInterceptor.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/common/interceptor/PermissionInterceptor.java @@ -10,7 +10,8 @@ package co.yixiang.app.common.interceptor; import cn.hutool.core.util.StrUtil; -import co.yixiang.api.ApiCode; +import cn.iocoder.yudao.framework.security.core.annotations.AuthCheck; +import cn.iocoder.yudao.framework.common.exception.ApiCode; import co.yixiang.api.UnAuthenticatedException; import co.yixiang.app.common.bean.LocalUser; import co.yixiang.app.common.util.JwtToken; @@ -20,7 +21,6 @@ import co.yixiang.modules.user.service.YxUserService; import co.yixiang.utils.RedisUtils; import com.auth0.jwt.interfaces.Claim; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/activity/rest/AppStoreBargainController.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/activity/rest/AppStoreBargainController.java index 7895f7ac..5ecd5e09 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/modules/activity/rest/AppStoreBargainController.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/activity/rest/AppStoreBargainController.java @@ -12,7 +12,7 @@ import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.ApiResult; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.app.common.aop.NoRepeatSubmit; import co.yixiang.app.common.bean.LocalUser; import co.yixiang.app.modules.activity.param.BargainShareParam; @@ -20,7 +20,7 @@ import co.yixiang.app.modules.activity.param.YxStoreBargainUserHelpQueryParam; import co.yixiang.app.modules.activity.param.YxStoreBargainUserQueryParam; import co.yixiang.app.modules.services.CreatShareProductService; import co.yixiang.logging.aop.log.AppLog; -import co.yixiang.app.common.interceptor.AuthCheck; +import cn.iocoder.yudao.framework.security.core.annotations.AuthCheck; import co.yixiang.constant.SystemConfigConstants; import co.yixiang.modules.activity.domain.YxStoreBargainUser; import co.yixiang.modules.activity.domain.YxStoreBargainUserHelp; @@ -44,7 +44,6 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/activity/rest/AppStoreCombinationController.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/activity/rest/AppStoreCombinationController.java index a272ea35..006c89f3 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/modules/activity/rest/AppStoreCombinationController.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/activity/rest/AppStoreCombinationController.java @@ -11,13 +11,13 @@ package co.yixiang.app.modules.activity.rest; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.ApiResult; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.app.common.bean.LocalUser; import co.yixiang.app.modules.activity.param.PinkCancelParam; import co.yixiang.app.modules.activity.param.PinkShareParam; import co.yixiang.app.modules.services.CreatShareProductService; import co.yixiang.logging.aop.log.AppLog; -import co.yixiang.app.common.interceptor.AuthCheck; +import cn.iocoder.yudao.framework.security.core.annotations.AuthCheck; import co.yixiang.constant.SystemConfigConstants; import co.yixiang.modules.activity.service.YxStoreCombinationService; import co.yixiang.modules.activity.service.YxStorePinkService; @@ -35,7 +35,6 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/activity/rest/AppStoreSeckillController.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/activity/rest/AppStoreSeckillController.java index aeb7b62e..0b0f339f 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/modules/activity/rest/AppStoreSeckillController.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/activity/rest/AppStoreSeckillController.java @@ -12,10 +12,10 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.ApiResult; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.logging.aop.log.AppLog; import co.yixiang.app.common.bean.LocalUser; -import co.yixiang.app.common.interceptor.AuthCheck; +import cn.iocoder.yudao.framework.security.core.annotations.AuthCheck; import co.yixiang.constant.ShopConstants; import co.yixiang.modules.activity.service.YxStoreSeckillService; import co.yixiang.modules.activity.service.dto.SeckillTimeDto; diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/auth/rest/LetterAppAuthController.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/auth/rest/LetterAppAuthController.java index b0fdc11b..b4ab8cbf 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/modules/auth/rest/LetterAppAuthController.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/auth/rest/LetterAppAuthController.java @@ -13,14 +13,14 @@ import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; import co.yixiang.api.ApiResult; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.app.common.enums.SmsTypeEnum; import co.yixiang.app.common.util.JwtToken; import co.yixiang.app.common.util.SmsUtils; import co.yixiang.app.modules.auth.param.*; import co.yixiang.app.modules.services.AppAuthService; import co.yixiang.app.common.bean.LocalUser; -import co.yixiang.app.common.interceptor.AuthCheck; +import cn.iocoder.yudao.framework.security.core.annotations.AuthCheck; import co.yixiang.constant.ShopConstants; import co.yixiang.enums.ShopCommonEnum; import co.yixiang.modules.user.domain.YxUser; @@ -37,7 +37,6 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/cart/rest/StoreCartController.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/cart/rest/StoreCartController.java index a864dd32..d89ebc7b 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/modules/cart/rest/StoreCartController.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/cart/rest/StoreCartController.java @@ -15,7 +15,7 @@ import co.yixiang.app.common.bean.LocalUser; import co.yixiang.app.modules.cart.param.CartIdsParm; import co.yixiang.app.modules.cart.param.CartParam; import co.yixiang.logging.aop.log.AppLog; -import co.yixiang.app.common.interceptor.AuthCheck; +import cn.iocoder.yudao.framework.security.core.annotations.AuthCheck; import co.yixiang.app.modules.cart.param.CartNumParam; import co.yixiang.modules.cart.service.YxStoreCartService; import io.swagger.annotations.Api; diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/coupon/rest/CouponController.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/coupon/rest/CouponController.java index 1aeac632..65688b93 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/modules/coupon/rest/CouponController.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/coupon/rest/CouponController.java @@ -10,11 +10,11 @@ package co.yixiang.app.modules.coupon.rest; import cn.hutool.core.util.NumberUtil; import co.yixiang.api.ApiResult; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.logging.aop.log.AppLog; import co.yixiang.app.common.aop.NoRepeatSubmit; import co.yixiang.app.common.bean.LocalUser; -import co.yixiang.app.common.interceptor.AuthCheck; +import cn.iocoder.yudao.framework.security.core.annotations.AuthCheck; import co.yixiang.modules.activity.service.YxStoreCouponIssueService; import co.yixiang.modules.activity.service.YxStoreCouponUserService; import co.yixiang.modules.activity.vo.StoreCouponUserVo; diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/manage/rest/ShoperController.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/manage/rest/ShoperController.java index df627f42..7500bf99 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/modules/manage/rest/ShoperController.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/manage/rest/ShoperController.java @@ -11,11 +11,11 @@ package co.yixiang.app.modules.manage.rest; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.ApiResult; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.app.modules.order.param.OrderDeliveryParam; import co.yixiang.app.modules.order.param.OrderRefundParam; import co.yixiang.logging.aop.log.AppLog; -import co.yixiang.app.common.interceptor.AuthCheck; +import cn.iocoder.yudao.framework.security.core.annotations.AuthCheck; import co.yixiang.app.modules.manage.param.OrderPriceParam; import co.yixiang.app.modules.manage.param.ShoperQueryParam; import co.yixiang.modules.order.service.YxExpressService; diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/order/rest/AppStoreOrderController.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/order/rest/AppStoreOrderController.java index c4e13d0a..454dbeda 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/modules/order/rest/AppStoreOrderController.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/order/rest/AppStoreOrderController.java @@ -12,14 +12,14 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.ApiResult; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.app.common.aop.NoRepeatSubmit; import co.yixiang.app.common.bean.LocalUser; import co.yixiang.app.modules.order.param.*; import co.yixiang.app.modules.order.param.ExpressParam; import co.yixiang.app.modules.services.CreatShareProductService; import co.yixiang.app.modules.services.OrderSupplyService; -import co.yixiang.app.common.interceptor.AuthCheck; +import cn.iocoder.yudao.framework.security.core.annotations.AuthCheck; import co.yixiang.enums.*; import co.yixiang.logging.aop.log.AppLog; import co.yixiang.modules.mp.domain.YxWechatTemplate; @@ -50,7 +50,6 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/product/rest/AppStoreProductController.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/product/rest/AppStoreProductController.java index 8e79a750..18b7e239 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/modules/product/rest/AppStoreProductController.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/product/rest/AppStoreProductController.java @@ -16,7 +16,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.qrcode.QrCodeUtil; import co.yixiang.api.ApiResult; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.app.common.aop.NoRepeatSubmit; import co.yixiang.app.common.bean.LocalUser; import co.yixiang.app.modules.product.param.CollectDelFootParam; @@ -24,7 +24,7 @@ import co.yixiang.app.modules.product.param.YxStoreProductRelationQueryParam; import co.yixiang.app.modules.services.CreatShareProductService; import co.yixiang.constant.ShopConstants; import co.yixiang.logging.aop.log.AppLog; -import co.yixiang.app.common.interceptor.AuthCheck; +import cn.iocoder.yudao.framework.security.core.annotations.AuthCheck; import co.yixiang.constant.SystemConfigConstants; import co.yixiang.enums.AppFromEnum; import co.yixiang.enums.ProductEnum; @@ -49,7 +49,6 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/services/AppAuthService.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/services/AppAuthService.java index b3522a11..39f01758 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/modules/services/AppAuthService.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/services/AppAuthService.java @@ -15,7 +15,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaUserInfo; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.app.common.util.IpUtil; import co.yixiang.constant.ShopConstants; import co.yixiang.enums.AppFromEnum; diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/services/CreatShareProductService.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/services/CreatShareProductService.java index 2d55ffc2..2d75cb9f 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/modules/services/CreatShareProductService.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/services/CreatShareProductService.java @@ -15,7 +15,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.qrcode.QrCodeUtil; import cn.hutool.http.HttpUtil; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.constant.ShopConstants; import co.yixiang.constant.SystemConfigConstants; import co.yixiang.enums.AppFromEnum; diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/services/OrderSupplyService.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/services/OrderSupplyService.java index a0e52440..b1e5c0c5 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/modules/services/OrderSupplyService.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/services/OrderSupplyService.java @@ -11,7 +11,7 @@ package co.yixiang.app.modules.services; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.enums.AppFromEnum; import co.yixiang.enums.BillDetailEnum; import co.yixiang.enums.OrderInfoEnum; diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/shop/rest/IndexController.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/shop/rest/IndexController.java index 89c04226..ea05535a 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/modules/shop/rest/IndexController.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/shop/rest/IndexController.java @@ -11,7 +11,7 @@ package co.yixiang.app.modules.shop.rest; import cn.hutool.core.io.file.FileReader; import cn.hutool.core.io.resource.ClassPathResource; import co.yixiang.api.ApiResult; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.constant.ShopConstants; import co.yixiang.enums.ProductEnum; import co.yixiang.modules.activity.service.YxStoreCombinationService; diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/AppUserBillController.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/AppUserBillController.java index 827878d1..9261f257 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/AppUserBillController.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/AppUserBillController.java @@ -11,9 +11,9 @@ package co.yixiang.app.modules.user.rest; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.ApiResult; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.app.common.bean.LocalUser; -import co.yixiang.app.common.interceptor.AuthCheck; +import cn.iocoder.yudao.framework.security.core.annotations.AuthCheck; import co.yixiang.app.modules.services.CreatShareProductService; import co.yixiang.app.modules.user.param.PromParam; import co.yixiang.app.modules.user.param.YxUserBillQueryParam; @@ -34,7 +34,6 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/AppUserExtractController.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/AppUserExtractController.java index c1ddec90..de279f87 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/AppUserExtractController.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/AppUserExtractController.java @@ -12,7 +12,7 @@ package co.yixiang.app.modules.user.rest; import co.yixiang.api.ApiResult; import co.yixiang.app.common.bean.LocalUser; import co.yixiang.logging.aop.log.AppLog; -import co.yixiang.app.common.interceptor.AuthCheck; +import cn.iocoder.yudao.framework.security.core.annotations.AuthCheck; import co.yixiang.constant.SystemConfigConstants; import co.yixiang.modules.activity.param.UserExtParam; import co.yixiang.modules.activity.service.YxUserExtractService; diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/AppUserRechargeController.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/AppUserRechargeController.java index 0293cfc8..5d9581f3 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/AppUserRechargeController.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/AppUserRechargeController.java @@ -10,12 +10,12 @@ package co.yixiang.app.modules.user.rest; import cn.hutool.core.bean.BeanUtil; import co.yixiang.api.ApiResult; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.app.common.bean.LocalUser; import co.yixiang.app.modules.user.param.RechargeParam; import co.yixiang.enums.ShopCommonEnum; import co.yixiang.logging.aop.log.AppLog; -import co.yixiang.app.common.interceptor.AuthCheck; +import cn.iocoder.yudao.framework.security.core.annotations.AuthCheck; import co.yixiang.constant.ShopConstants; import co.yixiang.enums.AppFromEnum; import co.yixiang.enums.BillDetailEnum; diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/LetterAppUserController.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/LetterAppUserController.java index 9a5e4b26..09e20f1f 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/LetterAppUserController.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/LetterAppUserController.java @@ -12,7 +12,7 @@ package co.yixiang.app.modules.user.rest; import co.yixiang.api.ApiResult; import co.yixiang.app.common.aop.NoRepeatSubmit; import co.yixiang.app.common.bean.LocalUser; -import co.yixiang.app.common.interceptor.AuthCheck; +import cn.iocoder.yudao.framework.security.core.annotations.AuthCheck; import co.yixiang.app.modules.user.param.UserEditParam; import co.yixiang.logging.aop.log.AppLog; import co.yixiang.constant.ShopConstants; diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/UserAddressController.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/UserAddressController.java index 413ec689..df565113 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/UserAddressController.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/UserAddressController.java @@ -11,9 +11,9 @@ package co.yixiang.app.modules.user.rest; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.ApiResult; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.app.common.bean.LocalUser; -import co.yixiang.app.common.interceptor.AuthCheck; +import cn.iocoder.yudao.framework.security.core.annotations.AuthCheck; import co.yixiang.app.common.util.CityTreeUtil; import co.yixiang.app.common.web.param.IdParam; import co.yixiang.logging.aop.log.AppLog; diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/UserLevelController.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/UserLevelController.java index 738d78cc..76fc03f4 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/UserLevelController.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/user/rest/UserLevelController.java @@ -12,9 +12,9 @@ package co.yixiang.app.modules.user.rest; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.ApiResult; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.app.common.bean.LocalUser; -import co.yixiang.app.common.interceptor.AuthCheck; +import cn.iocoder.yudao.framework.security.core.annotations.AuthCheck; import co.yixiang.modules.user.service.YxSystemUserLevelService; import co.yixiang.modules.user.service.YxSystemUserTaskService; import co.yixiang.modules.user.service.YxUserLevelService; diff --git a/zsw-bxg/src/main/java/co/yixiang/app/modules/wechat/rest/controller/WxMaUserController.java b/zsw-bxg/src/main/java/co/yixiang/app/modules/wechat/rest/controller/WxMaUserController.java index a754f3b5..ddcdcaaa 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/modules/wechat/rest/controller/WxMaUserController.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/modules/wechat/rest/controller/WxMaUserController.java @@ -12,13 +12,13 @@ import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo; import cn.hutool.core.util.StrUtil; import co.yixiang.api.ApiResult; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.app.common.bean.LocalUser; import co.yixiang.app.modules.wechat.rest.param.BindPhoneParam; import co.yixiang.app.modules.wechat.rest.param.WxPhoneParam; import co.yixiang.constant.ShopConstants; import co.yixiang.logging.aop.log.AppLog; -import co.yixiang.app.common.interceptor.AuthCheck; +import cn.iocoder.yudao.framework.security.core.annotations.AuthCheck; import co.yixiang.modules.user.domain.YxUser; import co.yixiang.modules.user.service.YxUserService; import co.yixiang.modules.mp.config.WxMaConfiguration; diff --git a/zsw-bxg/src/main/java/co/yixiang/app/rest/AppStoreAfterSalesController.java b/zsw-bxg/src/main/java/co/yixiang/app/rest/AppStoreAfterSalesController.java index fd1d9df8..53d21904 100644 --- a/zsw-bxg/src/main/java/co/yixiang/app/rest/AppStoreAfterSalesController.java +++ b/zsw-bxg/src/main/java/co/yixiang/app/rest/AppStoreAfterSalesController.java @@ -3,9 +3,9 @@ package co.yixiang.app.rest; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.ApiResult; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.app.common.bean.LocalUser; -import co.yixiang.app.common.interceptor.AuthCheck; +import cn.iocoder.yudao.framework.security.core.annotations.AuthCheck; import co.yixiang.logging.aop.log.AppLog; import co.yixiang.modules.order.domain.YxExpress; import co.yixiang.modules.order.service.YxExpressService; diff --git a/zsw-bxg/src/main/java/co/yixiang/exception/BadLimitRequestException.java b/zsw-bxg/src/main/java/co/yixiang/exception/BadLimitRequestException.java index b15d36f5..06aa2972 100644 --- a/zsw-bxg/src/main/java/co/yixiang/exception/BadLimitRequestException.java +++ b/zsw-bxg/src/main/java/co/yixiang/exception/BadLimitRequestException.java @@ -5,12 +5,10 @@ */ package co.yixiang.exception; -import co.yixiang.api.ApiCode; +import cn.iocoder.yudao.framework.common.exception.ApiCode; import lombok.Getter; import org.springframework.http.HttpStatus; -import static org.springframework.http.HttpStatus.BAD_REQUEST; - /** * @author Zheng Jie * @date 2018-11-23 diff --git a/zsw-bxg/src/main/java/co/yixiang/handler/GlobalExceptionHandler.java b/zsw-bxg/src/main/java/co/yixiang/handler/GlobalExceptionHandler.java deleted file mode 100644 index b53761f4..00000000 --- a/zsw-bxg/src/main/java/co/yixiang/handler/GlobalExceptionHandler.java +++ /dev/null @@ -1,130 +0,0 @@ -///** -// * Copyright (C) 2018-2022 -// * All rights reserved, Designed By www.yixiang.co -// -// */ -//package co.yixiang.handler; -// -//import co.yixiang.exception.BadRequestException; -//import co.yixiang.exception.EntityExistException; -//import co.yixiang.exception.EntityNotFoundException; -//import co.yixiang.exception.ErrorRequestException; -//import co.yixiang.utils.ThrowableUtil; -//import lombok.extern.slf4j.Slf4j; -//import org.springframework.http.HttpStatus; -//import org.springframework.http.ResponseEntity; -//import org.springframework.security.authentication.BadCredentialsException; -//import org.springframework.web.bind.MethodArgumentNotValidException; -//import org.springframework.web.bind.annotation.ExceptionHandler; -//import org.springframework.web.bind.annotation.RestControllerAdvice; -// -//import java.util.Objects; -// -//import static org.springframework.http.HttpStatus.NOT_FOUND; -//import static org.springframework.http.HttpStatus.valueOf; -// -///** -// * @author Zheng Jie -// * @date 2018-11-23 -// */ -//@Slf4j -//@RestControllerAdvice -//@SuppressWarnings("unchecked") -//public class GlobalExceptionHandler { -// -// /** -// * 处理所有不可知的异常 -// */ -// @ExceptionHandler(Throwable.class) -// public ResponseEntity handleException(Throwable e){ -// // 打印堆栈信息 -// log.error(ThrowableUtil.getStackTrace(e)); -// return buildResponseEntity(ApiError.error(e.getMessage())); -// } -// -// /** -// * BadCredentialsException -// */ -// @ExceptionHandler(BadCredentialsException.class) -// public ResponseEntity badCredentialsException(BadCredentialsException e){ -// // 打印堆栈信息 -// String message = "坏的凭证".equals(e.getMessage()) ? "用户名或密码不正确" : e.getMessage(); -// log.error(message); -// return buildResponseEntity(ApiError.error(message)); -// } -// -// /** -// * 处理自定义异常 -// */ -// @ExceptionHandler(value = BadRequestException.class) -// public ResponseEntity badRequestException(BadRequestException e) { -// // 打印堆栈信息 -// log.error(ThrowableUtil.getStackTrace(e)); -// return buildResponseEntity(ApiError.error(e.getStatus(),e.getMessage())); -// } -// -// /** -// * 处理自定义异常 -// * @param e -// * @return -// */ -// @ExceptionHandler(value = ErrorRequestException.class) -// public ResponseEntity errorRequestException(ErrorRequestException e) { -// // 打印堆栈信息 -// log.error(ThrowableUtil.getStackTrace(e)); -// ApiErr apiError = new ApiErr(e.getStatus(),e.getMessage()); -// return buildResponseEntity2(apiError); -// } -// -// /** -// * 处理 EntityExist -// */ -// @ExceptionHandler(value = EntityExistException.class) -// public ResponseEntity entityExistException(EntityExistException e) { -// // 打印堆栈信息 -// log.error(ThrowableUtil.getStackTrace(e)); -// return buildResponseEntity(ApiError.error(e.getMessage())); -// } -// -// /** -// * 处理 EntityNotFound -// */ -// @ExceptionHandler(value = EntityNotFoundException.class) -// public ResponseEntity entityNotFoundException(EntityNotFoundException e) { -// // 打印堆栈信息 -// log.error(ThrowableUtil.getStackTrace(e)); -// return buildResponseEntity(ApiError.error(NOT_FOUND.value(),e.getMessage())); -// } -// -// /** -// * 处理所有接口数据验证异常 -// */ -// @ExceptionHandler(MethodArgumentNotValidException.class) -// public ResponseEntity handleMethodArgumentNotValidException(MethodArgumentNotValidException e){ -// // 打印堆栈信息 -// log.error(ThrowableUtil.getStackTrace(e)); -// String[] str = Objects.requireNonNull(e.getBindingResult().getAllErrors().get(0).getCodes())[1].split("\\."); -// String message = e.getBindingResult().getAllErrors().get(0).getDefaultMessage(); -// String msg = "不能为空"; -// if(msg.equals(message)){ -// message = str[1] + ":" + message; -// } -// return buildResponseEntity(ApiError.error(message)); -// } -// -// /** -// * 统一返回 -// */ -// private ResponseEntity buildResponseEntity(ApiError apiError) { -// return new ResponseEntity<>(apiError, valueOf(apiError.getStatus())); -// } -// -// /** -// * 统一返回 -// * @param apiError -// * @return -// */ -// private ResponseEntity buildResponseEntity2(ApiErr apiError) { -// return new ResponseEntity(apiError, HttpStatus.valueOf(apiError.getStatus())); -// } -//} diff --git a/zsw-bxg/src/main/java/co/yixiang/logging/domain/Log.java b/zsw-bxg/src/main/java/co/yixiang/logging/domain/Log.java index 536cba5e..e36bab3e 100644 --- a/zsw-bxg/src/main/java/co/yixiang/logging/domain/Log.java +++ b/zsw-bxg/src/main/java/co/yixiang/logging/domain/Log.java @@ -5,7 +5,7 @@ */ package co.yixiang.logging.domain; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreBargain.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreBargain.java index 8997939e..4d156e28 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreBargain.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreBargain.java @@ -7,7 +7,7 @@ package co.yixiang.modules.activity.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreBargainUser.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreBargainUser.java index fa537d39..d8cfa223 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreBargainUser.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreBargainUser.java @@ -1,7 +1,7 @@ package co.yixiang.modules.activity.domain; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreBargainUserHelp.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreBargainUserHelp.java index 19b4123b..7df712fc 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreBargainUserHelp.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreBargainUserHelp.java @@ -1,7 +1,7 @@ package co.yixiang.modules.activity.domain; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java index 199c5fc4..ecc1a80d 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java @@ -7,7 +7,7 @@ package co.yixiang.modules.activity.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import co.yixiang.modules.product.service.dto.FromatDetailDto; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCoupon.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCoupon.java index 9ca64556..fdfca644 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCoupon.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCoupon.java @@ -7,7 +7,7 @@ package co.yixiang.modules.activity.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssue.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssue.java index 5b3af8cd..51b66161 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssue.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssue.java @@ -7,7 +7,7 @@ package co.yixiang.modules.activity.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssueUser.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssueUser.java index 55e91b26..cecd8575 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssueUser.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssueUser.java @@ -7,7 +7,7 @@ package co.yixiang.modules.activity.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponUser.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponUser.java index 1f6160f3..4a282c2d 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponUser.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponUser.java @@ -7,7 +7,7 @@ package co.yixiang.modules.activity.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java index 060b79c4..4afb1206 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java @@ -7,7 +7,7 @@ package co.yixiang.modules.activity.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreSeckill.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreSeckill.java index 21d4fdde..8f89a8a0 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreSeckill.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxStoreSeckill.java @@ -7,7 +7,7 @@ package co.yixiang.modules.activity.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import co.yixiang.modules.product.service.dto.FromatDetailDto; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -17,8 +17,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.validation.constraints.DecimalMax; -import javax.validation.constraints.DecimalMin; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxUserExtract.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxUserExtract.java index 158645ef..3c66d0ca 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxUserExtract.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/domain/YxUserExtract.java @@ -7,7 +7,7 @@ package co.yixiang.modules.activity.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java index 9d91a777..fb8cbdfa 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java @@ -9,7 +9,7 @@ package co.yixiang.modules.activity.rest; import cn.hutool.core.util.ObjectUtil; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.activity.domain.YxStoreBargain; import co.yixiang.modules.activity.service.YxStoreBargainService; @@ -48,7 +48,7 @@ public class StoreBargainController { @Log("查询砍价") @ApiOperation(value = "查询砍价") @GetMapping(value = "/yxStoreBargain") - @PreAuthorize("hasAnyRole('admin','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_SELECT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_SELECT')") public ResponseEntity getYxStoreBargains(YxStoreBargainQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(yxStoreBargainService.queryAll(criteria,pageable),HttpStatus.OK); } @@ -58,7 +58,7 @@ public class StoreBargainController { @Log("修改砍价") @ApiOperation(value = "修改砍价") @PutMapping(value = "/yxStoreBargain") - @PreAuthorize("hasAnyRole('admin','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_EDIT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_EDIT')") public ResponseEntity update(@Validated @RequestBody YxStoreBargain resources){ if(resources.getBargainMinPrice().compareTo(resources.getBargainMaxPrice()) >= 0){ throw new YshopException("单次砍最低价不能高于单次砍最高价"); @@ -78,7 +78,7 @@ public class StoreBargainController { @Log("删除砍价") @ApiOperation(value = "删除砍价") @DeleteMapping(value = "/yxStoreBargain/{id}") - @PreAuthorize("hasAnyRole('admin','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_DELETE')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_DELETE')") public ResponseEntity delete(@PathVariable Integer id){ yxStoreBargainService.removeById(id); return new ResponseEntity(HttpStatus.OK); diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java index 0d8fdec8..1b321169 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java @@ -80,7 +80,7 @@ public class StoreCombinationController { @Log("查询拼团") @ApiOperation(value = "查询拼团") @GetMapping(value = "/yxStoreCombination") - @PreAuthorize("hasAnyRole('admin','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_SELECT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_SELECT')") public ResponseEntity getYxStoreCombinations(YxStoreCombinationQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(yxStoreCombinationService.queryAll(criteria,pageable),HttpStatus.OK); } @@ -89,7 +89,7 @@ public class StoreCombinationController { @Log("新增拼团") @ApiOperation(value = "新增拼团") @PostMapping(value = "/yxStoreCombination") - @PreAuthorize("hasAnyRole('admin','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_EDIT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_EDIT')") public ResponseEntity add(@Validated @RequestBody YxStoreCombinationDto resources){ return new ResponseEntity<>(yxStoreCombinationService.saveCombination(resources),HttpStatus.CREATED); } @@ -171,7 +171,7 @@ public class StoreCombinationController { @Log("修改拼团") @ApiOperation(value = "新增/修改拼团") @PutMapping(value = "/yxStoreCombination") - @PreAuthorize("hasAnyRole('admin','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_EDIT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_EDIT')") public ResponseEntity update(@Validated @RequestBody YxStoreCombination resources){ if(ObjectUtil.isNull(resources.getId())){ return new ResponseEntity<>(yxStoreCombinationService.save(resources),HttpStatus.CREATED); @@ -196,7 +196,7 @@ public class StoreCombinationController { @Log("删除拼团") @ApiOperation(value = "删除拼团") @DeleteMapping(value = "/yxStoreCombination/{id}") - @PreAuthorize("hasAnyRole('admin','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_DELETE')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_DELETE')") public ResponseEntity delete(@PathVariable Long id){ yxStoreCombinationService.removeById(id); return new ResponseEntity(HttpStatus.OK); diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreCouponController.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreCouponController.java index f032013c..75603d88 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreCouponController.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreCouponController.java @@ -6,7 +6,7 @@ package co.yixiang.modules.activity.rest; import cn.hutool.core.util.StrUtil; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.enums.CouponEnum; import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.activity.domain.YxStoreCoupon; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueUserController.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueUserController.java index eea77cdb..aedd6fdd 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueUserController.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueUserController.java @@ -42,7 +42,7 @@ public class StoreCouponIssueUserController { @Log("查询") @ApiOperation(value = "查询") @GetMapping(value = "/yxStoreCouponIssueUser") - @PreAuthorize("hasAnyRole('admin','YXSTORECOUPONISSUEUSER_ALL','YXSTORECOUPONISSUEUSER_SELECT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTORECOUPONISSUEUSER_ALL','YXSTORECOUPONISSUEUSER_SELECT')") public ResponseEntity getYxStoreCouponIssueUsers(YxStoreCouponIssueUserQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(yxStoreCouponIssueUserService.queryAll(criteria,pageable),HttpStatus.OK); } @@ -52,7 +52,7 @@ public class StoreCouponIssueUserController { @Log("删除") @ApiOperation(value = "删除") @DeleteMapping(value = "/yxStoreCouponIssueUser/{id}") - @PreAuthorize("hasAnyRole('admin','YXSTORECOUPONISSUEUSER_ALL','YXSTORECOUPONISSUEUSER_DELETE')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTORECOUPONISSUEUSER_ALL','YXSTORECOUPONISSUEUSER_DELETE')") public ResponseEntity delete(@PathVariable Integer id){ yxStoreCouponIssueUserService.removeById(id); return new ResponseEntity(HttpStatus.OK); diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreCouponUserController.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreCouponUserController.java index 2813716c..727745f6 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreCouponUserController.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreCouponUserController.java @@ -39,7 +39,7 @@ public class StoreCouponUserController { @Log("查询Y") @ApiOperation(value = "查询") @GetMapping(value = "/yxStoreCouponUser") - @PreAuthorize("hasAnyRole('admin','YXSTORECOUPONUSER_ALL','YXSTORECOUPONUSER_SELECT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTORECOUPONUSER_ALL','YXSTORECOUPONUSER_SELECT')") public ResponseEntity getYxStoreCouponUsers(YxStoreCouponUserQueryCriteria criteria, Pageable pageable){ return new ResponseEntity(yxStoreCouponUserService.queryAll(criteria,pageable),HttpStatus.OK); } diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java index 423ea51f..9f296af4 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java @@ -71,7 +71,7 @@ public class StoreSeckillController { @Log("列表") @ApiOperation(value = "列表") @GetMapping(value = "/yxStoreSeckill") - @PreAuthorize("hasAnyRole('admin','YXSTORESECKILL_ALL','YXSTORESECKILL_SELECT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTORESECKILL_ALL','YXSTORESECKILL_SELECT')") public ResponseEntity getYxStoreSeckills(YxStoreSeckillQueryCriteria criteria, Pageable pageable) { return new ResponseEntity<>(yxStoreSeckillService.queryAll(criteria, pageable), HttpStatus.OK); } @@ -81,7 +81,7 @@ public class StoreSeckillController { @Log("发布") @ApiOperation(value = "发布") @PutMapping(value = "/yxStoreSeckill") - @PreAuthorize("hasAnyRole('admin','YXSTORESECKILL_ALL','YXSTORESECKILL_EDIT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTORESECKILL_ALL','YXSTORESECKILL_EDIT')") public ResponseEntity update(@Validated @RequestBody YxStoreSeckill resources){ if(ObjectUtil.isNull(resources.getId())){ return new ResponseEntity<>(yxStoreSeckillService.save(resources),HttpStatus.CREATED); @@ -96,7 +96,7 @@ public class StoreSeckillController { @Log("删除") @ApiOperation(value = "删除") @DeleteMapping(value = "/yxStoreSeckill/{id}") - @PreAuthorize("hasAnyRole('admin','YXSTORESECKILL_ALL','YXSTORESECKILL_DELETE')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTORESECKILL_ALL','YXSTORESECKILL_DELETE')") public ResponseEntity delete(@PathVariable Integer id) { yxStoreSeckillService.removeById(id); return new ResponseEntity(HttpStatus.OK); @@ -106,7 +106,7 @@ public class StoreSeckillController { @Log("新增秒杀") @ApiOperation(value = "新增秒杀") @PostMapping(value = "/yxStoreSeckill") - @PreAuthorize("hasAnyRole('admin','YXSTORESECKILL_ALL','YXSTORESECKILL_EDIT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTORESECKILL_ALL','YXSTORESECKILL_EDIT')") public ResponseEntity add(@Validated @RequestBody YxStoreSeckillDto resources) { return new ResponseEntity<>(yxStoreSeckillService.saveSeckill(resources), HttpStatus.CREATED); } diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/UserExtractController.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/UserExtractController.java index 58f20377..8bec9339 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/UserExtractController.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/rest/UserExtractController.java @@ -45,7 +45,7 @@ public class UserExtractController { @Log("查询") @ApiOperation(value = "查询") @GetMapping(value = "/yxUserExtract") - @PreAuthorize("hasAnyRole('admin','YXUSEREXTRACT_ALL','YXUSEREXTRACT_SELECT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXUSEREXTRACT_ALL','YXUSEREXTRACT_SELECT')") public ResponseEntity getYxUserExtracts(YxUserExtractQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(yxUserExtractService.queryAll(criteria,pageable),HttpStatus.OK); } @@ -55,7 +55,7 @@ public class UserExtractController { @Log("修改审核") @ApiOperation(value = "修改审核") @PutMapping(value = "/yxUserExtract") - @PreAuthorize("hasAnyRole('admin','YXUSEREXTRACT_ALL','YXUSEREXTRACT_EDIT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXUSEREXTRACT_ALL','YXUSEREXTRACT_EDIT')") public ResponseEntity update(@Validated @RequestBody YxUserExtract resources){ yxUserExtractService.doExtract(resources); return new ResponseEntity(HttpStatus.NO_CONTENT); diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java index 85204e28..b6b4feeb 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java @@ -9,7 +9,7 @@ package co.yixiang.modules.activity.service.impl; import cn.hutool.core.util.NumberUtil; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.dozer.service.IGenerator; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainUserServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainUserServiceImpl.java index 8b0daef0..f31cf3a1 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainUserServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainUserServiceImpl.java @@ -10,7 +10,7 @@ package co.yixiang.modules.activity.service.impl; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.dozer.service.IGenerator; import co.yixiang.enums.OrderInfoEnum; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java index 0b49fad2..f2531f16 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java @@ -10,11 +10,10 @@ package co.yixiang.modules.activity.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.dozer.service.IGenerator; @@ -24,7 +23,6 @@ import co.yixiang.enums.SpecTypeEnum; import co.yixiang.exception.BadRequestException; import co.yixiang.modules.activity.domain.YxStoreCombination; import co.yixiang.modules.activity.domain.YxStorePink; -import co.yixiang.modules.activity.domain.YxStoreSeckill; import co.yixiang.modules.activity.domain.YxStoreVisit; import co.yixiang.modules.activity.service.YxStoreCombinationService; import co.yixiang.modules.activity.service.YxStorePinkService; @@ -37,7 +35,6 @@ import co.yixiang.modules.activity.service.mapper.YxStoreVisitMapper; import co.yixiang.modules.activity.vo.CombinationQueryVo; import co.yixiang.modules.activity.vo.StoreCombinationVo; import co.yixiang.modules.activity.vo.YxStoreCombinationQueryVo; -import co.yixiang.modules.product.domain.YxStoreProduct; import co.yixiang.modules.product.domain.YxStoreProductAttrValue; import co.yixiang.modules.product.service.YxStoreProductAttrService; import co.yixiang.modules.product.service.YxStoreProductAttrValueService; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueServiceImpl.java index bbadbb61..f0bd4cc7 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueServiceImpl.java @@ -9,7 +9,7 @@ package co.yixiang.modules.activity.service.impl; import cn.hutool.core.util.ObjectUtil; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.dozer.service.IGenerator; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java index 55480697..357340f2 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java @@ -10,7 +10,7 @@ package co.yixiang.modules.activity.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.constant.ShopConstants; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java index 2fdcd5ec..0f2ce702 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java @@ -11,7 +11,7 @@ package co.yixiang.modules.activity.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.constant.ShopConstants; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java index 7af4cd8c..c3f56e02 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java @@ -10,11 +10,10 @@ package co.yixiang.modules.activity.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.dozer.service.IGenerator; @@ -22,7 +21,6 @@ import co.yixiang.enums.ShopCommonEnum; import co.yixiang.enums.SpecTypeEnum; import co.yixiang.exception.BadRequestException; import co.yixiang.modules.activity.domain.YxStoreSeckill; -import co.yixiang.modules.activity.domain.YxStoreSeckill; import co.yixiang.modules.activity.service.YxStoreSeckillService; import co.yixiang.modules.activity.service.dto.YxStoreSeckillDto; import co.yixiang.modules.activity.service.dto.YxStoreSeckillQueryCriteria; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java index 32348801..8ec140f5 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java @@ -11,7 +11,7 @@ package co.yixiang.modules.activity.service.impl; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.dozer.service.IGenerator; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/canvas/domain/StoreCanvas.java b/zsw-bxg/src/main/java/co/yixiang/modules/canvas/domain/StoreCanvas.java index 98434099..f88b4cf9 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/canvas/domain/StoreCanvas.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/canvas/domain/StoreCanvas.java @@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.validation.constraints.*; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; /** * @author yshop diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/canvas/rest/StoreCanvasController.java b/zsw-bxg/src/main/java/co/yixiang/modules/canvas/rest/StoreCanvasController.java index a824109f..ef8a2b96 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/canvas/rest/StoreCanvasController.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/canvas/rest/StoreCanvasController.java @@ -10,7 +10,7 @@ package co.yixiang.modules.canvas.rest; import java.util.Arrays; import cn.hutool.core.util.StrUtil; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.constant.ShopConstants; import co.yixiang.constant.SystemConfigConstants; import co.yixiang.enums.ShopCommonEnum; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/cart/domain/YxStoreCart.java b/zsw-bxg/src/main/java/co/yixiang/modules/cart/domain/YxStoreCart.java index 34dbea8a..1f23097e 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/cart/domain/YxStoreCart.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/cart/domain/YxStoreCart.java @@ -7,7 +7,7 @@ package co.yixiang.modules.cart.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/cart/service/impl/YxStoreCartServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/cart/service/impl/YxStoreCartServiceImpl.java index dcd00d30..15a5ea11 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/cart/service/impl/YxStoreCartServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/cart/service/impl/YxStoreCartServiceImpl.java @@ -10,7 +10,7 @@ package co.yixiang.modules.cart.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.dozer.service.IGenerator; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/category/domain/YxStoreCategory.java b/zsw-bxg/src/main/java/co/yixiang/modules/category/domain/YxStoreCategory.java index 6ce984c9..33119ac2 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/category/domain/YxStoreCategory.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/category/domain/YxStoreCategory.java @@ -7,7 +7,7 @@ package co.yixiang.modules.category.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/category/rest/StoreCategoryController.java b/zsw-bxg/src/main/java/co/yixiang/modules/category/rest/StoreCategoryController.java index 94aad122..5270f6ee 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/category/rest/StoreCategoryController.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/category/rest/StoreCategoryController.java @@ -9,7 +9,7 @@ package co.yixiang.modules.category.rest; import cn.hutool.core.util.StrUtil; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.constant.ShopConstants; import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; @@ -72,7 +72,7 @@ public class StoreCategoryController { @Log("查询商品分类") @ApiOperation(value = "查询商品分类") @GetMapping(value = "/yxStoreCategory") - @PreAuthorize("hasAnyRole('admin','YXSTORECATEGORY_ALL','YXSTORECATEGORY_SELECT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTORECATEGORY_ALL','YXSTORECATEGORY_SELECT')") public ResponseEntity getYxStoreCategorys(YxStoreCategoryQueryCriteria criteria, Pageable pageable){ List categoryDTOList = yxStoreCategoryService.queryAll(criteria); return new ResponseEntity<>(yxStoreCategoryService.buildTree(categoryDTOList),HttpStatus.OK); @@ -83,7 +83,7 @@ public class StoreCategoryController { @ApiOperation(value = "新增商品分类") @PostMapping(value = "/yxStoreCategory") @CacheEvict(cacheNames = ShopConstants.YSHOP_REDIS_INDEX_KEY,allEntries = true) - @PreAuthorize("hasAnyRole('admin','YXSTORECATEGORY_ALL','YXSTORECATEGORY_CREATE')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTORECATEGORY_ALL','YXSTORECATEGORY_CREATE')") public ResponseEntity create(@Validated @RequestBody YxStoreCategory resources){ if(resources.getPid() != null && resources.getPid() > 0 && StrUtil.isBlank(resources.getPic())) { throw new YshopException("子分类图片必传"); @@ -102,7 +102,7 @@ public class StoreCategoryController { @ApiOperation(value = "修改商品分类") @CacheEvict(cacheNames = ShopConstants.YSHOP_REDIS_INDEX_KEY,allEntries = true) @PutMapping(value = "/yxStoreCategory") - @PreAuthorize("hasAnyRole('admin','YXSTORECATEGORY_ALL','YXSTORECATEGORY_EDIT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTORECATEGORY_ALL','YXSTORECATEGORY_EDIT')") public ResponseEntity update(@Validated @RequestBody YxStoreCategory resources){ if(resources.getPid() != null && resources.getPid() > 0 && StrUtil.isBlank(resources.getPic())) { throw new YshopException("子分类图片必传"); @@ -127,7 +127,7 @@ public class StoreCategoryController { @ApiOperation(value = "删除商品分类") @CacheEvict(cacheNames = ShopConstants.YSHOP_REDIS_INDEX_KEY,allEntries = true) @DeleteMapping(value = "/yxStoreCategory/{id}") - @PreAuthorize("hasAnyRole('admin','YXSTORECATEGORY_ALL','YXSTORECATEGORY_DELETE')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTORECATEGORY_ALL','YXSTORECATEGORY_DELETE')") public ResponseEntity delete(@PathVariable String id){ String[] ids = id.split(","); for (String newId: ids) { diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/customer/domain/YxStoreCustomer.java b/zsw-bxg/src/main/java/co/yixiang/modules/customer/domain/YxStoreCustomer.java index aa8d83b9..6cd49ac0 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/customer/domain/YxStoreCustomer.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/customer/domain/YxStoreCustomer.java @@ -13,8 +13,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.validation.constraints.*; -import java.util.Date; -import co.yixiang.domain.BaseDomain; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; /** * @author Bug diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/monitor/rest/BxgRedisController.java b/zsw-bxg/src/main/java/co/yixiang/modules/monitor/rest/BxgRedisController.java index 14ef0838..f533e56c 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/monitor/rest/BxgRedisController.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/monitor/rest/BxgRedisController.java @@ -30,7 +30,7 @@ public class BxgRedisController { @Log("查询Redis缓存") @GetMapping(value = "/redis") - @PreAuthorize("hasAnyRole('ADMIN','REDIS_ALL','REDIS_SELECT')") + @PreAuthorize("@ss.hasAnyPermissions('ADMIN','REDIS_ALL','REDIS_SELECT')") public ResponseEntity getRedis(String key, Pageable pageable){ return new ResponseEntity(redisService.findByKey(key,pageable), HttpStatus.OK); } @@ -38,7 +38,7 @@ public class BxgRedisController { @ForbidSubmit @Log("删除Redis缓存") @DeleteMapping(value = "/redis") - @PreAuthorize("hasAnyRole('ADMIN','REDIS_ALL','REDIS_DELETE')") + @PreAuthorize("@ss.hasAnyPermissions('ADMIN','REDIS_ALL','REDIS_DELETE')") public ResponseEntity delete(@RequestBody RedisVo resources){ redisService.delete(resources.getKey()); return new ResponseEntity(HttpStatus.OK); @@ -47,7 +47,7 @@ public class BxgRedisController { @ForbidSubmit @Log("清空Redis缓存") @DeleteMapping(value = "/redis/all") - @PreAuthorize("hasAnyRole('ADMIN','REDIS_ALL','REDIS_DELETE')") + @PreAuthorize("@ss.hasAnyPermissions('ADMIN','REDIS_ALL','REDIS_DELETE')") public ResponseEntity deleteAll(){ redisService.flushdb(); return new ResponseEntity(HttpStatus.OK); diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/mp/domain/YxArticle.java b/zsw-bxg/src/main/java/co/yixiang/modules/mp/domain/YxArticle.java index afa1a5ca..fc0b9c9b 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/mp/domain/YxArticle.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/mp/domain/YxArticle.java @@ -7,7 +7,7 @@ package co.yixiang.modules.mp.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/mp/domain/YxWechatTemplate.java b/zsw-bxg/src/main/java/co/yixiang/modules/mp/domain/YxWechatTemplate.java index 70668c00..935d515c 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/mp/domain/YxWechatTemplate.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/mp/domain/YxWechatTemplate.java @@ -7,7 +7,7 @@ package co.yixiang.modules.mp.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/mp/service/WeiXinSubscribeService.java b/zsw-bxg/src/main/java/co/yixiang/modules/mp/service/WeiXinSubscribeService.java index c5a360bd..f7986734 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/mp/service/WeiXinSubscribeService.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/mp/service/WeiXinSubscribeService.java @@ -3,7 +3,7 @@ package co.yixiang.modules.mp.service; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage; import cn.hutool.core.util.StrUtil; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.constant.ShopConstants; import co.yixiang.enums.ShopCommonEnum; import co.yixiang.modules.mp.domain.YxWechatTemplate; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/mp/service/WeixinPayService.java b/zsw-bxg/src/main/java/co/yixiang/modules/mp/service/WeixinPayService.java index 740d7d6d..23c9ecd1 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/mp/service/WeixinPayService.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/mp/service/WeixinPayService.java @@ -12,7 +12,7 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.BusinessException; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.enums.AppFromEnum; import co.yixiang.enums.BillDetailEnum; import co.yixiang.enums.OrderInfoEnum; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/mp/service/WeixinTemplateService.java b/zsw-bxg/src/main/java/co/yixiang/modules/mp/service/WeixinTemplateService.java index 5f107ecf..6925de87 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/mp/service/WeixinTemplateService.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/mp/service/WeixinTemplateService.java @@ -9,7 +9,7 @@ package co.yixiang.modules.mp.service; import cn.hutool.core.util.StrUtil; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.constant.ShopConstants; import co.yixiang.enums.ShopCommonEnum; import co.yixiang.modules.mp.config.WxMpConfiguration; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/order/domain/YxExpress.java b/zsw-bxg/src/main/java/co/yixiang/modules/order/domain/YxExpress.java index 04befbe0..2d682414 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/order/domain/YxExpress.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/order/domain/YxExpress.java @@ -7,7 +7,7 @@ package co.yixiang.modules.order.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/order/domain/YxStoreOrder.java b/zsw-bxg/src/main/java/co/yixiang/modules/order/domain/YxStoreOrder.java index 357b9c54..ec3a6da2 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/order/domain/YxStoreOrder.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/order/domain/YxStoreOrder.java @@ -7,7 +7,7 @@ package co.yixiang.modules.order.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java b/zsw-bxg/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java index b3c3fe43..7b09146c 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java @@ -120,7 +120,7 @@ public class StoreOrderController { @ApiOperation(value = "查询订单") @GetMapping(value = "/yxStoreOrder") - @PreAuthorize("hasAnyRole('admin','YXSTOREORDER_ALL','YXSTOREORDER_SELECT','YXEXPRESS_SELECT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTOREORDER_ALL','YXSTOREORDER_SELECT','YXEXPRESS_SELECT')") public ResponseEntity getYxStoreOrders(YxStoreOrderQueryCriteria criteria, Pageable pageable, @RequestParam(name = "orderStatus") String orderStatus, @@ -133,7 +133,7 @@ public class StoreOrderController { @ApiOperation(value = "根据订单id获取订单详情") @GetMapping(value = "/getStoreOrderDetail/{id}") - @PreAuthorize("hasAnyRole('admin','YXSTOREORDER_ALL','YXSTOREORDER_SELECT','YXEXPRESS_SELECT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTOREORDER_ALL','YXSTOREORDER_SELECT','YXEXPRESS_SELECT')") public ResponseEntity getYxStoreOrders(@PathVariable Long id) { return new ResponseEntity<>(yxStoreOrderService.getOrderDetail(id), HttpStatus.OK); } @@ -198,7 +198,7 @@ public class StoreOrderController { } @ApiOperation(value = "发货") @PutMapping(value = "/yxStoreOrder") - @PreAuthorize("hasAnyRole('admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT')") public ResponseEntity update(@Validated @RequestBody YxStoreOrder resources) { if (StrUtil.isBlank(resources.getDeliveryName())) { throw new BadRequestException("请选择快递公司"); @@ -232,7 +232,7 @@ public class StoreOrderController { @ApiOperation(value = "订单核销") @PutMapping(value = "/yxStoreOrder/check") - @PreAuthorize("hasAnyRole('admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT')") public ResponseEntity check(@Validated @RequestBody YxStoreOrder resources) { if (StrUtil.isBlank(resources.getVerifyCode())) { throw new BadRequestException("核销码不能为空"); @@ -254,7 +254,7 @@ public class StoreOrderController { @ApiOperation(value = "退款") @PostMapping(value = "/yxStoreOrder/refund") - @PreAuthorize("hasAnyRole('admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT')") public ResponseEntity refund(@Validated @RequestBody YxStoreOrder resources) { yxStoreOrderService.orderRefund(resources.getOrderId(),resources.getPayPrice(), ShopCommonEnum.AGREE_1.getValue()); @@ -266,7 +266,7 @@ public class StoreOrderController { @Log("删除") @ApiOperation(value = "删除") @DeleteMapping(value = "/yxStoreOrder/{id}") - @PreAuthorize("hasAnyRole('admin','YXSTOREORDER_ALL','YXSTOREORDER_DELETE')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTOREORDER_ALL','YXSTOREORDER_DELETE')") public ResponseEntity delete(@PathVariable Integer id) { yxStoreOrderService.removeById(id); return new ResponseEntity(HttpStatus.OK); @@ -276,7 +276,7 @@ public class StoreOrderController { @Log("修改订单") @ApiOperation(value = "修改订单") @PostMapping(value = "/yxStoreOrder/edit") - @PreAuthorize("hasAnyRole('admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT')") public ResponseEntity editOrder(@RequestBody YxStoreOrder resources) { if (ObjectUtil.isNull(resources.getPayPrice())) { throw new BadRequestException("请输入支付金额"); @@ -303,7 +303,7 @@ public class StoreOrderController { @Log("修改订单备注") @ApiOperation(value = "修改订单备注") @PostMapping(value = "/yxStoreOrder/remark") - @PreAuthorize("hasAnyRole('admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT')") public ResponseEntity editOrderRemark(@RequestBody YxStoreOrder resources) { if (StrUtil.isBlank(resources.getRemark())) { throw new BadRequestException("请输入备注"); @@ -343,7 +343,7 @@ public class StoreOrderController { @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/yxStoreOrder/download") - @PreAuthorize("hasAnyRole('admin','YXSTOREORDER_SELECT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTOREORDER_SELECT')") public void download(HttpServletResponse response, YxStoreOrderQueryCriteria criteria, Pageable pageable, diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java index 5a1961b8..2bada6d2 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java @@ -15,7 +15,7 @@ import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.BusinessException; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.constant.ShopConstants; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/product/domain/YxStoreProduct.java b/zsw-bxg/src/main/java/co/yixiang/modules/product/domain/YxStoreProduct.java index e8262170..55e17047 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/product/domain/YxStoreProduct.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/product/domain/YxStoreProduct.java @@ -7,7 +7,7 @@ package co.yixiang.modules.product.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import co.yixiang.modules.category.domain.YxStoreCategory; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/product/domain/YxStoreProductRelation.java b/zsw-bxg/src/main/java/co/yixiang/modules/product/domain/YxStoreProductRelation.java index 0d5465a8..86aec2fe 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/product/domain/YxStoreProductRelation.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/product/domain/YxStoreProductRelation.java @@ -1,7 +1,7 @@ package co.yixiang.modules.product.domain; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModelProperty; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/product/domain/YxStoreProductReply.java b/zsw-bxg/src/main/java/co/yixiang/modules/product/domain/YxStoreProductReply.java index 651051b9..fe571a3c 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/product/domain/YxStoreProductReply.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/product/domain/YxStoreProductReply.java @@ -7,7 +7,7 @@ package co.yixiang.modules.product.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import co.yixiang.modules.user.domain.YxUser; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/product/domain/YxStoreProductRule.java b/zsw-bxg/src/main/java/co/yixiang/modules/product/domain/YxStoreProductRule.java index 7622f181..7f763c68 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/product/domain/YxStoreProductRule.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/product/domain/YxStoreProductRule.java @@ -10,7 +10,7 @@ package co.yixiang.modules.product.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java b/zsw-bxg/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java index f7bbe2bd..edca93a8 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java @@ -90,7 +90,7 @@ public class StoreProductController { @Log("查询商品") @ApiOperation(value = "查询商品") @GetMapping(value = "/yxStoreProduct") - @PreAuthorize("hasAnyRole('admin','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_SELECT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_SELECT')") public ResponseEntity getYxStoreProducts(YxStoreProductQueryCriteria criteria, Pageable pageable){ //商品分类 List storeCategories = yxStoreCategoryService.lambdaQuery() @@ -108,7 +108,7 @@ public class StoreProductController { @ApiOperation(value = "新增/修改商品") @CacheEvict(cacheNames = ShopConstants.YSHOP_REDIS_INDEX_KEY,allEntries = true) @PostMapping(value = "/yxStoreProduct/addOrSave") - @PreAuthorize("hasAnyRole('admin','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_CREATE')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_CREATE')") public ResponseEntity create(@Validated @RequestBody StoreProductDto storeProductDto){ yxStoreProductService.insertAndEditYxStoreProduct(storeProductDto); return new ResponseEntity<>(HttpStatus.CREATED); @@ -120,7 +120,7 @@ public class StoreProductController { @ApiOperation(value = "删除商品") @CacheEvict(cacheNames = ShopConstants.YSHOP_REDIS_INDEX_KEY,allEntries = true) @DeleteMapping(value = "/yxStoreProduct/{id}") - @PreAuthorize("hasAnyRole('admin','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_DELETE')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_DELETE')") public ResponseEntity delete(@PathVariable Long id){ yxStoreProductService.removeById(id); return new ResponseEntity(HttpStatus.OK); diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/product/rest/StoreProductReplyController.java b/zsw-bxg/src/main/java/co/yixiang/modules/product/rest/StoreProductReplyController.java index d2f8a853..8c5d744a 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/product/rest/StoreProductReplyController.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/product/rest/StoreProductReplyController.java @@ -50,7 +50,7 @@ public class StoreProductReplyController { @Log("查询") @ApiOperation(value = "查询") @GetMapping(value = "/yxStoreProductReply") - @PreAuthorize("hasAnyRole('admin','YXSTOREPRODUCTREPLY_ALL','YXSTOREPRODUCTREPLY_SELECT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTOREPRODUCTREPLY_ALL','YXSTOREPRODUCTREPLY_SELECT')") public ResponseEntity getYxStoreProductReplys(YxStoreProductReplyQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(yxStoreProductReplyService.queryAll(criteria,pageable),HttpStatus.OK); } @@ -60,7 +60,7 @@ public class StoreProductReplyController { @Log("修改") @ApiOperation(value = "修改") @PutMapping(value = "/yxStoreProductReply") - @PreAuthorize("hasAnyRole('admin','YXSTOREPRODUCTREPLY_ALL','YXSTOREPRODUCTREPLY_EDIT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTOREPRODUCTREPLY_ALL','YXSTOREPRODUCTREPLY_EDIT')") public ResponseEntity update(@Validated @RequestBody YxStoreProductReply resources){ resources.setMerchantReplyTime(new Date()); resources.setIsReply(ShopCommonEnum.REPLY_1.getValue()); @@ -72,7 +72,7 @@ public class StoreProductReplyController { @Log("删除") @ApiOperation(value = "删除") @DeleteMapping(value = "/yxStoreProductReply/{id}") - @PreAuthorize("hasAnyRole('admin','YXSTOREPRODUCTREPLY_ALL','YXSTOREPRODUCTREPLY_DELETE')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSTOREPRODUCTREPLY_ALL','YXSTOREPRODUCTREPLY_DELETE')") public ResponseEntity delete(@PathVariable Long id){ yxStoreProductReplyService.removeById(id); return new ResponseEntity(HttpStatus.OK); diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/product/rest/StoreProductRuleController.java b/zsw-bxg/src/main/java/co/yixiang/modules/product/rest/StoreProductRuleController.java index b90b4648..893f6f41 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/product/rest/StoreProductRuleController.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/product/rest/StoreProductRuleController.java @@ -70,7 +70,7 @@ public class StoreProductRuleController { @PostMapping("/save/{id}") @Log("新增/修改sku规则") @ApiOperation("新增/修改sku规则") - @PreAuthorize("hasAnyRole('admin','yxStoreProductRule:add','yxStoreProductRule:edit')") + @PreAuthorize("@ss.hasAnyPermissions('admin','yxStoreProductRule:add','yxStoreProductRule:edit')") public ResponseEntity create(@Validated @RequestBody YxStoreProductRule resources,@PathVariable Integer id){ if(id != null && id > 0){ resources.setId(id); diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrServiceImpl.java index dbedaeec..aec40b87 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrServiceImpl.java @@ -8,12 +8,11 @@ */ package co.yixiang.modules.product.service.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.BusinessException; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.dozer.service.IGenerator; import co.yixiang.enums.ProductTypeEnum; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductRelationServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductRelationServiceImpl.java index 0899ec60..74a9a8db 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductRelationServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductRelationServiceImpl.java @@ -8,7 +8,7 @@ */ package co.yixiang.modules.product.service.impl; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.domain.PageResult; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java index 691c6a8b..1271c01c 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java @@ -14,7 +14,7 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.constant.ShopConstants; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/sales/service/impl/StoreAfterSalesServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/sales/service/impl/StoreAfterSalesServiceImpl.java index 89549a68..28894faf 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/sales/service/impl/StoreAfterSalesServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/sales/service/impl/StoreAfterSalesServiceImpl.java @@ -1,7 +1,7 @@ package co.yixiang.modules.sales.service.impl; import cn.hutool.core.util.NumberUtil; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.dozer.service.IGenerator; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxAppVersion.java b/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxAppVersion.java index 3f396a6b..1497cc24 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxAppVersion.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxAppVersion.java @@ -12,9 +12,7 @@ import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import javax.validation.constraints.*; -import java.util.Date; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; /** * @author lioncity diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxMaterial.java b/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxMaterial.java index a2bcd1f4..d472dbef 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxMaterial.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxMaterial.java @@ -7,7 +7,7 @@ package co.yixiang.modules.shop.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxMaterialGroup.java b/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxMaterialGroup.java index 6ef7b3fe..7d630c52 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxMaterialGroup.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxMaterialGroup.java @@ -7,7 +7,7 @@ package co.yixiang.modules.shop.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxSystemAttachment.java b/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxSystemAttachment.java index d3b58931..c421df2c 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxSystemAttachment.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxSystemAttachment.java @@ -1,7 +1,7 @@ package co.yixiang.modules.shop.domain; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java b/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java index 8fc3c985..4feabb94 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java @@ -7,7 +7,7 @@ package co.yixiang.modules.shop.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxSystemStore.java b/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxSystemStore.java index bf9b0d4d..30e781a5 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxSystemStore.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxSystemStore.java @@ -7,7 +7,7 @@ package co.yixiang.modules.shop.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxSystemStoreStaff.java b/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxSystemStoreStaff.java index 2734fa11..1f05cde8 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxSystemStoreStaff.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxSystemStoreStaff.java @@ -7,7 +7,7 @@ package co.yixiang.modules.shop.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserLevel.java b/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserLevel.java index de40c249..8ecf3e5d 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserLevel.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserLevel.java @@ -7,7 +7,7 @@ package co.yixiang.modules.shop.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/shop/rest/ExpressController.java b/zsw-bxg/src/main/java/co/yixiang/modules/shop/rest/ExpressController.java index 7a48b338..48806e9d 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/shop/rest/ExpressController.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/shop/rest/ExpressController.java @@ -48,7 +48,7 @@ public class ExpressController { @Log("查询快递") @ApiOperation(value = "查询快递") @GetMapping(value = "/yxExpress") - @PreAuthorize("hasAnyRole('admin','YXEXPRESS_ALL','YXEXPRESS_SELECT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXEXPRESS_ALL','YXEXPRESS_SELECT')") public ResponseEntity getYxExpresss(YxExpressQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(yxExpressService.queryAll(criteria,pageable),HttpStatus.OK); } @@ -57,7 +57,7 @@ public class ExpressController { @Log("新增快递") @ApiOperation(value = "新增快递") @PostMapping(value = "/yxExpress") - @PreAuthorize("hasAnyRole('admin','YXEXPRESS_ALL','YXEXPRESS_CREATE')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXEXPRESS_ALL','YXEXPRESS_CREATE')") public ResponseEntity create(@Validated @RequestBody YxExpress resources){ return new ResponseEntity<>(yxExpressService.save(resources),HttpStatus.CREATED); } @@ -66,7 +66,7 @@ public class ExpressController { @Log("修改快递") @ApiOperation(value = "修改快递") @PutMapping(value = "/yxExpress") - @PreAuthorize("hasAnyRole('admin','YXEXPRESS_ALL','YXEXPRESS_EDIT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXEXPRESS_ALL','YXEXPRESS_EDIT')") public ResponseEntity update(@Validated @RequestBody YxExpress resources){ yxExpressService.saveOrUpdate(resources); return new ResponseEntity(HttpStatus.NO_CONTENT); @@ -76,7 +76,7 @@ public class ExpressController { @Log("删除快递") @ApiOperation(value = "删除快递") @DeleteMapping(value = "/yxExpress/{id}") - @PreAuthorize("hasAnyRole('admin','YXEXPRESS_ALL','YXEXPRESS_DELETE')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXEXPRESS_ALL','YXEXPRESS_DELETE')") public ResponseEntity delete(@PathVariable Integer id){ yxExpressService.removeById(id); return new ResponseEntity(HttpStatus.OK); diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/shop/rest/SystemConfigController.java b/zsw-bxg/src/main/java/co/yixiang/modules/shop/rest/SystemConfigController.java index ed7c94c7..8630fbdc 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/shop/rest/SystemConfigController.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/shop/rest/SystemConfigController.java @@ -57,7 +57,7 @@ public class SystemConfigController { @Log("查询") @ApiOperation(value = "查询") @GetMapping(value = "/yxSystemConfig") - @PreAuthorize("hasAnyRole('admin','YXSYSTEMCONFIG_ALL','YXSYSTEMCONFIG_SELECT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSYSTEMCONFIG_ALL','YXSYSTEMCONFIG_SELECT')") public ResponseEntity getYxSystemConfigs(YxSystemConfigQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(yxSystemConfigService.queryAll(criteria,pageable),HttpStatus.OK); } @@ -67,7 +67,7 @@ public class SystemConfigController { @ApiOperation(value = "新增或修改") @PostMapping(value = "/yxSystemConfig") @CacheEvict(cacheNames = ShopConstants.YSHOP_REDIS_INDEX_KEY,allEntries = true) - @PreAuthorize("hasAnyRole('admin','YXSYSTEMCONFIG_ALL','YXSYSTEMCONFIG_CREATE')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSYSTEMCONFIG_ALL','YXSYSTEMCONFIG_CREATE')") public ResponseEntity create(@RequestBody String jsonStr){ JSONObject jsonObject = JSON.parseObject(jsonStr); jsonObject.forEach( diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/shop/rest/SystemGroupDataController.java b/zsw-bxg/src/main/java/co/yixiang/modules/shop/rest/SystemGroupDataController.java index 6a331ae1..b11243ec 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/shop/rest/SystemGroupDataController.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/shop/rest/SystemGroupDataController.java @@ -52,7 +52,7 @@ public class SystemGroupDataController { @Log("查询数据配置") @ApiOperation(value = "查询数据配置") @GetMapping(value = "/yxSystemGroupData") - @PreAuthorize("hasAnyRole('admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_SELECT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_SELECT')") public ResponseEntity getYxSystemGroupDatas(YxSystemGroupDataQueryCriteria criteria, Pageable pageable) { Sort sort = Sort.by(Sort.Direction.DESC, "sort"); @@ -67,7 +67,7 @@ public class SystemGroupDataController { @ApiOperation(value = "新增数据配置") @PostMapping(value = "/yxSystemGroupData") @CacheEvict(cacheNames = ShopConstants.YSHOP_REDIS_INDEX_KEY, allEntries = true) - @PreAuthorize("hasAnyRole('admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_CREATE')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_CREATE')") public ResponseEntity create(@RequestBody String jsonStr) { JSONObject jsonObject = JSON.parseObject(jsonStr); this.checkParam(jsonObject); @@ -98,7 +98,7 @@ public class SystemGroupDataController { @ApiOperation(value = "修改数据配置") @PutMapping(value = "/yxSystemGroupData") @CacheEvict(cacheNames = ShopConstants.YSHOP_REDIS_INDEX_KEY, allEntries = true) - @PreAuthorize("hasAnyRole('admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT')") public ResponseEntity update(@RequestBody String jsonStr) { JSONObject jsonObject = JSON.parseObject(jsonStr); this.checkParam(jsonObject); @@ -143,7 +143,7 @@ public class SystemGroupDataController { @Log("删除数据配置") @ApiOperation(value = "删除数据配置") @DeleteMapping(value = "/yxSystemGroupData/{id}") - @PreAuthorize("hasAnyRole('admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_DELETE')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_DELETE')") public ResponseEntity delete(@PathVariable Integer id) { yxSystemGroupDataService.removeById(id); return new ResponseEntity(HttpStatus.OK); diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/shop/vo/YxAppVersionVo.java b/zsw-bxg/src/main/java/co/yixiang/modules/shop/vo/YxAppVersionVo.java index dc11c8f5..9ce37f92 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/shop/vo/YxAppVersionVo.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/shop/vo/YxAppVersionVo.java @@ -2,9 +2,6 @@ package co.yixiang.modules.shop.vo; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.io.Serializable; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/system/domain/Menu.java b/zsw-bxg/src/main/java/co/yixiang/modules/system/domain/Menu.java index 53d06bca..5b280fa2 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/system/domain/Menu.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/system/domain/Menu.java @@ -10,7 +10,7 @@ package co.yixiang.modules.system.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/system/service/impl/BxgMenuServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/system/service/impl/BxgMenuServiceImpl.java index 3866d307..2fafba54 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/system/service/impl/BxgMenuServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/system/service/impl/BxgMenuServiceImpl.java @@ -10,7 +10,7 @@ package co.yixiang.modules.system.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.dozer.service.IGenerator; @@ -27,7 +27,6 @@ import co.yixiang.modules.system.service.mapper.BxgMenuMapper; import co.yixiang.utils.FileUtil; import co.yixiang.utils.StringUtils; import co.yixiang.utils.ValidationUtil; -import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageInfo; import lombok.AllArgsConstructor; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/template/domain/YxShippingTemplates.java b/zsw-bxg/src/main/java/co/yixiang/modules/template/domain/YxShippingTemplates.java index 9f220c8e..87a34524 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/template/domain/YxShippingTemplates.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/template/domain/YxShippingTemplates.java @@ -10,7 +10,7 @@ package co.yixiang.modules.template.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/template/rest/ShippingTemplatesController.java b/zsw-bxg/src/main/java/co/yixiang/modules/template/rest/ShippingTemplatesController.java index 14c48b24..f10f775e 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/template/rest/ShippingTemplatesController.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/template/rest/ShippingTemplatesController.java @@ -80,7 +80,7 @@ public class ShippingTemplatesController { @PostMapping("/save/{id}") @Log("新增/保存运费模板") @ApiOperation("新增/保存运费模板") - @PreAuthorize("hasAnyRole('admin','yxShippingTemplates:add','yxShippingTemplates:edit')") + @PreAuthorize("@ss.hasAnyPermissions('admin','yxShippingTemplates:add','yxShippingTemplates:edit')") public ResponseEntity create(@PathVariable Integer id, @Validated @RequestBody ShippingTemplatesDto shippingTemplatesDto){ yxShippingTemplatesService.addAndUpdate(id,shippingTemplatesDto); diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/template/service/impl/YxShippingTemplatesServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/template/service/impl/YxShippingTemplatesServiceImpl.java index 17fb1b7b..d5a39372 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/template/service/impl/YxShippingTemplatesServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/template/service/impl/YxShippingTemplatesServiceImpl.java @@ -11,7 +11,7 @@ package co.yixiang.modules.template.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; import co.yixiang.api.BusinessException; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.dozer.service.IGenerator; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxSystemUserTask.java b/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxSystemUserTask.java index 7a0c55bc..8bf95f39 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxSystemUserTask.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxSystemUserTask.java @@ -7,7 +7,7 @@ package co.yixiang.modules.user.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUser.java b/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUser.java index 9f73e7fe..8b601d12 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUser.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUser.java @@ -7,7 +7,7 @@ package co.yixiang.modules.user.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import co.yixiang.modules.user.service.dto.WechatUserDto; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUserAddress.java b/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUserAddress.java index fc8a2d38..fa35812d 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUserAddress.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUserAddress.java @@ -1,7 +1,7 @@ package co.yixiang.modules.user.domain; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUserBill.java b/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUserBill.java index 12458595..829a9d7f 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUserBill.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUserBill.java @@ -7,7 +7,7 @@ package co.yixiang.modules.user.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUserLevel.java b/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUserLevel.java index 89fda054..77346458 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUserLevel.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUserLevel.java @@ -1,6 +1,6 @@ package co.yixiang.modules.user.domain; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUserRecharge.java b/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUserRecharge.java index a252a303..17ac2147 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUserRecharge.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUserRecharge.java @@ -7,7 +7,7 @@ package co.yixiang.modules.user.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUserSign.java b/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUserSign.java index 13219869..04bf99ef 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUserSign.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUserSign.java @@ -1,7 +1,7 @@ package co.yixiang.modules.user.domain; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUserTaskFinish.java b/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUserTaskFinish.java index d74bfa1f..f142bfbf 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUserTaskFinish.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/user/domain/YxUserTaskFinish.java @@ -1,7 +1,7 @@ package co.yixiang.modules.user.domain; -import co.yixiang.domain.BaseDomain; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDomain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/user/rest/MemberController.java b/zsw-bxg/src/main/java/co/yixiang/modules/user/rest/MemberController.java index 4a497319..532e2f19 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/user/rest/MemberController.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/user/rest/MemberController.java @@ -50,7 +50,7 @@ public class MemberController { @Log("查看下级") @ApiOperation(value = "查看下级") @PostMapping(value = "/yxUser/spread") - @PreAuthorize("hasAnyRole('admin','YXUSER_ALL','YXUSER_EDIT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXUSER_ALL','YXUSER_EDIT')") public ResponseEntity getSpread(@RequestBody YxUserQueryCriteria criteria){ return new ResponseEntity<>(yxUserService.querySpread(criteria.getUid(),criteria.getGrade()), HttpStatus.OK); @@ -59,7 +59,7 @@ public class MemberController { @Log("查询用户") @ApiOperation(value = "查询用户") @GetMapping(value = "/yxUser") - @PreAuthorize("hasAnyRole('admin','YXUSER_ALL','YXUSER_SELECT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXUSER_ALL','YXUSER_SELECT')") public ResponseEntity getYxUsers(YxUserQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(yxUserService.queryAll(criteria,pageable),HttpStatus.OK); } @@ -68,7 +68,7 @@ public class MemberController { @Log("修改用户") @ApiOperation(value = "修改用户") @PutMapping(value = "/yxUser") - @PreAuthorize("hasAnyRole('admin','YXUSER_ALL','YXUSER_EDIT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXUSER_ALL','YXUSER_EDIT')") public ResponseEntity update(@Validated @RequestBody YxUser resources){ yxUserService.saveOrUpdate(resources); return new ResponseEntity(HttpStatus.NO_CONTENT); @@ -78,7 +78,7 @@ public class MemberController { @Log("删除用户") @ApiOperation(value = "删除用户") @DeleteMapping(value = "/yxUser/{uid}") - @PreAuthorize("hasAnyRole('admin','YXUSER_ALL','YXUSER_DELETE')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXUSER_ALL','YXUSER_DELETE')") public ResponseEntity delete(@PathVariable Integer uid){ yxUserService.removeById(uid); return new ResponseEntity(HttpStatus.OK); @@ -96,7 +96,7 @@ public class MemberController { @ApiOperation(value = "修改余额") @PostMapping(value = "/yxUser/money") - @PreAuthorize("hasAnyRole('admin','YXUSER_ALL','YXUSER_EDIT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXUSER_ALL','YXUSER_EDIT')") public ResponseEntity updatePrice(@Validated @RequestBody UserMoneyDto param){ yxUserService.updateMoney(param); return new ResponseEntity(HttpStatus.NO_CONTENT); diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/user/rest/SystemUserLevelController.java b/zsw-bxg/src/main/java/co/yixiang/modules/user/rest/SystemUserLevelController.java index 1cffd7d4..a418fc64 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/user/rest/SystemUserLevelController.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/user/rest/SystemUserLevelController.java @@ -44,7 +44,7 @@ public class SystemUserLevelController { @Log("查询") @ApiOperation(value = "查询") @GetMapping(value = "/yxSystemUserLevel") - @PreAuthorize("hasAnyRole('admin','YXSYSTEMUSERLEVEL_ALL','YXSYSTEMUSERLEVEL_SELECT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSYSTEMUSERLEVEL_ALL','YXSYSTEMUSERLEVEL_SELECT')") public ResponseEntity getYxSystemUserLevels(YxSystemUserLevelQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(yxSystemUserLevelService.queryAll(criteria,pageable),HttpStatus.OK); } @@ -53,7 +53,7 @@ public class SystemUserLevelController { @Log("新增") @ApiOperation(value = "新增") @PostMapping(value = "/yxSystemUserLevel") - @PreAuthorize("hasAnyRole('admin','YXSYSTEMUSERLEVEL_ALL','YXSYSTEMUSERLEVEL_CREATE')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSYSTEMUSERLEVEL_ALL','YXSYSTEMUSERLEVEL_CREATE')") public ResponseEntity create(@Validated @RequestBody YxSystemUserLevel resources){ return new ResponseEntity<>(yxSystemUserLevelService.save(resources),HttpStatus.CREATED); } @@ -62,7 +62,7 @@ public class SystemUserLevelController { @Log("修改") @ApiOperation(value = "修改") @PutMapping(value = "/yxSystemUserLevel") - @PreAuthorize("hasAnyRole('admin','YXSYSTEMUSERLEVEL_ALL','YXSYSTEMUSERLEVEL_EDIT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSYSTEMUSERLEVEL_ALL','YXSYSTEMUSERLEVEL_EDIT')") public ResponseEntity update(@Validated @RequestBody YxSystemUserLevel resources){ yxSystemUserLevelService.saveOrUpdate(resources); return new ResponseEntity(HttpStatus.NO_CONTENT); @@ -72,7 +72,7 @@ public class SystemUserLevelController { @Log("删除") @ApiOperation(value = "删除") @DeleteMapping(value = "/yxSystemUserLevel/{id}") - @PreAuthorize("hasAnyRole('admin','YXSYSTEMUSERLEVEL_ALL','YXSYSTEMUSERLEVEL_DELETE')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSYSTEMUSERLEVEL_ALL','YXSYSTEMUSERLEVEL_DELETE')") public ResponseEntity delete(@PathVariable Integer id){ yxSystemUserLevelService.removeById(id); return new ResponseEntity(HttpStatus.OK); diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/user/rest/SystemUserTaskController.java b/zsw-bxg/src/main/java/co/yixiang/modules/user/rest/SystemUserTaskController.java index 49bab01a..d0b90b67 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/user/rest/SystemUserTaskController.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/user/rest/SystemUserTaskController.java @@ -45,7 +45,7 @@ public class SystemUserTaskController { @Log("查询") @ApiOperation(value = "查询") @GetMapping(value = "/yxSystemUserTask") - @PreAuthorize("hasAnyRole('admin','YXSYSTEMUSERTASK_ALL','YXSYSTEMUSERTASK_SELECT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSYSTEMUSERTASK_ALL','YXSYSTEMUSERTASK_SELECT')") public ResponseEntity getYxSystemUserTasks(YxSystemUserTaskQueryCriteria criteria, Pageable pageable){ Sort sort = Sort.by(Sort.Direction.ASC, "level_id"); @@ -59,7 +59,7 @@ public class SystemUserTaskController { @Log("新增") @ApiOperation(value = "新增") @PostMapping(value = "/yxSystemUserTask") - @PreAuthorize("hasAnyRole('admin','YXSYSTEMUSERTASK_ALL','YXSYSTEMUSERTASK_CREATE')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSYSTEMUSERTASK_ALL','YXSYSTEMUSERTASK_CREATE')") public ResponseEntity create(@Validated @RequestBody YxSystemUserTask resources){ return new ResponseEntity(yxSystemUserTaskService.save(resources),HttpStatus.CREATED); } @@ -67,7 +67,7 @@ public class SystemUserTaskController { @Log("修改") @ApiOperation(value = "修改") @PutMapping(value = "/yxSystemUserTask") - @PreAuthorize("hasAnyRole('admin','YXSYSTEMUSERTASK_ALL','YXSYSTEMUSERTASK_EDIT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSYSTEMUSERTASK_ALL','YXSYSTEMUSERTASK_EDIT')") public ResponseEntity update(@Validated @RequestBody YxSystemUserTask resources){ //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); yxSystemUserTaskService.saveOrUpdate(resources); @@ -77,7 +77,7 @@ public class SystemUserTaskController { @Log("删除") @ApiOperation(value = "删除") @DeleteMapping(value = "/yxSystemUserTask/{id}") - @PreAuthorize("hasAnyRole('admin','YXSYSTEMUSERTASK_ALL','YXSYSTEMUSERTASK_DELETE')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXSYSTEMUSERTASK_ALL','YXSYSTEMUSERTASK_DELETE')") public ResponseEntity delete(@PathVariable Integer id){ //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); yxSystemUserTaskService.removeById(id); diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/user/rest/UserBillController.java b/zsw-bxg/src/main/java/co/yixiang/modules/user/rest/UserBillController.java index 40f5c09d..54889d71 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/user/rest/UserBillController.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/user/rest/UserBillController.java @@ -39,7 +39,7 @@ public class UserBillController { @Log("查询") @ApiOperation(value = "查询") @GetMapping(value = "/yxUserBill") - @PreAuthorize("hasAnyRole('admin','YXUSERBILL_ALL','YXUSERBILL_SELECT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXUSERBILL_ALL','YXUSERBILL_SELECT')") public ResponseEntity getYxUserBills(YxUserBillQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(yxUserBillService.queryAll(criteria,pageable),HttpStatus.OK); } diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserLevelServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserLevelServiceImpl.java index 7e1aae16..c3b99090 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserLevelServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserLevelServiceImpl.java @@ -9,7 +9,7 @@ package co.yixiang.modules.user.service.impl; import cn.hutool.core.util.ObjectUtil; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.dozer.service.IGenerator; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/user/service/impl/YxUserRechargeServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/user/service/impl/YxUserRechargeServiceImpl.java index 7c0ce614..91269fa7 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/user/service/impl/YxUserRechargeServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/user/service/impl/YxUserRechargeServiceImpl.java @@ -12,7 +12,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.dozer.service.IGenerator; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java index b9dbba00..62512889 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/user/service/impl/YxUserServiceImpl.java @@ -11,7 +11,7 @@ package co.yixiang.modules.user.service.impl; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import co.yixiang.api.ApiCode; +import cn.iocoder.yudao.framework.common.exception.ApiCode; import co.yixiang.api.UnAuthenticatedException; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/user/service/impl/YxUserSignServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/user/service/impl/YxUserSignServiceImpl.java index 1f9edb04..bde5f15f 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/user/service/impl/YxUserSignServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/user/service/impl/YxUserSignServiceImpl.java @@ -11,7 +11,7 @@ package co.yixiang.modules.user.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.constant.ShopConstants; import co.yixiang.dozer.service.IGenerator; diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/wechat/rest/WechatArticleController.java b/zsw-bxg/src/main/java/co/yixiang/modules/wechat/rest/WechatArticleController.java index 3ec1655a..c90d75aa 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/wechat/rest/WechatArticleController.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/wechat/rest/WechatArticleController.java @@ -47,14 +47,14 @@ public class WechatArticleController { @ApiOperation(value = "查询单条信息") @GetMapping(value = "/yxArticle/info/{id}") - @PreAuthorize("hasAnyRole('admin','YXARTICLE_ALL','YXARTICLE_GET')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXARTICLE_ALL','YXARTICLE_GET')") public ResponseEntity getInfo(@PathVariable Integer id){ return new ResponseEntity<>(yxArticleService.getById(id),HttpStatus.OK); } @ApiOperation(value = "查询") @GetMapping(value = "/yxArticle") - @PreAuthorize("hasAnyRole('admin','YXARTICLE_ALL','YXARTICLE_SELECT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXARTICLE_ALL','YXARTICLE_SELECT')") public ResponseEntity getYxArticles(YxArticleQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(yxArticleService.queryAll(criteria,pageable),HttpStatus.OK); } @@ -62,7 +62,7 @@ public class WechatArticleController { @ApiOperation(value = "新增") @PostMapping(value = "/yxArticle") - @PreAuthorize("hasAnyRole('admin','YXARTICLE_ALL','YXARTICLE_CREATE')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXARTICLE_ALL','YXARTICLE_CREATE')") public ResponseEntity create(@Validated @RequestBody YxArticle resources){ return new ResponseEntity<>(yxArticleService.save(resources),HttpStatus.CREATED); } @@ -70,7 +70,7 @@ public class WechatArticleController { @ApiOperation(value = "修改") @PutMapping(value = "/yxArticle") - @PreAuthorize("hasAnyRole('admin','YXARTICLE_ALL','YXARTICLE_EDIT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXARTICLE_ALL','YXARTICLE_EDIT')") public ResponseEntity update(@Validated @RequestBody YxArticle resources){ yxArticleService.saveOrUpdate(resources); return new ResponseEntity(HttpStatus.NO_CONTENT); @@ -79,7 +79,7 @@ public class WechatArticleController { @ForbidSubmit @ApiOperation(value = "删除") @DeleteMapping(value = "/yxArticle/{id}") - @PreAuthorize("hasAnyRole('admin','YXARTICLE_ALL','YXARTICLE_DELETE')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXARTICLE_ALL','YXARTICLE_DELETE')") public ResponseEntity delete(@PathVariable Integer id){ yxArticleService.removeById(id); return new ResponseEntity(HttpStatus.OK); @@ -88,7 +88,7 @@ public class WechatArticleController { @ForbidSubmit @ApiOperation(value = "发布文章") @GetMapping(value = "/yxArticle/publish/{id}") - @PreAuthorize("hasAnyRole('admin','YXARTICLE_ALL','YXARTICLE_DELETE')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YXARTICLE_ALL','YXARTICLE_DELETE')") public ResponseEntity publish(@PathVariable Integer id) throws Exception{ YxArticleDto yxArticleDTO= new YxArticleDto(); YxArticle yxArticle = yxArticleService.getById(id); diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/wechat/rest/WechatMenuController.java b/zsw-bxg/src/main/java/co/yixiang/modules/wechat/rest/WechatMenuController.java index 239d199d..7ca06c2d 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/wechat/rest/WechatMenuController.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/wechat/rest/WechatMenuController.java @@ -48,7 +48,7 @@ public class WechatMenuController { @ApiOperation(value = "查询菜单") @GetMapping(value = "/YxWechatMenu") - @PreAuthorize("hasAnyRole('admin','YxWechatMenu_ALL','YxWechatMenu_SELECT')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YxWechatMenu_ALL','YxWechatMenu_SELECT')") public ResponseEntity getYxWechatMenus(){ return new ResponseEntity(YxWechatMenuService.getOne(new LambdaQueryWrapper() .eq(YxWechatMenu::getKey,ShopConstants.WECHAT_MENUS)),HttpStatus.OK); @@ -57,7 +57,7 @@ public class WechatMenuController { @ForbidSubmit @ApiOperation(value = "创建菜单") @PostMapping(value = "/YxWechatMenu") - @PreAuthorize("hasAnyRole('admin','YxWechatMenu_ALL','YxWechatMenu_CREATE')") + @PreAuthorize("@ss.hasAnyPermissions('admin','YxWechatMenu_ALL','YxWechatMenu_CREATE')") public ResponseEntity create( @RequestBody String jsonStr){ JSONObject jsonObject = JSON.parseObject(jsonStr); String jsonButton = jsonObject.get("buttons").toString(); diff --git a/zsw-bxg/src/main/java/co/yixiang/tools/rest/UploadController.java b/zsw-bxg/src/main/java/co/yixiang/tools/rest/UploadController.java index 67210a6d..9fec83f6 100644 --- a/zsw-bxg/src/main/java/co/yixiang/tools/rest/UploadController.java +++ b/zsw-bxg/src/main/java/co/yixiang/tools/rest/UploadController.java @@ -5,9 +5,8 @@ */ package co.yixiang.tools.rest; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import co.yixiang.api.YshopException; +import cn.iocoder.yudao.framework.common.exception.YshopException; import co.yixiang.constant.ShopConstants; import co.yixiang.constant.SystemConfigConstants; import co.yixiang.enums.ShopCommonEnum;