huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-12-05 05:31:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,257 Commits 1 Branch 0 Tags 176 MiB
0af205ede1
Commit Graph

5257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
樊宇
08d72fe9ca Merge remote-tracking branch 'origin/master' into master 2021-11-04 08:56:13 +08:00
芋道源码
592f706cd8 update 更新日志.md. 2021-11-04 00:54:27 +00:00
YunaiV
6cadafb3f1 code review 支付宝 wap 的逻辑 2021-11-04 08:47:41 +08:00
芋道源码
bba5ea7a42 !53 修复字典查询和通知查询权限问题 
Merge pull request !53 from classyex/master
 2021-11-04 00:29:02 +00:00
jason
a1105ffdc7 调整表 pay_order_extension，字段 channel_notify_data，长度 2021-11-04 00:46:27 +08:00
jason
2c60a3aafa 支付宝手机网站支付 2021-11-04 00:46:24 +08:00
aquan
1a721ceb5f 完成支付模块的商户管理开发以及单元测试 2021-11-03 19:14:44 +08:00
樊宇
9d8cdb2670 动态表单 后端代码 2021-11-03 10:26:01 +08:00
YunaiV
aa77eb029f 增加支付宝 QR 支付的回调 2021-11-03 09:05:04 +08:00
YunaiV
696e94a1a3 解决 pay 参数校验报错的问题 2021-11-03 08:42:38 +08:00
YunaiV
396f3a6dff Revert "akarta.validation-api =》jakarta.el 依赖，保证 EL 不报错" 
This reverts commit 1b336c7df6.
 2021-11-03 08:38:45 +08:00
jason
56864db484 修改 文件重命名问题 2021-11-02 20:47:26 +08:00
yex
4cfa959d98 fix: 修复通知和字典查询权限bug 2021-11-02 12:25:41 +08:00
YunaiV
1b336c7df6 akarta.validation-api =》jakarta.el 依赖，保证 EL 不报错 2021-11-02 08:23:15 +08:00
YunaiV
65abc667b0 code review 社交登陆相关的代码 2021-11-02 08:12:37 +08:00
YunaiV
c186d279ba code review 工作流的相关代码 2021-11-02 07:56:05 +08:00
芋道源码
a4948d27d2 update yudao-admin-server/src/main/resources/application-local.yaml. 2021-11-01 02:04:26 +00:00
jason
cc56a66332 修改code review 2021-10-31 22:27:35 +08:00
jason
1b835e058f 修改code review 2021-10-31 22:26:35 +08:00
jason
0d2ae6be56 修改code review 2021-10-31 22:13:51 +08:00
jason
f26c17cff0 修改code review 2021-10-31 22:11:55 +08:00
timfruit
8aa45406fd 拓展授权登录抽取成单独的starter,拓展配置和默认配置齐平 2021-10-31 13:09:55 +08:00
YunaiV
ae9e9b3de0 Merge remote-tracking branch 'origin/master' 2021-10-31 11:06:35 +08:00
YunaiV
83ce39f700 增加 .gitattributes 文件，避免识别项目类型出错 2021-10-31 11:06:27 +08:00
YunaiV
722eaf3513 调整下工作流的包名 2021-10-31 09:55:12 +08:00
芋道源码
e82c37f2c5 !52 工作流的部分实现 
Merge pull request !52 from 芋道源码/feature/activiti
 2021-10-30 05:51:21 +00:00
YunaiV
742125ed99 code review 工作流的代码 
合并最新的 SQL
 2021-10-30 13:46:39 +08:00
YunaiV
31c4a52858 Merge branch 'feature/activiti' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/activiti 2021-10-30 11:07:13 +08:00
YunaiV
0050b1e46d Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/activiti 
 Conflicts:
	yudao-dependencies/pom.xml
	yudao-framework/pom.xml
 2021-10-30 10:24:58 +08:00
芋道源码
8cead0869e !51 用户前台的社交登陆的部分实现 
Merge pull request !51 from 芋道源码/feature/user-social
 2021-10-30 02:17:55 +00: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
芋道源码
b336655a51 !50 支付系统的部分实现 
Merge pull request !50 from 芋道源码/pay_extension
 2021-10-30 01:27:08 +00:00
YunaiV
cba9c609d7 code review 社交登陆的代码 2021-10-30 09:12:17 +08:00
timfruit
de21034186 增加小程序授权登录 2021-10-29 23:48:06 +08:00
YunaiV
0e209d9cfc 同步最新的表结构 2021-10-29 08:22:13 +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
jason
d16185f87d 修改表单为外置表单 2021-10-28 00:51:57 +08:00
YunaiV
7da46d1cfb Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension 2021-10-28 00:03:42 +08:00
YunaiV
93351e1716 1. 修复 File 单元测试报错 
2. 修复 mvn package 报错问题
 2021-10-28 00:01:21 +08:00
YunaiV
c89accbf06 完成支付通知的逻辑 2021-10-27 13:22:49 +08:00
YunaiV
2df46a7c2d Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension 
 Conflicts:
	更新日志.md
 2021-10-27 12:32:57 +08:00
YunaiV
65843d55a0 修改版本号为 1.2.0-snapshot 2021-10-27 10:17:42 +08:00
YunaiV
dd2d8a2ba9 优化支付通知的逻辑，解决并发的问题。 
同时，收到支付结果时，立马回调业务，避免延迟
 2021-10-27 10:06:49 +08:00
芋道源码
a19f92ff2c !49 [update] 新增修改昵称，修改头像，查询昵称与头像接口 
Merge pull request !49 from 宋天/user-register
 2021-10-27 01:38:31 +00:00
timfruit
1a9440824c 添加注释 2021-10-26 22:26:33 +08:00
timfruit
fcf1c228c5 初步完成微信公众号登录 2021-10-26 21:35:06 +08:00