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
|
b365b40273
|
code review 用户社交登陆的逻辑
增加测试页面的 README.md
|
2021-12-15 09:18:15 +08:00 |
|
timfruit
|
450ca8f907
|
完成剩下的公众号登录功能修改
|
2021-12-08 00:17:01 +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
|
038c0b87b9
|
增加微信登陆的测试页
|
2021-10-30 09:43:26 +08:00 |
|
YunaiV
|
20628987c9
|
增加支付回调地址的配置
|
2021-10-25 09:56:49 +08:00 |
|
YunaiV
|
1b0aaec9ab
|
完成微信支付的支付流程,美滋滋
|
2021-10-25 08:58:30 +08:00 |
|
YunaiV
|
72438ed5f6
|
增加 pay.html 前端,对接微信 JS SDK
|
2021-10-24 23:46:53 +08:00 |
|
YunaiV
|
60f5898c9a
|
增加 pay.html 前端,对接微信 JS SDK
|
2021-10-24 23:02:34 +08:00 |
|
YunaiV
|
44f357cea4
|
接入 weixin-mp-java ,编写相关示例。
|
2021-10-24 11:53:42 +08:00 |
|