huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-22 15:21:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,390 Commits 1 Branch 0 Tags 176 MiB
a5f82fedb3
Commit Graph

697 Commits

Author SHA1 Message Date
YunaiV
90f135ad95 Merge branch 'feature/crm' of https://gitee.com/jiangwanwan/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	sql/mysql/crm.sql
 2023-11-18 21:17:11 +08:00
zhijiantianya@gmail.com
067d53ac48 代码生成器：增加单元测试，🛫 2023-11-17 19:39:32 +08:00
YunaiV
01a55b93c2 代码生成：增加更全的 tree 场景下的新增/修改校验 2023-11-16 20:01:44 +08:00
YunaiV
f5ea270be3 部门：优化父部门的校验逻辑，为代码生成做个铺垫？！ 2023-11-16 12:55:43 +08:00
YunaiV
5e6e02e4f4 vo 简化：使用 BeanUtils 替代 mapstruct 转换 2023-11-15 09:19:51 +08:00
YunaiV
ddb5bce0a2 vo 简化：post 重构 2023-11-14 22:37:46 +08:00
Wanwan
5b295d56b6 feat: CRM 客户限制 2023-11-11 20:49:52 +08:00
puhui999
668fae9398 CRM-数据权限：完善 code review 提到的问题 2023-11-07 17:52:18 +08:00
YunaiV
e8bc284dd0 优化：默认只引入 mysql driver，减少打包大小 2023-11-06 21:41:28 +08:00
YunaiV
feba904fd8 多租户：登录界面，根据 host 域名获取对应的租户编号 2023-11-06 19:47:21 +08:00
YunaiV
c162b39e1e 多租户：调整 tenant 表的 domain 字段为 website，避免 dm 数据库的关键字冲突 2023-11-06 19:04:01 +08:00
YunaiV
1eff9822ce 同步最新 master 代码 2023-11-04 20:52:37 +08:00
YunaiV
787de1be94 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 
# Conflicts:
#	sql/mysql/mall.sql
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateReqVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserService.java
 2023-11-04 20:48:27 +08:00
YunaiV
87bc3f510c 优化：社交登录、用户的管理 2023-11-04 14:37:36 +08:00
YunaiV
e9317bf293 Merge branch 'feature/mall_product_tmp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 
# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceTest.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImplTest.java
 2023-11-04 12:03:54 +08:00
YunaiV
d048daf7d6 mq 重构：默认的 mq 实现，采用 event，减少对 redis、rocketmq 等消息队列的依赖 2023-10-30 12:53:54 +08:00
puhui999
8552e86d8a 完善三方登录 2023-10-26 17:03:26 +08:00
puhui999
12ae5bf128 新增社交用户 RUD 2023-10-25 16:57:13 +08:00
puhui999
738fcef453 新增社交客户端 CRUD 2023-10-25 16:07:17 +08:00
puhui999
eb4b719b4b 添加社交客户端测试 sql 2023-10-25 15:09:34 +08:00
YunaiV
52e735f360 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponTemplateApiImpl.java
 2023-10-24 19:09:01 +08:00
YunaiV
dd2f5ba2c3 统一 boot 和 cloud 代码 2023-10-24 18:48:02 +08:00
puhui999
6723cae781 营销活动：完善 review 提到的问题 2023-10-23 12:02:13 +08:00
YunaiV
728308cbc0 member：优化部分变量的命名 2023-10-22 16:35:48 +08:00
YunaiV
94c2ad5d1d 修复报错的单元测试 2023-10-22 08:55:27 +08:00
YunaiV
d0caa77f80 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-10-22 08:25:27 +08:00
YunaiV
ec27a1bae5 修复报错的单元测试 2023-10-22 08:24:47 +08:00
YunaiV
52ebcaaad7 同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/59/ 2023-10-20 00:31:35 +08:00
YunaiV
14f006088a code review：敏感词 2023-10-19 23:25:17 +08:00
芋道源码
630890d0ac
!665 修复敏感词单字符检验失败问题 
Merge pull request !665 from 摸鱼散人/master
 2023-10-19 15:18:31 +00:00
YunaiV
979b484d7f saas：支持社交应用的多租户配置（wx 小程序） 2023-10-19 21:42:39 +08:00
YunaiV
6f757e5297 saas：支持社交应用的多租户配置（mp） 2023-10-19 12:54:44 +08:00
YunaiV
d256275099 saas：支持社交应用的多租户配置 2023-10-18 23:48:14 +08:00
zhijiantianya@gmail.com
0af205ede1 Merge remote-tracking branch 'origin/master' 2023-10-17 18:49:59 +08:00
zhijiantianya@gmail.com
c629fd2208 code review：工作流逻辑 2023-10-17 18:49:35 +08:00
daiwencheng
944e3862a5 修复敏感词检验问题 
1.修复排序，优先使用较短的前缀失效问题
2.修复敏感词为单个字符校验失败问题
 2023-10-15 14:30:43 +08:00
