Commit Graph

123 Commits

Author SHA1 Message Date
YunaiV
098c5b4723 1. 管理后台,增加租户管理
2. 修复大量因为租户报错的单元测试
2021-12-14 22:39:43 +08:00
YunaiV
a582a6e726 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/user-register
 Conflicts:
	更新日志.md
2021-12-14 09:58:41 +08:00
YunaiV
fba230c2b2 完善 SysPermissionServiceImpl 数据权限相关的单元测试 2021-12-14 09:36:54 +08:00
YunaiV
8278b65777 重构 Dept 数据权限逻辑,统一收到 yudao-spring-boot-starter-data-permission 包下 2021-12-13 09:27:46 +08:00
YunaiV
986cb72421 基于部门的数据权限 2021-12-13 00:28:20 +08:00
YunaiV
c99115abe7 初始化数据权限模块 2021-12-07 21:28:16 +08:00
YunaiV
4b95146c98 设置实体继承多租户的 DO 2021-12-07 13:31:59 +08:00
YunaiV
8795a4cdeb 增加 Tenant Security 的实现 2021-12-06 13:25:33 +08:00
YunaiV
1ce2c09f47 增加 Tenant MQ 的支持 2021-12-06 01:32:41 +08:00
YunaiV
d29b0beb9b 优化 mq starter 组件,增加 RedisMQTemplate 模板类 2021-12-05 23:00:41 +08:00
YunaiV
ade55d89a4 多租户,接入 Spring Async 机制 2021-12-05 17:59:58 +08:00
YunaiV
cc78025f80 修改本地不开 Job,dev 开启 Job 2021-12-05 17:35:53 +08:00
YunaiV
6cd9b3bf7e 1. 增加 Job 的多租户的能力 2021-12-05 10:44:17 +08:00
YunaiV
535d3c9c01 登陆界面,优化成输入租户名 2021-12-05 00:12:54 +08:00
YunaiV
7c8fe2fc50 1. 增加 yudao-spring-boot-starter-tenant 租户的组件
2. 改造 UserDO,接入多租户
2021-12-04 21:09:49 +08:00
chaocloud
b66d845354 代码自动生成工具,当表注释为空时,根据SQL导入失败问题修复 2021-11-24 15:08:01 +08:00
chaocloud
7991d68586 代码自动生成工具java文件路径修复 2021-11-24 15:05:04 +08:00
YunaiV
e2b76ee0e5 code review 修改密码等的单元测试 2021-11-21 12:05:34 +08:00
YunaiV
d405f4df25 修复单元测试报错的问题 2021-11-21 11:12:47 +08:00
liu xm
2fc1ef519d 修复基于建表SQL生成代码 列名没有COMMENT注释报错的问题 2021-11-08 13:27:34 +08:00
樊宇
b369b363b6 动态表单 命名规范 2021-11-04 17:35:01 +08:00
YunaiV
b7a90c2c12 code review 动态表单 2021-11-04 09:03:05 +08:00
樊宇
08d72fe9ca Merge remote-tracking branch 'origin/master' into master 2021-11-04 08:56:13 +08:00
樊宇
9d8cdb2670 动态表单 后端代码 2021-11-03 10:26:01 +08:00
yex
4cfa959d98 fix: 修复通知和字典查询权限bug 2021-11-02 12:25:41 +08:00
芋道源码
a4948d27d2 update yudao-admin-server/src/main/resources/application-local.yaml. 2021-11-01 02:04:26 +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
YunaiV
8dbd6143bf 增加微信小程序的登陆的测试代码 2021-10-30 10:09:31 +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
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
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
timfruit
fcf1c228c5 初步完成微信公众号登录 2021-10-26 21:35:06 +08:00
YunaiV
4acada62d3 完成支付回调的逻辑 2021-10-26 09:50:18 +08:00
宋天
f4a5a139b5 [update]user server模块新增测试,修改部分接口规范问题 2021-10-24 22:33:32 +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
宋天
79da36ac04 [update]更新代码规范 2021-10-20 16:59:47 +08:00
宋天
c06d6e53f6 [update] 新增修改昵称,修改头像,查询昵称与头像接口 2021-10-19 22:16:42 +08:00
YunaiV
7ca756a234 引入支付宝的支付功能 2021-10-19 09:26:49 +08:00
YunaiV
81126b2b4b 1. 引入 IJPay 组件
2. 增加创建支付单的 Service 实现
2021-10-18 09:41:38 +08:00
YunaiV
711a074059 支付系统的实体的初始化 2021-10-14 09:05:09 +08:00