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
|
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
|
cc78025f80
|
修改本地不开 Job，dev 开启 Job
|
2021-12-05 17:35:53 +08:00 |
|
jason
|
26798a8816
|
修改code review
|
2021-11-05 00:10:32 +08:00 |
|
jason
|
2c60a3aafa
|
支付宝手机网站支付
|
2021-11-04 00:46:24 +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 |
|
timfruit
|
fcf1c228c5
|
初步完成微信公众号登录
|
2021-10-26 21:35:06 +08:00 |
|
YunaiV
|
20628987c9
|
增加支付回调地址的配置
|
2021-10-25 09:56:49 +08:00 |
|
YunaiV
|
44f357cea4
|
接入 weixin-mp-java ，编写相关示例。
|
2021-10-24 11:53:42 +08:00 |
|
YunaiV
|
d784b113af
|
将 login_log、error_log 迁移到 yudao-core-service 项目中
|
2021-10-10 18:49:39 +08:00 |
|
YunaiV
|
6686ded18b
|
修复 admin 服务的全局登录的拦截
|
2021-10-07 22:26:03 +08:00 |
|
YunaiV
|
930cdfe2b2
|
创建 yudao-user-server
|
2021-05-07 00:19:07 +08:00 |
|