芋道源码
8fd814e0c1
!636 测试站内信接口增加Member 用户类型的支持。 
Merge pull request !636 from 风狗/feature/mall_product
 2023-10-14 09:53:41 +00:00
YunaiV
3110e427fb 同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/647/files 2023-10-14 17:45:49 +08:00
puhui999
c71bdd158a 拼团活动：完善 review 提到的问题 2023-10-08 17:19:39 +08:00
YunaiV
fdb10aeced trade：优化运费模版的实现 2023-10-02 18:30:14 +08:00
YunaiV
5913ee0706 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityDetailRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
#	yudao-server/src/main/resources/application-local.yaml
 2023-09-28 15:18:59 +08:00
绮梦
5a5f92d2e9 feat: 测试站内信接口增加Member 用户类型的支持。 2023-09-25 15:54:31 +08:00
YunaiV
e384b810bf code review：分销逻辑 2023-09-25 09:39:39 +08:00
YunaiV
9b7c757942 1.8.2 版本发布 2023-09-24 23:24:24 +08:00
owen
e9fd377772 分销：Review代码修改 2023-09-24 20:28:44 +08:00
YunaiV
421bb7d154 code review：分销逻辑 2023-09-24 11:56:00 +08:00
owen
bf0e7d2c77 System：字典数据列表过滤已关闭的数据 2023-09-23 23:42:20 +08:00
owen
637ae8ce1d 分佣: 提现记录 2023-09-22 18:35:43 +08:00
owen
594e4d5fee system: uniapp增加字典数据查询接口 2023-09-22 15:11:06 +08:00
YunaiV
9630f236f8 Merge branch 'feature/auth' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
 Conflicts:
	README.md
 2023-09-19 22:28:45 +08:00
YunaiV
b81ebe6f19 修复 common 下的 test 引入不正确的问题，减少包依赖大小 2023-09-17 01:37:10 +08:00
YunaiV
222daa5366 pay 缓存，使用 guava 替代 job 扫描，目的：提升启动速度，加快缓存失效 2023-09-16 23:22:58 +08:00
YunaiV
a51579a77d fileConfig 缓存，使用 guava 替代 job 扫描，目的：提升启动速度，加快缓存失效 2023-09-16 21:35:05 +08:00
YunaiV
48fd4972da sms 缓存，使用 guava 替代 job 扫描，目的：提升启动速度，加快缓存失效 2023-09-16 20:58:34 +08:00
YunaiV
ebb3a04251 优化多租户 Job 的实现，采用 AOP 替代 BeanPostProcessor，提升启动速度 2023-09-16 14:06:15 +08:00
xingyu
437131cc7a Merge remote-tracking branch 'origin/master' into feature/auth 
# Conflicts:
#	yudao-dependencies/pom.xml
 2023-09-13 12:00:10 +08:00
YunaiV
8b50cd9661 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
 Conflicts:
	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java
	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
 2023-09-11 16:19:55 +08:00
xingyu
5e9e41c045 fix: required 过期 2023-09-11 12:30:33 +08:00
YunaiV
40e1a879e3 登录：社交登录时，额外返回 openid 2023-09-10 18:01:53 +08:00
YunaiV
65d7b30011 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-09-09 10:35:14 +08:00
dhb52
d7488e70b0 使用下划线分割ErrorCodeConstants的ErrorCode 2023-09-09 01:30:51 +08:00
lemoncc
2fd201c7fa
🌈 style: 描述错误, 社交类型的枚举为 SocialTypeEnum 而不是 SysUserSocialTypeEnum 2023-09-08 16:33:49 +08:00
YunaiV
4809e9b462 修复单元测试报错的问题 2023-09-03 18:28:29 +08:00
YunaiV
02bc9d28de 解决 MapStruct 的时区问题 2023-08-27 11:19:48 +08:00
shizhong
eb4434ecbc 解决MapStruct的时区问题 2023-08-23 12:11:47 +08:00
YunaiV
bfc72a9802 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 
 Conflicts:
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/vo/config/MemberPointConfigBaseVO.java
 2023-08-20 09:45:34 +08:00
