linweidong
/
besure_server
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,339 Commits
4 Branches
0 Tags
170 MiB
main
liutao_branch
hhk
plp
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'cd8277cf16'
${ noResults }
Commit Graph

78 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
YunaiV 19b574fd4b code review 退款逻辑 4 years ago
jason 5bf3045544 优化退款逻辑 4 years ago
YunaiV 4b2af44ee3 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/activiti 
 Conflicts:
	sql/ruoyi-vue-pro.sql
	yudao-admin-server/src/main/resources/application.yaml
	yudao-admin-server/src/main/resources/mybatis-config/mybatis-config.xml
	yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/LoginUser.java
	yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/util/SecurityFrameworkUtils.java
 4 years ago
YunaiV 67aaf28832 code review 退款逻辑 4 years ago
chen quan d556eae556 优化 支付配置校验方式，优化业务层异常抛出类型，优化支付应用渲染逻辑，添加删除支付商户 支付应用的校验，退款订单去除reqNo字段，支付订单去除 channelExtras 参数展示 4 years ago
jason 08103685f1 重构退款逻辑，去掉退款后处理 4 years ago
jason e8368bb7fd 修改退款逻辑code review 4 years ago
YunaiV bcc2ff0f5b code review 退款逻辑 4 years ago
chen quan aad85337ce Merge remote-tracking branch 'origin/pay_extension' into pay_extension 
# Conflicts:
#	yudao-admin-server/src/test/resources/sql/create_tables.sql
 4 years ago
chen quan d1a20bf259 1、完成代付订单后台模块 
2、将pay模块的 PayRefundMapper 更名为 PayRefundCoreMapper 避免冲突
3、将支付订单 UI 界面进行调整优化
 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 f94435d592 * 【升级】redisson from 3.16.3 to 3.16.6，解决 Stream 在调试场景下会存在 NPE 的问题 
* 【升级】spring-boot from 2.4.5 to 2.4.12，最新的 Spring Boot 2.6.X 在等更流行一些，稳定第一
* 【升级】druid from 1.2.4 to 1.2.8，提升数据库连接池的稳定性
* 【升级】dynamic-datasource from 3.3.2 to 3.5.0，修复动态数据源切换的问题
 4 years ago
YunaiV abf61bfdea 修复引入多租户后，前端 <img /> 读取图片报错的问题 4 years ago
YunaiV 1801250516 yudao-spring-boot-starter-data-permission 和 yudao-spring-boot-starter-tenant 调整为 biz 组件 4 years ago
YunaiV a55c0cfca5 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
 Conflicts:
	yudao-core-service/pom.xml
	yudao-dependencies/pom.xml
	yudao-framework/pom.xml
 4 years ago
YunaiV 9d97c0ccb4 yudao-spring-boot-starter-data-permission 和 yudao-spring-boot-starter-tenant 调整为 biz 组件 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 098c5b4723 1. 管理后台，增加租户管理 
2. 修复大量因为租户报错的单元测试
 4 years ago
chen quan 98dfa48ced 1：优化商户管理页面BUG 
2：优化应用关闭页面
3：完成支付订单CURD 以及单元测试
4：将 Element UI 从 2.15.0 升级至 2.15.6
 4 years ago
YunaiV 4b95146c98 设置实体继承多租户的 DO 4 years ago
YunaiV d29b0beb9b 优化 mq starter 组件，增加 RedisMQTemplate 模板类 4 years ago
YunaiV 6cd9b3bf7e 1. 增加 Job 的多租户的能力 4 years ago
YunaiV 7c8fe2fc50 1. 增加 yudao-spring-boot-starter-tenant 租户的组件 
2. 改造 UserDO，接入多租户
 4 years ago
jason f108d478a8 调整渠道支付通知地址为统一的地址 4 years ago
aquan 1c5544fc9d 优化渠道 config 校验和逻辑转换问题 4 years ago
jason dfde260ebb 支付宝退款申请通知 4 years ago
YunaiV f0fcf4798e code review 支付的逻辑 4 years ago
aquan 6069a387ea 优化完善支付应用和支付渠道代码逻辑，完善单元测试，基于validator完成手动校验config 4 years ago
jason 7d6f205dc0 支付退款申请，支付宝手机wap 相应实现 4 years ago
YunaiV 3368a995ca 支付模块的 code review 4 years ago
aquan e46a27b937 完成支付模块支付应用信息和微信类型的支付渠道配置。 4 years ago
YunaiV 6265e4a736 支付的 code review 5 years ago
jason 26798a8816 修改code review 5 years ago
ouyang 87d8b55b41 Merge branch 'pay_extension' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension 5 years ago
ouyang 461c6a0007 tina提交支付宝扫码支付 5 years ago
aquan 38f1d6428f Merge remote-tracking branch 'origin/pay_extension' into pay_extension 5 years ago
jason 2c60a3aafa 支付宝手机网站支付 5 years ago
aquan 1a721ceb5f 完成支付模块的商户管理开发以及单元测试 5 years ago
timfruit 8aa45406fd 拓展授权登录抽取成单独的starter,拓展配置和默认配置齐平 5 years ago
YunaiV 722eaf3513 调整下工作流的包名 5 years ago
YunaiV 8dbd6143bf 增加微信小程序的登陆的测试代码 5 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
 5 years ago
YunaiV cba9c609d7 code review 社交登陆的代码 5 years ago
timfruit de21034186 增加小程序授权登录 5 years ago
YunaiV 55e5ca4644 code review 用户前台的社交登陆 5 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
 5 years ago
YunaiV 7da46d1cfb Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension 5 years ago