hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-11-04 12:18:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,781 Commits 20 Branches 0 Tags
f1069aa3062fcc580c715f4df729c58e5cd92a1f
Commit Graph

1781 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
YunaiV
72b64dc526 同步最新的支付表结构 2021-10-26 09:53:17 +08:00
YunaiV
4acada62d3 完成支付回调的逻辑 2021-10-26 09:50:18 +08:00
YunaiV
75633aa84b 增加微信公众号的支付回调接口 2021-10-25 23:29:42 +08:00
YunaiV
bac30d47b7 增加支付回调地址的配置 2021-10-25 10:04:11 +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
宋天
f4a5a139b5 [update]user server模块新增测试，修改部分接口规范问题 2021-10-24 22:33:32 +08:00
YunaiV
44f357cea4 接入 weixin-mp-java ，编写相关示例。 2021-10-24 11:53:42 +08:00
YunaiV
3a77cc239b yudao-user-server 接入支付模块 2021-10-24 00:34:40 +08:00
YunaiV
ab19228ca6 完成支付的下单和提交订单的逻辑 2021-10-23 20:14:13 +08:00
jason
436781507e merge master change 2021-10-23 19:16:00 +08:00
YunaiV
6dc65234ef 增加支付相关表的 SQL，调整相关的实体 2021-10-23 17:47:27 +08:00
YunaiV
6e3aa8a752 完善 PayClientFactoryImpl 的实现，增加创建 PayClient 的方法 2021-10-23 14:00:02 +08:00
YunaiV
1ed6656bbb 完成对微信公众号支付的封装 2021-10-23 11:00:36 +08:00
宋天
5193de7c56 [fix]修复错误内容 2021-10-20 18:51:51 +08:00
宋天
79da36ac04 [update]更新代码规范 2021-10-20 16:59:47 +08:00
YunaiV
23d8da7479 完善 AbstractPayClient 的实现 2021-10-20 13:20:09 +08:00
YunaiV
6690b9b120 完善支付宝的 AlipayPayClient 的实现 2021-10-20 08:27:44 +08:00
宋天
c06d6e53f6 [update] 新增修改昵称，修改头像，查询昵称与头像接口 2021-10-19 22:16:42 +08:00
YunaiV
7ca756a234 引入支付宝的支付功能 2021-10-19 09:26:49 +08:00
YunaiV
24f4fd4fee 完成支付单的单体轮廓 2021-10-19 07:41:45 +08:00
YunaiV
81126b2b4b 1. 引入 IJPay 组件 
2. 增加创建支付单的 Service 实现
 2021-10-18 09:41:38 +08:00
niudehua
d194e14780 修改maven模块名称 2021-10-15 21:16:10 +08:00
YunaiV
711a074059 支付系统的实体的初始化 2021-10-14 09:05:09 +08:00