YunaiV
95254341a1 1. 会员用户的找回密码 API 的优化 2023-08-19 23:12:34 +08:00
YunaiV
5d4a7ffa3b 1. 会员用户的修改密码 API 的优化 2023-08-19 20:16:41 +08:00
YunaiV
87e5b2bed1 1. 会员用户的修改手机 API 的优化 2023-08-19 19:23:54 +08:00
wanglei
6446b753d3 fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED 2023-08-18 10:56:08 +08:00
YunaiV
ee53d2ad51 修复租户套餐修改时，查询角色报错问题 2023-08-11 22:24:01 +08:00
YunaiV
b5515799dc !557 修改创建菜单时permission为空，缓存KEY 为空的BUG 2023-08-11 19:32:26 +08:00
杜继强
14c7465bc6 修改创建菜单时permission为空，缓存KEY 为空的BUG ，判断 reqVO.permission 为空时，不做 @CacheEvict 的操作 2023-08-08 00:13:23 +08:00
YunaiV
1f3794db77 fix: 修复MailAccountService 更新/删除缓存未清空 2023-08-05 14:49:04 +08:00
YunaiV
c4755c49b1 fix: 修复MailAccountService 更新/删除缓存未清空 2023-08-05 14:48:14 +08:00
zhangjiayu
508ad76cb8 fix: 修复MailAccountService 更新/删除缓存未清空 2023-08-03 18:08:38 +08:00
YunaiV
dfa09c787a 短信渠道的本地缓存，使用 Job 轮询，替代 MQ 广播 2023-07-29 08:59:07 +08:00
YunaiV
27e70e73a3 敏感词的本地缓存，使用 Job 轮询，替代 MQ 广播 2023-07-29 07:31:53 +08:00
YunaiV
5e7e3d816c 彻底移除 RedisKeyDefine 2023-07-29 07:16:10 +08:00
YunaiV
95edd1d451 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-redis 
 Conflicts:
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/auth/AuthConvert.java
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
 2023-07-28 22:31:18 +08:00
YunaiV
5d6308e4bb 对齐 boot 与 cloud 的代码 2023-07-27 13:59:29 +08:00
YunaiV
859cf74a6c 对齐 boot 与 cloud 的代码 2023-07-27 13:00:52 +08:00
YunaiV
6c174d9c83 对齐 boot 与 cloud 的代码 2023-07-26 23:56:02 +08:00
YunaiV
14d7db0c60 对齐 boot 与 cloud 的代码 2023-07-26 23:27:06 +08:00
YunaiV
114f1e4833 对齐 boot 与 cloud 的代码 2023-07-26 22:36:34 +08:00
lwf
414c1be128 feature(使用redis缓存): 功能合并 
1、缓存改为Redis缓存，不在启动时缓存，使用时候根据数据源缓存
2、前端登录接口调整
 2023-07-26 17:20:54 +08:00
芋道源码
870873e480
!540 修复部分问题，升级依赖 
Merge pull request !540 from xingyu/feature/captcha
 2023-07-25 11:20:04 +00:00
YunaiV
3a24d05bdc mall + pay： 
1. 修复单元测试的报错
 2023-07-24 07:04:11 +08:00
xingyu
d556877b13 chore: use xingyuv jushauth 2023-07-21 17:55:47 +08:00
xingyu
c95a1d0a7d chore: up springboot 2.10.13 2023-07-21 17:53:40 +08:00
YunaiV
67d60e32f8 mall + pay： 
1、调整微信支付，修复 v2 传递的时间不正确
2、调整 mp js ticket 接口到 system 模块
 2023-07-06 00:19:05 +08:00
YunaiV
23e3c4d0d9 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2023-07-02 23:45:48 +08:00
芋道源码
11c4c950b7
回退 'Pull Request !518 : 添加华为云 maven 升级依赖' 2023-07-02 15:41:26 +00:00
xingyu
7ad3b6ad2b chore: use com.xingyuv.justauth 2023-06-26 21:08:56 +08:00
YunaiV
7036a6652c mall + member： 
1、调整收获地址的返回
 2023-06-26 20:07:46 +08:00
YunaiV
16dd86a8db 498 解决解决 Set access token expire time to 0 报错问题和邮件发送用户编号为空问题 2023-06-17 12:36:13 +08:00
xingyu
573ad59edc Merge remote-tracking branch 'origin/master' into feature/mall_product 
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/string/StrUtils.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.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-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSimpleRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuPageItemRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderItemBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/sku/AppProductSkuBaseRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartItemUpdateSelectedReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartResetReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderGetCreateInfoRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
 2023-06-14 15:18:12 +08:00
