jason
|
b784bf3e12
|
修改请假流程
|
4 years ago |
|
jason
|
f0b7583404
|
包名从activiti 改成 bpm
|
4 years ago |
Roland
|
e9e73c402b
|
#返显高亮工作流
|
4 years ago |
yunlong.li
|
9bbeb93b2e
|
fix:[工作流] 返回对应实例的流程图
|
4 years ago |
|
yunlong.li
|
3c3f46ee4e
|
fix:[工作流] 返回对应实例的流程图
|
4 years ago |
YunaiV
|
abf2f697fb
|
修改 wl =》bpm
|
4 years ago |
|
YunaiV
|
6f8e8acae0
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/activiti
|
4 years ago |
樊宇
|
b369b363b6
|
动态表单 命名规范
|
4 years ago |
|
YunaiV
|
b7a90c2c12
|
code review 动态表单
|
4 years ago |
|
樊宇
|
08d72fe9ca
|
Merge remote-tracking branch 'origin/master' into master
|
4 years ago |
|
樊宇
|
9d8cdb2670
|
动态表单 后端代码
|
4 years ago |
|
jason
|
56864db484
|
修改 文件重命名问题
|
4 years ago |
yex
|
4cfa959d98
|
fix: 修复通知和字典查询权限bug
|
4 years ago |
|
YunaiV
|
c186d279ba
|
code review 工作流的相关代码
|
4 years ago |
|
芋道源码
|
a4948d27d2
|
update yudao-admin-server/src/main/resources/application-local.yaml.
|
4 years ago |
|
jason
|
cc56a66332
|
修改code review
|
4 years ago |
|
jason
|
1b835e058f
|
修改code review
|
4 years ago |
|
jason
|
0d2ae6be56
|
修改code review
|
4 years ago |
|
jason
|
f26c17cff0
|
修改code review
|
4 years ago |
|
YunaiV
|
722eaf3513
|
调整下工作流的包名
|
4 years ago |
|
YunaiV
|
742125ed99
|
code review 工作流的代码
合并最新的 SQL
|
4 years ago |
|
YunaiV
|
31c4a52858
|
Merge branch 'feature/activiti' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/activiti
|
4 years ago |
|
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
|
4 years ago |
|
YunaiV
|
8dbd6143bf
|
增加微信小程序的登陆的测试代码
|
4 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
|
4 years ago |
|
YunaiV
|
55e5ca4644
|
code review 用户前台的社交登陆
|
4 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
|
4 years ago |
|
jason
|
d16185f87d
|
修改表单为外置表单
|
4 years ago |
|
YunaiV
|
7da46d1cfb
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension
|
4 years ago |
|
YunaiV
|
93351e1716
|
1. 修复 File 单元测试报错
2. 修复 mvn package 报错问题
|
4 years ago |
|
YunaiV
|
2df46a7c2d
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension
Conflicts:
更新日志.md
|
4 years ago |
|
YunaiV
|
65843d55a0
|
修改版本号为 1.2.0-snapshot
|
4 years ago |
|
YunaiV
|
dd2d8a2ba9
|
优化支付通知的逻辑，解决并发的问题。
同时，收到支付结果时，立马回调业务，避免延迟
|
4 years ago |
timfruit
|
fcf1c228c5
|
初步完成微信公众号登录
|
4 years ago |
|
YunaiV
|
4acada62d3
|
完成支付回调的逻辑
|
4 years ago |
宋天
|
f4a5a139b5
|
[update]user server模块新增测试，修改部分接口规范问题
|
4 years ago |
|
YunaiV
|
ab19228ca6
|
完成支付的下单和提交订单的逻辑
|
4 years ago |
|
jason
|
436781507e
|
merge master change
|
4 years ago |
|
YunaiV
|
6dc65234ef
|
增加支付相关表的 SQL，调整相关的实体
|
4 years ago |
|
宋天
|
79da36ac04
|
[update]更新代码规范
|
4 years ago |
|
宋天
|
c06d6e53f6
|
[update] 新增修改昵称，修改头像，查询昵称与头像接口
|
4 years ago |
|
YunaiV
|
7ca756a234
|
引入支付宝的支付功能
|
4 years ago |
|
YunaiV
|
81126b2b4b
|
1. 引入 IJPay 组件
2. 增加创建支付单的 Service 实现
|
4 years ago |
|
YunaiV
|
711a074059
|
支付系统的实体的初始化
|
5 years ago |
|
jason
|
ee8dcd0888
|
1.实现了工作流引擎 中 请假流程demo（定义在 resources/leave.bpmn)
2.增加一个一级菜单 OA 办公 下面两个菜单： 请假申请，待办任务
3.暂时不知如何找部门领导， 暂时写死为 admin
4.activity 用户组使用 用户岗位来代替。
5.新增一个用户 hradmin， 密码 123456 岗位是 人力资源
6.演示流程。
a. admin 登陆 申请请假
b. admin 待办任务（审批）
c. hradmin 登陆 待办任务（审批）
d. admin 登陆 待办任务 （确认)
|
5 years ago |
|
YunaiV
|
043c05a083
|
修复阿里云短信，无法发送的问题
|
5 years ago |
|
YunaiV
|
8e2388d52d
|
短信发送的逻辑，迁移到 yudao-core-service 模块下
|
5 years ago |
|
YunaiV
|
d6040214b8
|
1. 自动登出时，记录的日志，增加 user_id 和 user_type 字段
|
5 years ago |
|
YunaiV
|
024d44cea1
|
1. 增加前台用户的 token 刷新
2. 增加前台用户的 logout 退出
|
5 years ago |
|
YunaiV
|
d784b113af
|
将 login_log、error_log 迁移到 yudao-core-service 项目中
|
5 years ago |