p38192567
/
ruoyi-vue-pro1
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,368 Commits 8 Branches 31 Tags 233 MiB
Commit Graph

85 Commits

Author SHA1 Message Date
YunaiV cee7e50720 1.【修复】定时任务刷新本地缓存时，无租户上线文，导致查询报错 
2. member 模块，统一使用 member 前缀
3. 修改 Spring Security logout 配置，支持多用户类型的退出
 2022-01-29 14:05:06 +08:00
YunaiV 928b7dbe23 多模块重构 2：在 yudao-admin-server 中，引入 yudao-module-member 模块 2022-01-28 20:21:01 +08:00
YunaiV 06fa85a353 多模块重构 1：将 yudao-user-server 涉及到 member 模块的逻辑，都迁移到 yudao-module-member 中 2022-01-27 13:34:25 +08:00
宋天 cb2ba6da2f fix 冲突 2022-01-24 14:16:17 +08:00
YunaiV 2860108a7d Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension 
 Conflicts:
	sql/ruoyi-vue-pro.sql
	yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/enums/SysDictTypeConstants.java
	yudao-admin-server/src/main/resources/application-local.yaml
	yudao-admin-server/src/main/resources/application.yaml
	yudao-admin-server/src/test/resources/sql/clean.sql
	yudao-admin-server/src/test/resources/sql/create_tables.sql
	yudao-admin-ui/src/utils/dict.js
 2022-01-23 04:12:34 +08:00
zefeng.zeng 43ae3c8124 feat 新建LambdaQueryWrapperX，改成使用lambda的方式选择字段 2022-01-21 14:32:52 +08:00
jason 5bf3045544 优化退款逻辑 2022-01-03 22:32:39 +08:00
jason 08103685f1 重构退款逻辑，去掉退款后处理 2021-12-28 17:10:25 +08:00
jason e8368bb7fd 修改退款逻辑code review 2021-12-26 21:52:42 +08:00
宋天 df141f2982 update 发送短信 拓展设置对应模板编号 2021-12-26 15:21:14 +08:00
YunaiV bcc2ff0f5b code review 退款逻辑 2021-12-25 20:40:49 +08:00
宋天 21fbe91e39 update 用户中心密码操作修改逻辑 2021-12-25 00:05:21 +08:00
宋天 5376ed69b1 解决冲突 2021-12-24 23:32:00 +08:00
宋天 5430cc292e Merge remote-tracking branch 'origin/feature/user-register' into feature/user-register 2021-12-19 19:30:06 +08:00
宋天 08cfe71646 优化重置手机逻辑 2021-12-19 19:28:01 +08:00
YunaiV c916b30fa1 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension 
 Conflicts:
	sql/ruoyi-vue-pro.sql
	yudao-admin-server/src/main/resources/application.yaml
	yudao-admin-server/src/test/resources/sql/clean.sql
	yudao-admin-server/src/test/resources/sql/create_tables.sql
	yudao-admin-ui/src/utils/dict.js
	yudao-user-server/src/main/resources/application-local.yaml
 2021-12-16 09:45:50 +08:00
YunaiV 52631a0af8 合并 master 代码 
修复单测报错的问题
 2021-12-15 09:45:37 +08:00
YunaiV 712067979c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/user-social 
 Conflicts:
	yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/auth/impl/SysAuthServiceImpl.java
	yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/system/service/auth/SysAuthServiceImplTest.java
	yudao-dependencies/pom.xml
	yudao-framework/pom.xml
	yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/system/service/auth/impl/SysAuthServiceImpl.java
 2021-12-15 09:26:47 +08:00
YunaiV b365b40273 code review 用户社交登陆的逻辑 
增加测试页面的 README.md
 2021-12-15 09:18:15 +08:00
timfruit 450ca8f907 完成剩下的公众号登录功能修改 2021-12-08 00:17:01 +08:00
YunaiV ade55d89a4 多租户，接入 Spring Async 机制 2021-12-05 17:59:58 +08:00
YunaiV cc78025f80 修改本地不开 Job，dev 开启 Job 2021-12-05 17:35:53 +08:00
YunaiV 7c8fe2fc50 1. 增加 yudao-spring-boot-starter-tenant 租户的组件 
2. 改造 UserDO，接入多租户
 2021-12-04 21:09:49 +08:00
YunaiV 002aea34ae 引入 uview 组件 2021-11-27 20:09:13 +08:00
YunaiV 2da6a746e4 增加个人信息的加载 2021-11-26 09:47:23 +08:00
jason f108d478a8 调整渠道支付通知地址为统一的地址 2021-11-24 23:54:16 +08:00
jason dfde260ebb 支付宝退款申请通知 2021-11-22 16:22:46 +08:00
jason 444ba79822 修改code review 2021-11-21 22:33:42 +08:00
YunaiV b18cd457c8 code review 支付相关的代码实现 2021-11-21 12:24:08 +08:00
YunaiV e2b76ee0e5 code review 修改密码等的单元测试 2021-11-21 12:05:34 +08:00
jason 7d6f205dc0 支付退款申请，支付宝手机wap 相应实现 2021-11-21 11:12:32 +08:00
宋天 6a7761313e [updaate] 拆分修改密码与重置密码请求实体 2021-11-17 15:12:59 +08:00
宋天 8e0569ee54 update 新增接口：修改手机，修改密码，忘记密码 2021-11-17 10:15:22 +08:00
timfruit 13a9405082 增加注释，优化代码 2021-11-05 23:14:51 +08:00
YunaiV 6265e4a736 支付的 code review 2021-11-05 08:10:07 +08:00
jason 26798a8816 修改code review 2021-11-05 00:10:32 +08:00
ouyang 461c6a0007 tina提交支付宝扫码支付 2021-11-04 14:27:36 +08:00
YunaiV 6cadafb3f1 code review 支付宝 wap 的逻辑 2021-11-04 08:47:41 +08:00
jason 2c60a3aafa 支付宝手机网站支付 2021-11-04 00:46:24 +08:00
YunaiV aa77eb029f 增加支付宝 QR 支付的回调 2021-11-03 09:05:04 +08:00
YunaiV 65abc667b0 code review 社交登陆相关的代码 2021-11-02 08:12:37 +08:00
timfruit 8aa45406fd 拓展授权登录抽取成单独的starter,拓展配置和默认配置齐平 2021-10-31 13:09:55 +08:00
YunaiV 8dbd6143bf 增加微信小程序的登陆的测试代码 2021-10-30 10:09:31 +08:00
YunaiV 038c0b87b9 增加微信登陆的测试页 2021-10-30 09:43:26 +08:00
YunaiV c3aa2acddf Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/user-social 
 Conflicts:
	yudao-admin-server/pom.xml
	yudao-dependencies/pom.xml
	yudao-user-server/src/main/resources/application-dev.yaml
	yudao-user-server/src/main/resources/application-local.yaml
 2021-10-30 09:30:18 +08:00
YunaiV cba9c609d7 code review 社交登陆的代码 2021-10-30 09:12:17 +08:00
timfruit de21034186 增加小程序授权登录 2021-10-29 23:48:06 +08:00
YunaiV 68c98db147 code review 用户前台的社交登陆 2021-10-28 08:50:50 +08:00
YunaiV 55e5ca4644 code review 用户前台的社交登陆 2021-10-28 08:46:51 +08:00
YunaiV 30ad7c43b8 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/user-social 
 Conflicts:
	yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/enums/SysErrorCodeConstants.java
 2021-10-28 08:30:24 +08:00