puhui999
5bfca56efa fix：完善 TODO 提到的问题 2023-06-07 18:08:49 +08:00
shizhong
6ca09af97e 解决邮件发送用户编号为空问题 2023-06-05 14:09:49 +08:00
shizhong
3e350151bc 解决 Set access token expire time to 0 报错问题 2023-06-05 14:03:06 +08:00
JiangQi
8004a11036 master代码错误 2023-05-29 09:17:11 +08:00
YunaiV
cc049566d1 修复邮件日志 sendTime 类型不一致（应该为 LocalDateTime） 2023-05-29 00:05:06 +08:00
YunaiV
0631c51d93 mall + trade：review 配置管理列表 2023-05-28 23:16:11 +08:00
jason
55dbff7570 运费模板 review 修改. 运费模块可以选择多个区域 2023-05-27 11:20:43 +08:00
YunaiV
0083d12404 mall：review + mall：快递费用 2023-05-25 22:51:38 +08:00
jason
16956a6501 运费模板，区域选择使用懒加载优化性能 2023-05-22 23:08:21 +08:00
芋道源码
7bfb426a9d
!484 bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误 
Merge pull request !484 from Rundeepin/feature/mall_product
 2023-05-21 15:38:48 +00:00
jason
01a67289a9 mall: 订单中心新增运费模板功能 2023-05-21 23:35:07 +08:00
杨文
e25099a49e 发送邮件逻辑优化，邮件标题支持模版参数 2023-05-19 11:08:56 +08:00
崔家辉
fbeaa06100 bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误 2023-05-19 10:47:23 +08:00
xingyu
0b3640a522 fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED 2023-05-08 10:06:17 +08:00
YunaiV
e5fcc7a387 boot3：适合 ServletUtils 2023-04-16 21:40:56 +08:00
芋道源码
89e785dc49
!457 【轻量级 PR】：解决敏感词导出和字典数据编辑保存的两个BUG 
Merge pull request !457 from clockdotnet/master_pr
 2023-04-15 01:39:41 +00:00
YunaiV
d2ba90db5d 修复单元测试报错 2023-04-14 22:59:45 +08:00
shizhong
206b5a5e47 解决字典数据编辑颜色清空不能保存问题 2023-04-14 22:15:50 +08:00
shizhong
27c5b5f369 解决敏感词导出excel内容为500错误问题 2023-04-14 22:14:34 +08:00
YunaiV
5c0161d762 修复租户名的重复问题 2023-04-09 11:12:24 +08:00
芋道源码
aa16b8279f
!446 配合周建进行测试所提bug的后端修改 
Merge pull request !446 from clockdotnet/master_pr
 2023-04-09 02:30:08 +00:00
shizhong
92cf4b9e63 租户添加或修改时租户名称改为不可以重复，否则会造成重复名称的租户无法正常登录的问题，按规范优化代码 2023-04-03 12:55:06 +08:00
shizhong
64cd19f7db 解决新增租户时创建的租户第一个用户性别为无效值的问题，前端改了，后端还是默认0即未知吧 2023-03-30 21:15:26 +08:00
shizhong
55358aa170 租户添加或修改时租户名称改为不可以重复，否则会造成重复名称的租户无法正常登录的问题 2023-03-30 16:00:25 +08:00
shizhong
b8628f75c5 解决新增租户时创建的租户第一个用户性别为无效值0的问题 2023-03-30 15:19:20 +08:00
打听幸福的下落
aae6f12832 fix: MybatisPlus 主键策略使用雪花算法 ASSIGN_ID 时，获取登录验证码主键精度丢失问题 
SmsCodeDO 主键类型为 Integer，使用雪花算法后 Long 转 Integer 精度丢失，system_sms_code 表数据入库后主键为负数
 2023-03-16 20:25:29 +08:00
joinfriend
ede7aabb55
补充update分隔符 
Signed-off-by: joinfriend <277784977@163.com>
 2023-03-07 17:25:00 +00:00
芋道源码
6216b1190a
!416 用户详情不显示所属部门部门 
Merge pull request !416 from babylazsss/master
 2023-02-28 16:51:59 +00:00
jian.li
c35d4f596a 缓存部门命名优化 2023-02-24 13:13:10 +08:00
chiwenda
5f47c00c51 fix:用户详情不显示所属部门 2023-02-20 22:05:28 +08:00
YunaiV
35ba9b36af 菜单新增 alwaysShow 总是展示、componentName 组件名 2023-02-10 23:03:10 +08:00
YunaiV
c3eb9022b8 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/springdoc 
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
#	yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/clean.sql
#	yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
#	yudao-server/pom.xml
 2023-02-04 10:21:45 +08:00
