238 Commits (65ba4b6ae097b4e12d2d168e0b54ca7185dc082e)

Author SHA1 Message Date
YunaiV afc76973ce Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExcelVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExportReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponPageReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponRespVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteBaseVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExcelVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExportReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempletePageReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteRespVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/coupon/CouponDO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/discount/DiscountProductDO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/reward/RewardActivityDO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/TradeCartItemDO.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/UserInfoDTO.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
#	yudao-server/pom.xml
#	yudao-server/src/main/resources/application-local.yaml
#	yudao-server/src/main/resources/application.yaml
#	yudao-ui-admin/src/views/mall/CouponTemplete/index.vue
#	yudao-ui-admin/src/views/mall/product/property/index.vue
#	yudao-ui-admin/src/views/mall/product/spu/index.vue
#	yudao-ui-admin/src/views/mall/product/spu/save.vue
#	yudao-ui-admin/src/views/system/role/index.vue
3 years ago
YunaiV c5b547e0f3 优化,使用 @Configuration(proxyBeanMethods = false) 提升启动速度 3 years ago
YunaiV 3cd256f7f2 【修复】跨部门审核,当申请人与审批人不在同一部门,并且审批人的数据权限为“本部门数据权限”时,审批时有异常“手机号不存在” 3 years ago
YunaiV 3fbb0b4c54 修复滑块验证码,存在失败的情况 3 years ago
YunaiV 93b8a2b6c1 1. 修复滑块验证码,存在失败的情况
2. 重新构建 demo 预览项目
3 years ago
芋道源码 fb237423b8
!294 修复单元测试报错
Merge pull request !294 from 芋道源码/dev
3 years ago
YunaiV 123617a9af 1. 修复 OAuth2OpenControllerTest 单元测试 3 years ago
YunaiV b2e6e36fc5 1. 修复 LoginLogServiceImplTest
2. 修复 OperateLogServiceImplTest
3. 修复 SmsLogServiceTest
3 years ago
YunaiV 40ba456fde 1. 修复 MenuServiceTest 单元测试 3 years ago
YunaiV 413656c043 修复 SocialUserServiceTest 单测报错 3 years ago
YunaiV 83295a10aa 1. 修复 SmsSendServiceTest 单测的报错 3 years ago
芋道源码 5a3823fb79
!280 短信接收报告回调处理小Bug
Merge pull request !280 from Macro/N/A
3 years ago
xingyu4j 9c033d0104 DateUtils ==> LocalDateTime 3 years ago
xingyu4j 632a132a6a refactor: Date ==> LocalDateTime 3 years ago
YunaiV 8ae8a4a652 promotion:完善优惠劵模板的单元测试、禁用功能 3 years ago
Macro fc76a67c73
短信接收报告回调处理小Bug
receiveSmsStatus() 方法中最后调用 updateSmsReceiveResult() 方法传参错误,第二个 result.getErrorCode()  应改为 result.getErrorMsg()

Signed-off-by: Macro <8676847+hibernate2021@user.noreply.gitee.com>
3 years ago
YunaiV a13fb61359 优化 pom.xml 文件,减少无用的多租户引用 3 years ago
xingyu 1f4e3d6bbe Merge remote-tracking branch 'origin/master' into dev 3 years ago
YunaiV 6b79788b5a 完善 oauth2.0 的注释 3 years ago
xingyu 0143749988 Merge remote-tracking branch 'origin/master' into dev 3 years ago
YunaiV ff54f16907 完成 yudao-sso-demo-by-code 刷新访问令牌 3 years ago
YunaiV eef233644c 1. 增加 yudao-sso-demo-by-code 项目,实现基于授权码模式的单点登录
2. 完成 yudao-sso-demo-by-code 的跳转 SSO 流程
3 years ago
xingyu 9054a772b0 feat: 升级依赖 3 years ago
芋道源码 dd6dc2ac3d
!246 集成aj-captcha
Merge pull request !246 from xingyu/master
3 years ago
YunaiV 9715087b54 管理后台的 uniapp 验证码,增加开关 3 years ago
YunaiV 926c75d29a 优化图片验证码的后端实现 3 years ago
wangjun d706cc3fb3 修复导入用户后编辑报错 3 years ago
xingyu e842d2e0ad AJ-Captcha 增加验证码二次校验 4 years ago
xingyu 4a92081937 vue2 新增行为验证码 4 years ago
YunaiV bf5df656ed 初始化管理后台的 uniapp 版本 4 years ago
xingyu 85287e1f7f feat: 完善用户权限 4 years ago
YunaiV e5a7b8474f fix:短信验证码的每日发送条数不正确 4 years ago
YunaiV 26a094a710 refactor:优化时间范围查询 4 years ago
xingyu f84f3a3631 refactor: 时间区间查询传入数组-测试模块 4 years ago
xingyu dad10d858a refactor: 时间区间查询传入数组 4 years ago
xingyu bc233df980 feat: 添加 vue3 时间区间查询 4 years ago
YunaiV c92cc26171 增加文档、视频教程的地址 4 years ago
YunaiV 33a31cfb0f 优化文件的 type 识别与存储 4 years ago
jiangqiang 6a1c09ca42 Merge remote-tracking branch 'source/master'
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
4 years ago
jiangqiang 84ef0b449a SocialUserBindDO类新增主键字段,否则控制台会有mybatis plus的日志警告 4 years ago
YunaiV d9c2da7c91 1. 【新增】接口支持通过 `@PermitAll` 注解,允许匿名(未登录)进行访问
2. 【新增】`yudao.security.permit-all-urls` 配置项,允许匿名(未登录)进行访问
4 years ago
YunaiV 8751471aa1 优化管理后台的社交登录 4 years ago
YunaiV b69b74b770 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
 Conflicts:
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
4 years ago
芋道源码 33d094697d
!205 短信发送时,新增短信渠道的状态校验
Merge pull request !205 from muyi/login
4 years ago
yjb ee2c731d25 短信模板测试短信,检测模板状态与渠道状态,同时为开启时发送短信,否则只记录短信 4 years ago
YunaiV 7a86a61079 【重构】新增 `yudao-spring-boot-starter-biz-error-code` 错误码组件 4 years ago
YunaiV 992e20530d 基于 Guava 实现 tenant 租户数据的本地缓存 4 years ago
YunaiV d3200910db 基于 Guava 实现 dict 字典数据的本地缓存 4 years ago
YunaiV d1271f8bff 统一 TenantApi 的封装,与 yudao-cloud~ 4 years ago
YunaiV 58e4f11cca 移除 yudao-spring-boot-starter-extension 4 years ago