684 Commits (d2c45b0ff2185235ee9ca162b9eae3dc5e5fd923)

Author	SHA1	Message	Date
YunaiV	87bc3f510c	优化：社交登录、用户的管理	2 years ago
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	2 years ago
YunaiV	d048daf7d6	mq 重构：默认的 mq 实现，采用 event，减少对 redis、rocketmq 等消息队列的依赖	2 years ago
puhui999	8552e86d8a	完善三方登录	2 years ago
puhui999	12ae5bf128	新增社交用户 RUD	2 years ago
puhui999	738fcef453	新增社交客户端 CRUD	2 years ago
puhui999	eb4b719b4b	添加社交客户端测试 sql	2 years ago
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	2 years ago
YunaiV	dd2f5ba2c3	统一 boot 和 cloud 代码	2 years ago
puhui999	6723cae781	营销活动：完善 review 提到的问题	2 years ago
YunaiV	728308cbc0	member：优化部分变量的命名	2 years ago
YunaiV	94c2ad5d1d	修复报错的单元测试	2 years ago
YunaiV	d0caa77f80	Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2 years ago
YunaiV	ec27a1bae5	修复报错的单元测试	2 years ago
YunaiV	52ebcaaad7	同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/59/	2 years ago
YunaiV	14f006088a	code review：敏感词	2 years ago
芋道源码	630890d0ac	!665 修复敏感词单字符检验失败问题 ... Merge pull request !665 from 摸鱼散人/master	2 years ago
YunaiV	979b484d7f	saas：支持社交应用的多租户配置（wx 小程序）	2 years ago
YunaiV	6f757e5297	saas：支持社交应用的多租户配置（mp）	2 years ago
YunaiV	d256275099	saas：支持社交应用的多租户配置	2 years ago
zhijiantianya@gmail.com	0af205ede1	Merge remote-tracking branch 'origin/master'	2 years ago
zhijiantianya@gmail.com	c629fd2208	code review：工作流逻辑	2 years ago
daiwencheng	944e3862a5	修复敏感词检验问题 ... 1.修复排序，优先使用较短的前缀失效问题 2.修复敏感词为单个字符校验失败问题	2 years ago
芋道源码	8fd814e0c1	!636 测试站内信接口增加Member 用户类型的支持。 ... Merge pull request !636 from 风狗/feature/mall_product	2 years ago
YunaiV	3110e427fb	同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/647/files	2 years ago
puhui999	c71bdd158a	拼团活动：完善 review 提到的问题	2 years ago
YunaiV	fdb10aeced	trade：优化运费模版的实现	2 years ago
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	2 years ago
绮梦	5a5f92d2e9	feat: 测试站内信接口增加Member 用户类型的支持。	2 years ago
YunaiV	e384b810bf	code review：分销逻辑	2 years ago
YunaiV	9b7c757942	1.8.2 版本发布	2 years ago
owen	e9fd377772	分销：Review代码修改	2 years ago
YunaiV	421bb7d154	code review：分销逻辑	2 years ago
owen	bf0e7d2c77	System：字典数据列表过滤已关闭的数据	2 years ago
owen	637ae8ce1d	分佣: 提现记录	2 years ago
owen	594e4d5fee	system: uniapp增加字典数据查询接口	2 years ago
YunaiV	9630f236f8	Merge branch 'feature/auth' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... Conflicts: README.md	2 years ago
YunaiV	b81ebe6f19	修复 common 下的 test 引入不正确的问题，减少包依赖大小	2 years ago
YunaiV	222daa5366	pay 缓存，使用 guava 替代 job 扫描，目的：提升启动速度，加快缓存失效	2 years ago
YunaiV	a51579a77d	fileConfig 缓存，使用 guava 替代 job 扫描，目的：提升启动速度，加快缓存失效	2 years ago
YunaiV	48fd4972da	sms 缓存，使用 guava 替代 job 扫描，目的：提升启动速度，加快缓存失效	2 years ago
YunaiV	ebb3a04251	优化多租户 Job 的实现，采用 AOP 替代 BeanPostProcessor，提升启动速度	2 years ago
xingyu	437131cc7a	Merge remote-tracking branch 'origin/master' into feature/auth ... # Conflicts: # yudao-dependencies/pom.xml	2 years ago
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	2 years ago
xingyu	5e9e41c045	fix: required 过期	2 years ago
YunaiV	40e1a879e3	登录：社交登录时，额外返回 openid	2 years ago
YunaiV	65d7b30011	Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2 years ago
dhb52	d7488e70b0	使用下划线分割ErrorCodeConstants的ErrorCode	2 years ago
lemoncc	2fd201c7fa	🌈 style: 描述错误, 社交类型的枚举为 SocialTypeEnum 而不是 SysUserSocialTypeEnum	2 years ago
YunaiV	4809e9b462	修复单元测试报错的问题	2 years ago
YunaiV	02bc9d28de	解决 MapStruct 的时区问题	2 years ago
shizhong	eb4434ecbc	解决MapStruct的时区问题	2 years ago
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	2 years ago
YunaiV	95254341a1	1. 会员用户的找回密码 API 的优化	2 years ago
YunaiV	5d4a7ffa3b	1. 会员用户的修改密码 API 的优化	3 years ago
YunaiV	87e5b2bed1	1. 会员用户的修改手机 API 的优化	3 years ago
wanglei	6446b753d3	fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED	3 years ago
YunaiV	ee53d2ad51	修复租户套餐修改时，查询角色报错问题	3 years ago
YunaiV	b5515799dc	!557 修改创建菜单时permission为空，缓存KEY 为空的BUG	3 years ago
杜继强	14c7465bc6	修改创建菜单时permission为空，缓存KEY 为空的BUG ，判断 reqVO.permission 为空时，不做 @CacheEvict 的操作	3 years ago
YunaiV	1f3794db77	fix: 修复MailAccountService 更新/删除缓存未清空	3 years ago
YunaiV	c4755c49b1	fix: 修复MailAccountService 更新/删除缓存未清空	3 years ago
zhangjiayu	508ad76cb8	fix: 修复MailAccountService 更新/删除缓存未清空	3 years ago
YunaiV	dfa09c787a	短信渠道的本地缓存，使用 Job 轮询，替代 MQ 广播	3 years ago
YunaiV	27e70e73a3	敏感词的本地缓存，使用 Job 轮询，替代 MQ 广播	3 years ago
YunaiV	5e7e3d816c	彻底移除 RedisKeyDefine	3 years ago
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	3 years ago
YunaiV	5d6308e4bb	对齐 boot 与 cloud 的代码	3 years ago
YunaiV	859cf74a6c	对齐 boot 与 cloud 的代码	3 years ago
YunaiV	6c174d9c83	对齐 boot 与 cloud 的代码	3 years ago
YunaiV	14d7db0c60	对齐 boot 与 cloud 的代码	3 years ago
YunaiV	114f1e4833	对齐 boot 与 cloud 的代码	3 years ago
lwf	414c1be128	feature(使用redis缓存): 功能合并 ... 1、缓存改为Redis缓存，不在启动时缓存，使用时候根据数据源缓存 2、前端登录接口调整	3 years ago
芋道源码	870873e480	!540 修复部分问题，升级依赖 ... Merge pull request !540 from xingyu/feature/captcha	3 years ago
YunaiV	3a24d05bdc	mall + pay： ... 1. 修复单元测试的报错	3 years ago
xingyu	d556877b13	chore: use xingyuv jushauth	3 years ago
xingyu	c95a1d0a7d	chore: up springboot 2.10.13	3 years ago
YunaiV	67d60e32f8	mall + pay： ... 1、调整微信支付，修复 v2 传递的时间不正确 2、调整 mp js ticket 接口到 system 模块	3 years ago
YunaiV	23e3c4d0d9	Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product	3 years ago
芋道源码	11c4c950b7	回退 'Pull Request !518 : 添加华为云 maven 升级依赖'	3 years ago
xingyu	7ad3b6ad2b	chore: use com.xingyuv.justauth	3 years ago
YunaiV	7036a6652c	mall + member： ... 1、调整收获地址的返回	3 years ago
YunaiV	16dd86a8db	498 解决解决 Set access token expire time to 0 报错问题和邮件发送用户编号为空问题	3 years ago
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	3 years ago
puhui999	5bfca56efa	fix：完善 TODO 提到的问题	3 years ago
shizhong	6ca09af97e	解决邮件发送用户编号为空问题	3 years ago
shizhong	3e350151bc	解决 Set access token expire time to 0 报错问题	3 years ago
JiangQi	8004a11036	master代码错误	3 years ago
YunaiV	cc049566d1	修复邮件日志 sendTime 类型不一致（应该为 LocalDateTime）	3 years ago
YunaiV	0631c51d93	mall + trade：review 配置管理列表	3 years ago
jason	55dbff7570	运费模板 review 修改. 运费模块可以选择多个区域	3 years ago
YunaiV	0083d12404	mall：review + mall：快递费用	3 years ago
jason	16956a6501	运费模板，区域选择使用懒加载优化性能	3 years ago
芋道源码	7bfb426a9d	!484 bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误 ... Merge pull request !484 from Rundeepin/feature/mall_product	3 years ago
jason	01a67289a9	mall: 订单中心新增运费模板功能	3 years ago
杨文	e25099a49e	发送邮件逻辑优化，邮件标题支持模版参数	3 years ago
崔家辉	fbeaa06100	bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误	3 years ago
xingyu	0b3640a522	fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED	3 years ago
YunaiV	e5fcc7a387	boot3：适合 ServletUtils	3 years ago
芋道源码	89e785dc49	!457 【轻量级 PR】：解决敏感词导出和字典数据编辑保存的两个BUG ... Merge pull request !457 from clockdotnet/master_pr	3 years ago
YunaiV	d2ba90db5d	修复单元测试报错	3 years ago
shizhong	206b5a5e47	解决字典数据编辑颜色清空不能保存问题	3 years ago
shizhong	27c5b5f369	解决敏感词导出excel内容为500错误问题	3 years ago
YunaiV	5c0161d762	修复租户名的重复问题	3 years ago
芋道源码	aa16b8279f	!446 配合周建进行测试所提bug的后端修改 ... Merge pull request !446 from clockdotnet/master_pr	3 years ago
shizhong	92cf4b9e63	租户添加或修改时租户名称改为不可以重复，否则会造成重复名称的租户无法正常登录的问题，按规范优化代码	3 years ago
shizhong	64cd19f7db	解决新增租户时创建的租户第一个用户性别为无效值的问题，前端改了，后端还是默认0即未知吧	3 years ago
shizhong	55358aa170	租户添加或修改时租户名称改为不可以重复，否则会造成重复名称的租户无法正常登录的问题	3 years ago
shizhong	b8628f75c5	解决新增租户时创建的租户第一个用户性别为无效值0的问题	3 years ago
打听幸福的下落	aae6f12832	fix: MybatisPlus 主键策略使用雪花算法 ASSIGN_ID 时，获取登录验证码主键精度丢失问题 ... SmsCodeDO 主键类型为 Integer，使用雪花算法后 Long 转 Integer 精度丢失，system_sms_code 表数据入库后主键为负数	3 years ago
joinfriend	ede7aabb55	补充update分隔符 ... Signed-off-by: joinfriend <277784977@163.com>	3 years ago
芋道源码	6216b1190a	!416 用户详情不显示所属部门部门 ... Merge pull request !416 from babylazsss/master	3 years ago
jian.li	c35d4f596a	缓存部门命名优化	3 years ago
chiwenda	5f47c00c51	fix:用户详情不显示所属部门	3 years ago
YunaiV	35ba9b36af	菜单新增 alwaysShow 总是展示、componentName 组件名	3 years ago
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	3 years ago
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	3 years ago
YunaiV	b5b23b3d7c	infra：完善 config 的单元测试	3 years ago
YunaiV	10f7352ef8	system：简化 mapper 的实现	3 years ago
YunaiV	67e1879a8f	system：将 biz 的方法名的负数都换成 List	3 years ago
YunaiV	837345ed95	system：将 api 的方法名的负数都换成 List	3 years ago
YunaiV	245e557309	system：将 check 方法，统一成 validate 方法	3 years ago
YunaiV	2ba4dec0da	完善 notify 单元测试	3 years ago
YunaiV	62dc3296d6	完善 mail 单元测试	3 years ago
YunaiV	3d3c88dd4f	完善 AdminUserServiceImpl 单元测试	3 years ago
YunaiV	1d3ca8a990	完善 TenantServiceImpl 单元测试	3 years ago
YunaiV	83003021e1	完善 TenantPackageServiceImpl 单元测试	3 years ago
YunaiV	d897f8fb10	完善 SmsCodeServiceImpl 单元测试	3 years ago
YunaiV	a332d5f893	完善 SmsSendServiceImpl 单元测试	3 years ago
YunaiV	e7d0b8da35	完善 SmsLogServiceImpl 单元测试	3 years ago
YunaiV	97fd7a7187	完善 SmsChannelServiceImpl 单元测试	3 years ago
YunaiV	d7f86afd6c	完善 SensitiveWordServiceImpl 单元测试	3 years ago
YunaiV	96e8fa4216	完善 RoleServiceImpl 单元测试	3 years ago
YunaiV	3aeebef036	完善 MenuServiceImplTest 单元测试	3 years ago
YunaiV	7731b4f503	Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/dev-yunai	3 years ago
YunaiV	3470b38de2	完善 OAuth2ClientServiceImpl、OAuth2GrantServiceImpl 单元测试	3 years ago
YunaiV	96e8df0398	完善 NoticeServiceImpl 单元测试	3 years ago
YunaiV	aa37c2cd7c	完善 OperateLogServiceImpl 单元测试	3 years ago
YunaiV	987fcd366c	完善 LoginLogServiceImplTest 单元测试	3 years ago
YunaiV	9ca793919d	完善 ErrorCodeServiceImpl 单元测试	3 years ago
YunaiV	fed9feb05f	完善 DictTypeServiceImpl 单元测试	3 years ago
YunaiV	0537421655	完善 DictDataServiceImpl 单元测试	3 years ago
YunaiV	bef06ef940	完善 PostServiceImpl 单元测试	3 years ago
YunaiV	1011de3278	完善 DeptServiceImpl 单元测试	3 years ago
YunaiV	ba78d9964a	完善 AdminAuthServiceImpl 单元测试	3 years ago
xingyu	fa2977ae9e	适配springdoc	3 years ago
xingyu	08a4de37c2	Merge remote-tracking branch 'origin/master' into feature/springdoc ... # Conflicts: # README.md	3 years ago
xingyu	edbbb1a50a	feat: mail springdoc	3 years ago
xingyu	ffb0358ce2	Merge remote-tracking branch 'origin/master' into feature/springdoc	3 years ago
YunaiV	1943e71e3f	站内信模块：完善注释	3 years ago
YunaiV	ae3ee95cdd	站内信模块：整体功能实现	3 years ago
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	3 years ago
YunaiV	3783367605	邮箱模块：优化注释 + 方法名	3 years ago
YunaiV	7e65ede92d	邮箱模块：优化注释 + 方法名	3 years ago
YunaiV	28ba9a7456	邮箱模块：vue3 邮件日志的管理	3 years ago
YunaiV	5d1abd5f44	邮箱模块：完善 send 的单元测试	3 years ago
YunaiV	f0d2c7a58a	邮箱模块：完善 log 的单元测试	3 years ago
YunaiV	c0b029b244	邮箱模块：完善 template 的单元测试	3 years ago
YunaiV	0895ee7d98	邮箱模块：完善 account 的单元测试	3 years ago
YunaiV	525078abd3	邮箱模块：完善 log 相关的逻辑	3 years ago
YunaiV	f9ab45df18	邮箱模块：完善 log 相关表结构	3 years ago
YunaiV	afced9d420	邮箱模块：完善发送 send 逻辑	3 years ago
YunaiV	ea39dcc5c8	邮箱模块：完善 template 模版的增删改查功能	3 years ago
YunaiV	0262fa5c15	邮箱模块：完善 account 账号的增删改查功能	3 years ago
YunaiV	c9c5a818ec	Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mail-1.6.1	3 years ago
YunaiV	c744e115e3	简化本地缓存的实现，萌新更容易看懂！	3 years ago
YunaiV	711a39b8e9	spring doc：增加模块分组	3 years ago
芋道源码	2a332a95f9	!376 重构 滑块验证码实现 vue3 自动引入 ... Merge pull request !376 from xingyu/dev	3 years ago
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	3 years ago
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	3 years ago
xingyu	13afc3d57a	feat: springdoc	3 years ago
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	3 years ago
xingyu	e314a63ee9	feat: springdoc 代码生成适配	3 years ago
xingyu	8c4bc638a4	chore: captcha-plus	3 years ago
xingyu	cba69e94df	revert: file	3 years ago
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	3 years ago
xingyu	860b0301b7	refactor: captcha-plus	3 years ago
xingyu	fffe3008b5	refactor: captcha-plus	3 years ago
xingyu	aaf62982e2	feat: 优化 captcha 代码	3 years ago
YunaiV	d6de233a47	mp：完成公众号的数据统计前端界面	3 years ago
xingyu	854ba3315c	marge master	3 years ago
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	3 years ago
YunaiV	7912a54ebd	【修复】没有数据权限时，添加/修改用户的唯一手机、账号等字段的校验不正确	3 years ago
dengxiaobing	df2c137fe2	清理单元测试 sql 脚本	3 years ago
YunaiV	a83b8e8fbc	修复报错的单元测试	3 years ago
芋道源码	8690f2dddd	!341 修改注释中的错别字 ... Merge pull request !341 from 王添翼/master	3 years ago
YunaiV	1aee4ad00f	【修复】DeptService 的 getDeptsByParentIdFromCache 在获取部门列表时，未处理多租户场景	3 years ago
YunaiV	5a4cc55917	【修复】字典类型逻辑删除时，唯一索引冲突的问题	3 years ago
YunaiV	2c3aaa8d7e	修复字典数据(system_dict_data)查询操作有问题，会查出不属于本字典类型(dict_type)的数据	3 years ago
YunaiV	3443aa6f5f	优化本地缓存的刷新实现，数据变更时，强制刷新	3 years ago
芋道源码	30a4d7d954	!342 同步最新版本的商城进度 ... Merge pull request !342 from 芋道源码/feature/1.8.0-uniapp	3 years ago
王添翼	84b0f33944	update yudao-module-system-biz/system/controller/admin/user/UserController.java. ... 修改注释中的错别字“ // 获用户门列表，只要开启状态的”改为“ // 获取用户列表，只要开启状态的” Signed-off-by: 王添翼 <2100022743@stu.pku.edu.cn>	3 years ago
王添翼	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>	3 years ago
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	3 years ago
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	3 years ago
YunaiV	7a4a6a3046	product：优化管理后台相关的接口 ... area：增加地区列表界面	3 years ago
YunaiV	491921d5ae	code review 站内信代码	3 years ago
xingyu	c8f4ba66d1	fix: 部门更新 log 错误	3 years ago
xingyu	cacefb4eea	feat: knife4j springdoc	3 years ago
xingyu	4f2c08f8db	Merge remote-tracking branch 'origin/dev' into feature/springdoc	3 years ago
luowenfeng	ed2d195411	站内信开发	3 years ago
luowenfeng	826a564abd	站内信开发	3 years ago
YunaiV	7f131a3853	trade：增加用户 App 的订单分页和详情接口	3 years ago
gaibu	a5ec334e53	fix: 逻辑删除唯一索引冲突的问题	3 years ago
gaibu	9e3ed75772	fix: 逻辑删除唯一索引冲突的问题	3 years ago
gaibu	67435648b2	fix: 逻辑删除唯一索引冲突的问题	3 years ago
xingyu4j	9fc6e0f00b	refactor: springdoc 替换 springfox	3 years ago
YunaiV	ffab0b1d6a	1. 优化 menu 本地缓存的刷新策略，在修改或删除菜单时，强制刷新缓存 ... 2. 修复 pub/sub 未初始化的问题 3. 优化 Job 定时的 mybatis 日志输出，避免一直打印	3 years ago
xingyu4j	a43b884c73	fix: warn	3 years ago
xingyu	693288d33d	Merge remote-tracking branch 'origin/master' into feature/vue3 ... # Conflicts: # yudao-dependencies/pom.xml	3 years ago
YunaiV	2d78b02086	移除云片短信渠道，解决云片的安全风险	3 years ago
YunaiV	ea95115ffd	移除云片短信渠道，解决云片的安全风险	3 years ago
xingyu	0d0f64e30a	feat: 删除过期方法	3 years ago
luowenfeng	f77522980f	fix(站内信功能调整): 接口fix	3 years ago
YunaiV	e8dd66c6f8	review 部分站内信的实现	3 years ago
YunaiV	131adad9c0	review 部分站内信的实现	3 years ago
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
xrcoder	872107b319	完善站内信阅读接口	4 years ago
xrcoder	7d6737479c	添加枚举类验证。	4 years ago
xrcoder	af4290784e	添加用户查询站内信分页列表数据，未读站内信数量。	4 years ago
xrcoder	d16f873521	站内信模板功能完善。	4 years ago
xrcoder	bb78a58029	站内信基础代码整理，接口定义。	4 years ago
xingyu	e842d2e0ad	AJ-Captcha 增加验证码二次校验	4 years ago
xingyu	4a92081937	vue2 新增行为验证码	4 years ago