YunaiV
f770133854 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master_unit-sql 
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/test/resources/sql/clean.sql
 2023-02-04 10:06:31 +08:00
YunaiV
b5b23b3d7c infra：完善 config 的单元测试 2023-02-04 00:57:09 +08:00
YunaiV
10f7352ef8 system：简化 mapper 的实现 2023-02-04 00:33:55 +08:00
YunaiV
67e1879a8f system：将 biz 的方法名的负数都换成 List 2023-02-04 00:26:48 +08:00
YunaiV
837345ed95 system：将 api 的方法名的负数都换成 List 2023-02-04 00:15:20 +08:00
YunaiV
245e557309 system：将 check 方法，统一成 validate 方法 2023-02-04 00:10:12 +08:00
YunaiV
2ba4dec0da 完善 notify 单元测试 2023-02-04 00:02:37 +08:00
YunaiV
62dc3296d6 完善 mail 单元测试 2023-02-03 23:39:47 +08:00
YunaiV
3d3c88dd4f 完善 AdminUserServiceImpl 单元测试 2023-02-03 22:10:05 +08:00
YunaiV
1d3ca8a990 完善 TenantServiceImpl 单元测试 2023-02-02 23:47:17 +08:00
YunaiV
83003021e1 完善 TenantPackageServiceImpl 单元测试 2023-02-02 23:35:56 +08:00
YunaiV
d897f8fb10 完善 SmsCodeServiceImpl 单元测试 2023-02-02 23:16:35 +08:00
YunaiV
a332d5f893 完善 SmsSendServiceImpl 单元测试 2023-02-02 21:15:23 +08:00
YunaiV
e7d0b8da35 完善 SmsLogServiceImpl 单元测试 2023-02-02 21:08:33 +08:00
YunaiV
97fd7a7187 完善 SmsChannelServiceImpl 单元测试 2023-02-02 21:05:58 +08:00
YunaiV
d7f86afd6c 完善 SensitiveWordServiceImpl 单元测试 2023-02-02 21:03:25 +08:00
YunaiV
96e8fa4216 完善 RoleServiceImpl 单元测试 2023-02-02 09:13:14 +08:00
YunaiV
3aeebef036 完善 MenuServiceImplTest 单元测试 2023-02-01 23:33:59 +08:00
YunaiV
7731b4f503 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/dev-yunai 2023-02-01 21:09:29 +08:00
YunaiV
3470b38de2 完善 OAuth2ClientServiceImpl、OAuth2GrantServiceImpl 单元测试 2023-02-01 21:05:40 +08:00
YunaiV
96e8df0398 完善 NoticeServiceImpl 单元测试 2023-02-01 21:04:18 +08:00
YunaiV
aa37c2cd7c 完善 OperateLogServiceImpl 单元测试 2023-02-01 08:27:02 +08:00
YunaiV
987fcd366c 完善 LoginLogServiceImplTest 单元测试 2023-02-01 08:17:03 +08:00
YunaiV
9ca793919d 完善 ErrorCodeServiceImpl 单元测试 2023-02-01 08:04:36 +08:00
YunaiV
fed9feb05f 完善 DictTypeServiceImpl 单元测试 2023-02-01 07:45:57 +08:00
YunaiV
0537421655 完善 DictDataServiceImpl 单元测试 2023-02-01 07:34:57 +08:00
YunaiV
bef06ef940 完善 PostServiceImpl 单元测试 2023-02-01 00:42:38 +08:00
YunaiV
1011de3278 完善 DeptServiceImpl 单元测试 2023-02-01 00:07:34 +08:00
YunaiV
ba78d9964a 完善 AdminAuthServiceImpl 单元测试 2023-01-31 22:43:50 +08:00
xingyu
fa2977ae9e 适配springdoc 2023-01-30 10:24:29 +08:00
xingyu
08a4de37c2 Merge remote-tracking branch 'origin/master' into feature/springdoc 
# Conflicts:
#	README.md
 2023-01-30 10:08:31 +08:00
xingyu
edbbb1a50a feat: mail springdoc 2023-01-29 16:24:24 +08:00
xingyu
ffb0358ce2 Merge remote-tracking branch 'origin/master' into feature/springdoc 2023-01-29 16:11:51 +08:00
YunaiV
1943e71e3f 站内信模块：完善注释 2023-01-28 22:59:01 +08:00
YunaiV
ae3ee95cdd 站内信模块：整体功能实现 2023-01-28 20:10:19 +08:00
YunaiV
143035d798 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/notify 
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-ui-admin/src/utils/dict.js
 2023-01-27 23:25:08 +08:00
