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 |
|
YuleiLan
|
c13ec39382
|
Merge branch 'dev' of https://github.com/lanyulei/ferry2 into dev
|
2020-08-18 13:18:01 +08:00 |
|
lyl_task
|
15f6baaea8
|
Merge pull request #8 from lanyulei/dev
支持ldap登陆
|
2020-08-18 00:54:04 +08:00 |
|
Mr. Lan
|
2938a213d1
|
添加ldap登陆校验。
|
2020-08-18 00:53:02 +08:00 |
|
Mr. Lan
|
6087a60105
|
完成ldap验证。
|
2020-08-17 22:38:41 +08:00 |
|
YuleiLan
|
e4fbbbe77f
|
Merge branch 'dev' of https://github.com/lanyulei/ferry2 into dev
|
2020-08-17 15:10:51 +08:00 |
|
Mr. Lan
|
c30f7c8387
|
更新ldap。
|
2020-08-17 01:24:51 +08:00 |
|
Mr. Lan
|
45899369d0
|
添加ldap。
|
2020-08-16 23:16:02 +08:00 |
|
Mr. Lan
|
98024204c5
|
update mod.
|
2020-08-15 23:39:00 +08:00 |
|
Mr. Lan
|
8b8d086432
|
调整日志库为zap。
|
2020-08-15 23:34:37 +08:00 |
|
Mr. Lan
|
9a8ea8d493
|
启动任务调度。
|
2020-08-15 11:45:00 +08:00 |
|
lyl_task
|
c42c8a49f6
|
Merge pull request #7 from lanyulei/dev
Dev
|
2020-08-14 22:12:45 +08:00 |
|
Mr. Lan
|
df650a0263
|
update config.
|
2020-08-14 22:08:16 +08:00 |
|
Mr. Lan
|
f9cdab986b
|
update config.
|
2020-08-14 22:07:56 +08:00 |
|
lyl_task
|
5ea68433d2
|
Merge pull request #6 from lanyulei/dev
功能完善。
|
2020-08-14 21:45:28 +08:00 |
|
Mr. Lan
|
9e56692b80
|
email模版url可配置。
|
2020-08-14 21:22:11 +08:00 |
|