76 Commits (cd8277cf16d70bfc4ea73e6915e622b60fa0eea6)

Author SHA1 Message Date
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
4 years ago
zefeng.zeng 43ae3c8124 feat 新建LambdaQueryWrapperX,改成使用lambda的方式选择字段 4 years ago
jason 5bf3045544 优化退款逻辑 4 years ago
jason 08103685f1 重构退款逻辑,去掉退款后处理 4 years ago
jason e8368bb7fd 修改退款逻辑code review 4 years ago
YunaiV bcc2ff0f5b code review 退款逻辑 4 years ago
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
4 years ago
YunaiV 52631a0af8 合并 master 代码
修复单测报错的问题
4 years ago
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
4 years ago
YunaiV b365b40273 code review 用户社交登陆的逻辑
增加测试页面的 README.md
4 years ago
timfruit 450ca8f907 完成剩下的公众号登录功能修改 4 years ago
YunaiV ade55d89a4 多租户,接入 Spring Async 机制 4 years ago
YunaiV cc78025f80 修改本地不开 Job,dev 开启 Job 4 years ago
YunaiV 7c8fe2fc50 1. 增加 yudao-spring-boot-starter-tenant 租户的组件
2. 改造 UserDO,接入多租户
4 years ago
YunaiV 002aea34ae 引入 uview 组件 4 years ago
YunaiV 2da6a746e4 增加个人信息的加载 4 years ago
jason f108d478a8 调整渠道支付通知地址为统一的地址 4 years ago
jason dfde260ebb 支付宝退款申请通知 4 years ago
jason 444ba79822 修改code review 4 years ago
YunaiV b18cd457c8 code review 支付相关的代码实现 4 years ago
YunaiV e2b76ee0e5 code review 修改密码等的单元测试 4 years ago
jason 7d6f205dc0 支付退款申请,支付宝手机wap 相应实现 4 years ago
宋天 6a7761313e [updaate] 拆分修改密码与重置密码请求实体 4 years ago
宋天 8e0569ee54 update 新增接口:修改手机,修改密码,忘记密码 4 years ago
timfruit 13a9405082 增加注释,优化代码 4 years ago
YunaiV 6265e4a736 支付的 code review 4 years ago
jason 26798a8816 修改code review 4 years ago
ouyang 461c6a0007 tina提交支付宝扫码支付 4 years ago
YunaiV 6cadafb3f1 code review 支付宝 wap 的逻辑 4 years ago
jason 2c60a3aafa 支付宝手机网站支付 4 years ago
YunaiV aa77eb029f 增加支付宝 QR 支付的回调 4 years ago
YunaiV 65abc667b0 code review 社交登陆相关的代码 4 years ago
timfruit 8aa45406fd 拓展授权登录抽取成单独的starter,拓展配置和默认配置齐平 4 years ago
YunaiV 8dbd6143bf 增加微信小程序的登陆的测试代码 4 years ago
YunaiV 038c0b87b9 增加微信登陆的测试页 4 years ago
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
4 years ago
YunaiV cba9c609d7 code review 社交登陆的代码 4 years ago
timfruit de21034186 增加小程序授权登录 4 years ago
YunaiV 68c98db147 code review 用户前台的社交登陆 4 years ago
YunaiV 55e5ca4644 code review 用户前台的社交登陆 4 years ago
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
4 years ago
YunaiV 2df46a7c2d Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension
 Conflicts:
	更新日志.md
4 years ago
YunaiV 65843d55a0 修改版本号为 1.2.0-snapshot 4 years ago
YunaiV dd2d8a2ba9 优化支付通知的逻辑,解决并发的问题。
同时,收到支付结果时,立马回调业务,避免延迟
4 years ago
timfruit 1a9440824c 添加注释 4 years ago
timfruit fcf1c228c5 初步完成微信公众号登录 4 years ago
YunaiV 4acada62d3 完成支付回调的逻辑 4 years ago
YunaiV bac30d47b7 增加支付回调地址的配置 4 years ago
YunaiV 20628987c9 增加支付回调地址的配置 4 years ago
YunaiV 1b0aaec9ab 完成微信支付的支付流程,美滋滋 4 years ago