YunaiV
3783367605 邮箱模块：优化注释 + 方法名 2023-01-27 21:43:39 +08:00
YunaiV
7e65ede92d 邮箱模块：优化注释 + 方法名 2023-01-27 21:31:30 +08:00
YunaiV
28ba9a7456 邮箱模块：vue3 邮件日志的管理 2023-01-27 20:51:52 +08:00
YunaiV
5d1abd5f44 邮箱模块：完善 send 的单元测试 2023-01-27 10:14:15 +08:00
YunaiV
f0d2c7a58a 邮箱模块：完善 log 的单元测试 2023-01-27 09:38:42 +08:00
YunaiV
c0b029b244 邮箱模块：完善 template 的单元测试 2023-01-26 23:32:18 +08:00
YunaiV
0895ee7d98 邮箱模块：完善 account 的单元测试 2023-01-26 23:04:26 +08:00
YunaiV
525078abd3 邮箱模块：完善 log 相关的逻辑 2023-01-26 20:39:38 +08:00
YunaiV
f9ab45df18 邮箱模块：完善 log 相关表结构 2023-01-26 01:57:57 +08:00
YunaiV
afced9d420 邮箱模块：完善发送 send 逻辑 2023-01-25 21:32:32 +08:00
YunaiV
ea39dcc5c8 邮箱模块：完善 template 模版的增删改查功能 2023-01-25 20:44:48 +08:00
YunaiV
0262fa5c15 邮箱模块：完善 account 账号的增删改查功能 2023-01-25 17:48:09 +08:00
YunaiV
c9c5a818ec Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mail-1.6.1 2023-01-25 12:40:37 +08:00
YunaiV
c744e115e3 简化本地缓存的实现，萌新更容易看懂！ 2023-01-25 10:11:16 +08:00
YunaiV
711a39b8e9 spring doc：增加模块分组 2023-01-19 15:03:46 +08:00
芋道源码
2a332a95f9
!376 重构 滑块验证码实现 vue3 自动引入 
Merge pull request !376 from xingyu/dev
 2023-01-19 01:24:20 +00:00
xingyu
f2adb441cd Merge remote-tracking branch 'origin/master' into feature/springdoc 
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java
 2023-01-18 15:39:58 +08:00
YunaiV
5e9706007e Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/wechat-mp 
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/DefaultDatabaseQueryTest.java
 2023-01-18 00:38:55 +08:00
xingyu
13afc3d57a feat: springdoc 2023-01-17 21:25:06 +08:00
xingyu
0ef05fba7c Merge remote-tracking branch 'origin/dev' into feature/springdoc 
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java
 2023-01-17 21:18:53 +08:00
xingyu
e314a63ee9 feat: springdoc 代码生成适配 2023-01-17 21:18:10 +08:00
xingyu
8c4bc638a4 chore: captcha-plus 2023-01-17 16:57:10 +08:00
xingyu
cba69e94df revert: file 2023-01-16 15:15:31 +08:00
xingyu
1c0d8fc1eb Merge remote-tracking branch 'origin/dev' into feature/springdoc 
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-framework/yudao-spring-boot-starter-web/pom.xml
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/core/SpringFoxHandlerProviderBeanPostProcessor.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java
 2023-01-16 14:25:03 +08:00
xingyu
860b0301b7 refactor: captcha-plus 2023-01-16 11:12:30 +08:00
xingyu
fffe3008b5 refactor: captcha-plus 2023-01-16 10:47:39 +08:00
xingyu
aaf62982e2 feat: 优化 captcha 代码 2023-01-12 21:51:53 +08:00
YunaiV
d6de233a47 mp：完成公众号的数据统计前端界面 2023-01-08 00:36:25 +08:00
xingyu
854ba3315c marge master 2023-01-04 10:57:19 +08:00
xingyu
7b98a3f3f3 Merge remote-tracking branch 'origin/master' into feature/springdoc 
# Conflicts:
#	README.md
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyValueController.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyViewRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyAndValueRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyCreateReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyListReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyPageReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyUpdateReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueCreateReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValuePageReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueUpdateReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuCreateOrUpdateReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuDetailRespVO.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/app/spu/AppProductSpuController.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/property/AppProductPropertyValueDetailRespVO.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/controller/app/order/vo/AppTradeOrderPageReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderItemRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderRespVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/AppPayOrderController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayNotifyOrderReqVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayRefundOrderReqVO.java
#	yudao-server/pom.xml
#	yudao-server/src/main/java/cn/iocoder/yudao/module/shop/controller/app/AppShopOrderController.java
 2023-01-04 10:48:18 +08:00
