299 Commits

Author SHA1 Message Date
YuleiLan
e5be2b4e76 update readme. 2020-09-02 17:47:18 +08:00
lyl_task
b9f5247988
Merge pull request #26 from lanyulei/dev
update config file.
2020-09-02 11:40:19 +08:00
YuleiLan
bfb9dcddf1 update config file. 2020-09-02 11:39:54 +08:00
lyl_task
c6f135eb65
Merge pull request #25 from lanyulei/dev
添加多人主动处理功能。
2020-09-01 21:01:28 +08:00
Mr. Lan
6d44a15f82 Merge branch 'master' of https://github.com/lanyulei/ferry2 into dev 2020-09-01 20:58:57 +08:00
lyl_task
04b226fc5f
Merge pull request #24 from gakkiyomi/master
fix:拼写错误
2020-09-01 20:58:24 +08:00
YuleiLan
1f16e0be28 补充sql文件。 2020-09-01 19:17:08 +08:00
YuleiLan
8d60f67b0c 添加主动处理接口。 2020-09-01 19:16:21 +08:00
fangcong
81dce5bd68 fix:拼写错误 2020-09-01 18:08:59 +08:00
lyl_task
d4ab9892b9
Merge pull request #23 from lanyulei/dev
Dev
2020-08-31 23:46:26 +08:00
Mr. Lan
1bcbbf7cf5 Merge branch 'dev' of https://github.com/lanyulei/ferry2 into dev 2020-08-31 23:45:08 +08:00
Mr. Lan
1b617a038a fix bug. 2020-08-31 23:43:23 +08:00
lyl_task
902ed97b82
Merge pull request #22 from lanyulei/dev
接口层面验证可写、隐藏模版数据的更新。
2020-08-28 10:53:57 +08:00
YuleiLan
9854eeb9ac 接口层面验证可写、隐藏模版数据的更新。 2020-08-28 10:53:29 +08:00
lyl_task
7b5679f2b8
Merge pull request #21 from lanyulei/dev
新增模版管理功能。
2020-08-28 01:03:32 +08:00
Mr. Lan
995d475c93 Merge branch 'master' of https://github.com/lanyulei/ferry2 into dev 2020-08-28 01:02:53 +08:00
Mr. Lan
c7d842eb33 新增模版管理功能。 2020-08-28 01:00:57 +08:00
lyl_task
6dd1218b2c
Merge pull request #20 from lanyulei/dev
补充sql文件。
2020-08-27 10:09:59 +08:00
YuleiLan
2b102a82d5 补充sql文件。 2020-08-27 10:09:17 +08:00
lyl_task
81c3c16776
Merge pull request #19 from lanyulei/dev
修改登录日志无法清空的bug.
2020-08-27 09:53:50 +08:00
Mr. Lan
ac159d7b18 修改登录日志无法清空的bug. 2020-08-26 22:03:33 +08:00
lyl_task
b528f1e147
Merge pull request #18 from lanyulei/dev
fix bug.
2020-08-26 16:11:05 +08:00
YuleiLan
48ce714bad fix bug. 2020-08-26 16:10:19 +08:00
lyl_task
4d3f83244c
Merge pull request #17 from lanyulei/dev
fix bug.
2020-08-26 14:30:51 +08:00
YuleiLan
862a9fc80c fix bug. 2020-08-26 14:30:21 +08:00
lyl_task
5c54e33a2a
Merge pull request #16 from lanyulei/dev
Dev
2020-08-26 13:15:42 +08:00
YuleiLan
963e057501 fix bug. 2020-08-26 13:14:04 +08:00
YuleiLan
3e694a138d update readme. 2020-08-24 11:06:29 +08:00
lyl_task
40290659b4
Merge pull request #15 from lanyulei/dev
fix bug.
2020-08-21 18:37:22 +08:00
YuleiLan
24a53a404a Merge branch 'master' of https://github.com/lanyulei/ferry2 into dev 2020-08-21 18:35:37 +08:00
YuleiLan
420202fd51 fix bug. 2020-08-21 18:35:16 +08:00
lyl_task
4a0dd77310
Merge pull request #14 from lanyulei/dev
Dev
2020-08-21 17:10:25 +08:00
YuleiLan
4626e07fbf fix bug. 2020-08-21 17:09:46 +08:00
YuleiLan
0bdb8bdac6 Merge branch 'master' of https://github.com/lanyulei/ferry2 into dev 2020-08-21 14:40:44 +08:00
YuleiLan
0370314c3f 优化展示。 2020-08-21 11:28:54 +08:00
lyl_task
d41ff38f22
Merge pull request #13 from lanyulei/dev
Dev
2020-08-21 11:12:55 +08:00
YuleiLan
8334ba32ec 连接redis读取配置文件。 2020-08-21 10:32:14 +08:00
Mr. Lan
a00816f7a5 ldap兼容uid登陆验证。 2020-08-20 22:37:41 +08:00
lyl_task
d0f92a5b74
Merge pull request #12 from lanyulei/dev
fix bug.
2020-08-20 13:57:52 +08:00
YuleiLan
9d8d85f54f fix bug. 2020-08-20 13:57:05 +08:00
lyl_task
d1d4040c2f
Merge pull request #11 from lanyulei/dev
修复无法上传logo后地址不正确的bug。
2020-08-19 17:13:27 +08:00
YuleiLan
6c2abb4780 fix bug. 2020-08-19 17:11:39 +08:00
YuleiLan
9c0206ea0b update readme. 2020-08-19 15:17:31 +08:00
lyl_task
19c630d554
Merge pull request #10 from lanyulei/dev
添加系统配置管理页面
2020-08-19 13:39:04 +08:00
YuleiLan
08f55a6b69 完善系统配置功能。 2020-08-19 13:36:27 +08:00
YuleiLan
416a453c64 Merge branch 'dev' of https://github.com/lanyulei/ferry2 into dev 2020-08-19 10:07:37 +08:00
Mr. Lan
05358e9bbe 添加系统配置。 2020-08-19 01:09:01 +08:00
lyl_task
cf516accf7
Merge pull request #9 from lanyulei/dev
ldap登录自动补充用户信息
2020-08-18 14:41:54 +08:00
YuleiLan
24dce67256 Merge branch 'master' of https://github.com/lanyulei/ferry2 into dev 2020-08-18 14:40:19 +08:00
YuleiLan
e39d0fcc37 ldap登录后,补充部分用户信息。 2020-08-18 14:39:10 +08:00