YunaiV
7912a54ebd 【修复】没有数据权限时，添加/修改用户的唯一手机、账号等字段的校验不正确 2022-12-31 17:31:06 +08:00
dengxiaobing
df2c137fe2 清理单元测试 sql 脚本 2022-12-30 10:10:43 +08:00
YunaiV
a83b8e8fbc 修复报错的单元测试 2022-12-30 00:27:14 +08:00
芋道源码
8690f2dddd
!341 修改注释中的错别字 
Merge pull request !341 from 王添翼/master
 2022-12-29 12:20:56 +00:00
YunaiV
1aee4ad00f 【修复】DeptService 的 getDeptsByParentIdFromCache 在获取部门列表时，未处理多租户场景 2022-12-29 20:18:59 +08:00
YunaiV
5a4cc55917 【修复】字典类型逻辑删除时，唯一索引冲突的问题 2022-12-29 12:52:37 +08:00
YunaiV
2c3aaa8d7e 修复字典数据(system_dict_data)查询操作有问题，会查出不属于本字典类型(dict_type)的数据 2022-12-29 00:16:32 +08:00
YunaiV
3443aa6f5f 优化本地缓存的刷新实现，数据变更时，强制刷新 2022-12-29 00:09:58 +08:00
芋道源码
30a4d7d954
!342 同步最新版本的商城进度 
Merge pull request !342 from 芋道源码/feature/1.8.0-uniapp
 2022-12-27 13:39:56 +00:00
王添翼
84b0f33944
update yudao-module-system-biz/system/controller/admin/user/UserController.java. 
修改注释中的错别字“  // 获用户门列表，只要开启状态的”改为“  // 获取用户列表，只要开启状态的”

Signed-off-by: 王添翼 <2100022743@stu.pku.edu.cn>
 2022-12-25 13:16:38 +00:00
王添翼
c0b8000dee
修复yudao-module-system-api/ErrorCodeConstants.java中错误码重复的问题 
// ========== OAuth2 授权 1002022000 =========
ErrorCode OAUTH2_CODE_NOT_EXISTS = new ErrorCode(1002022000, "code 不存在");
ErrorCode OAUTH2_CODE_EXPIRE = new ErrorCode(1002022000, "code 已过期");
二者错误码重复，现将OAUTH2_CODE_EXPIRE的错误码改为1002022001。

Signed-off-by: 王添翼 <2100022743@stu.pku.edu.cn>
 2022-12-25 02:20:50 +00:00
YunaiV
9a5c8a11f5 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mail-1.6.1 
# Conflicts:
#	yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
#	yudao-module-system/yudao-module-system-biz/pom.xml
 2022-12-23 19:38:00 +08:00
YunaiV
92632c046c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java
#	yudao-ui-admin/src/views/mall/trade/order/index.vue
 2022-12-23 19:12:45 +08:00
YunaiV
7a4a6a3046 product：优化管理后台相关的接口 
area：增加地区列表界面
 2022-12-23 18:47:59 +08:00
YunaiV
491921d5ae code review 站内信代码 2022-12-23 18:41:41 +08:00
xingyu
c8f4ba66d1 fix: 部门更新 log 错误 2022-12-23 16:23:40 +08:00
xingyu
cacefb4eea feat: knife4j springdoc 2022-12-22 00:25:22 +08:00
xingyu
4f2c08f8db Merge remote-tracking branch 'origin/dev' into feature/springdoc 2022-12-21 22:46:52 +08:00
luowenfeng
ed2d195411 站内信开发 2022-12-17 16:42:40 +08:00
luowenfeng
826a564abd 站内信开发 2022-12-17 16:41:14 +08:00
YunaiV
7f131a3853 trade：增加用户 App 的订单分页和详情接口 2022-12-10 23:06:53 +08:00
gaibu
a5ec334e53 fix: 逻辑删除唯一索引冲突的问题 2022-12-10 12:02:49 +08:00
gaibu
9e3ed75772 fix: 逻辑删除唯一索引冲突的问题 2022-12-10 11:59:21 +08:00
gaibu
67435648b2 fix: 逻辑删除唯一索引冲突的问题 2022-12-10 11:32:46 +08:00
xingyu4j
9fc6e0f00b refactor: springdoc 替换 springfox 2022-12-09 13:43:15 +08:00
YunaiV
ffab0b1d6a 1. 优化 menu 本地缓存的刷新策略，在修改或删除菜单时，强制刷新缓存 
2. 修复 pub/sub 未初始化的问题
3. 优化 Job 定时的 mybatis 日志输出，避免一直打印
 2022-12-06 20:38:05 +08:00
xingyu4j
a43b884c73 fix: warn 2022-11-30 10:30:58 +08:00
xingyu
693288d33d Merge remote-tracking branch 'origin/master' into feature/vue3 
# Conflicts:
#	yudao-dependencies/pom.xml
 2022-11-26 13:07:51 +08:00
YunaiV
2d78b02086 移除云片短信渠道，解决云片的安全风险 2022-11-25 21:04:40 +08:00
YunaiV
ea95115ffd 移除云片短信渠道，解决云片的安全风险 2022-11-25 20:22:04 +08:00
xingyu
0d0f64e30a feat: 删除过期方法 2022-11-23 22:54:44 +08:00
luowenfeng
f77522980f fix(站内信功能调整): 接口fix 2022-11-23 12:26:51 +08:00
YunaiV
e8dd66c6f8 review 部分站内信的实现 2022-11-21 13:01:16 +08:00
YunaiV
131adad9c0 review 部分站内信的实现 2022-11-21 11:52:55 +08:00
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
 2022-11-13 12:07:59 +08:00
YunaiV
c5b547e0f3 优化，使用 @Configuration(proxyBeanMethods = false) 提升启动速度 2022-11-12 20:22:09 +08:00
YunaiV
3cd256f7f2 【修复】跨部门审核，当申请人与审批人不在同一部门，并且审批人的数据权限为“本部门数据权限”时，审批时有异常“手机号不存在” 2022-11-12 12:16:42 +08:00
YunaiV
3fbb0b4c54 修复滑块验证码，存在失败的情况 2022-11-11 20:47:45 +08:00
YunaiV
93b8a2b6c1 1. 修复滑块验证码，存在失败的情况 
2. 重新构建 demo 预览项目
 2022-11-11 20:02:11 +08:00
芋道源码
fb237423b8
!294 修复单元测试报错 
Merge pull request !294 from 芋道源码/dev
 2022-11-11 01:22:17 +00:00
YunaiV
123617a9af 1. 修复 OAuth2OpenControllerTest 单元测试 2022-11-11 08:42:33 +08:00
YunaiV
b2e6e36fc5 1. 修复 LoginLogServiceImplTest 
2. 修复 OperateLogServiceImplTest
3. 修复 SmsLogServiceTest
 2022-11-11 01:39:50 +08:00
YunaiV
40ba456fde 1. 修复 MenuServiceTest 单元测试 2022-11-11 01:24:39 +08:00
YunaiV
413656c043 修复 SocialUserServiceTest 单测报错 2022-11-11 00:35:19 +08:00
YunaiV
83295a10aa 1. 修复 SmsSendServiceTest 单测的报错 2022-11-11 00:28:40 +08:00
芋道源码
5a3823fb79
!280 短信接收报告回调处理小Bug 
Merge pull request !280 from Macro/N/A
 2022-11-10 13:17:32 +00:00
xingyu4j
9c033d0104 DateUtils ==> LocalDateTime 2022-11-09 12:43:54 +08:00
xingyu4j
632a132a6a refactor: Date ==> LocalDateTime 2022-11-09 11:14:46 +08:00
YunaiV
8ae8a4a652 promotion：完善优惠劵模板的单元测试、禁用功能 2022-11-02 22:44:37 +08:00
Macro
fc76a67c73
短信接收报告回调处理小Bug 
receiveSmsStatus() 方法中最后调用 updateSmsReceiveResult() 方法传参错误，第二个 result.getErrorCode()  应改为 result.getErrorMsg()

Signed-off-by: Macro <8676847+hibernate2021@user.noreply.gitee.com>
 2022-10-19 10:28:03 +00:00
YunaiV
a13fb61359 优化 pom.xml 文件，减少无用的多租户引用 2022-10-18 23:32:42 +08:00
xingyu
1f4e3d6bbe Merge remote-tracking branch 'origin/master' into dev 2022-10-07 17:03:55 +08:00
YunaiV
6b79788b5a 完善 oauth2.0 的注释 2022-10-06 20:00:38 +08:00
xingyu
0143749988 Merge remote-tracking branch 'origin/master' into dev 2022-10-05 14:53:55 +08:00
YunaiV
ff54f16907 完成 yudao-sso-demo-by-code 刷新访问令牌 2022-10-01 20:49:11 +08:00