lanyulei
|
7a503595ff
|
Merge pull request #107 from lanyulei/dev
fix: update db.sql
|
2020-11-17 22:57:47 +08:00 |
|
Mr. Lan
|
41bf960051
|
fix: update db.sql
|
2020-11-17 22:57:01 +08:00 |
|
lanyulei
|
6ed2a57e3d
|
Merge pull request #105 from lanyulei/dev
fix: fix bug.
|
2020-11-16 18:53:01 +08:00 |
|
YuleiLan
|
988c36823c
|
fix: fix bug.
|
2020-11-16 18:49:46 +08:00 |
|
lanyulei
|
362ddd3154
|
Merge pull request #104 from lanyulei/dev
fix: 调整docker-compose文件。
|
2020-11-16 18:48:23 +08:00 |
|
YuleiLan
|
ceefb1d791
|
fix: 调整docker-compose文件。
|
2020-11-16 18:46:45 +08:00 |
|
lanyulei
|
df08b89bb0
|
Merge pull request #102 from lanyulei/dev
feat: 添加部门处理人。
|
2020-11-15 20:14:57 +08:00 |
|
Mr. Lan
|
ba74c8c748
|
feat: 添加部门处理人。
|
2020-11-15 20:13:17 +08:00 |
|
lanyulei
|
6addad26cb
|
Merge pull request #101 from lanyulei/dev
feat: 添加角色处理人。
|
2020-11-15 14:53:30 +08:00 |
|
Mr. Lan
|
5d7ca470a1
|
feat: 添加角色处理人。
|
2020-11-15 14:52:09 +08:00 |
|
lanyulei
|
10ee3192c1
|
Merge pull request #100 from lanyulei/dev
fix: update go.mod.
|
2020-11-13 23:36:09 +08:00 |
|
Mr. Lan
|
2e8eb41434
|
fix: update go.mod.
|
2020-11-13 23:35:30 +08:00 |
|
lanyulei
|
b236449f60
|
Merge pull request #99 from lanyulei/dev
Dev
|
2020-11-13 17:49:45 +08:00 |
|
YuleiLan
|
da1cbfd7fa
|
fix: 调整nginx配置。
|
2020-11-13 17:41:21 +08:00 |
|
lanyulei
|
411f41994f
|
Merge pull request #88 from qknow-w/master
Update go.mod
|
2020-11-13 15:07:12 +08:00 |
|
YuleiLan
|
46ef2ae382
|
fix: update docker-compose
|
2020-11-12 15:13:34 +08:00 |
|
lanyulei
|
bae310ce49
|
Merge pull request #97 from lanyulei/dev
feat: 添加是否获取地理位置的开关。
|
2020-11-12 14:49:15 +08:00 |
|
YuleiLan
|
05bd2702ef
|
feat: 添加是否获取地理位置的开关。
|
2020-11-12 14:48:27 +08:00 |
|
lanyulei
|
032664e684
|
Merge pull request #96 from lanyulei/dev
添加docker-compost部署方式
|
2020-11-12 12:08:03 +08:00 |
|
YuleiLan
|
642904c2b4
|
feat: 完善docker-compost yml文件。
|
2020-11-12 12:07:07 +08:00 |
|
Mr. Lan
|
5785a609b4
|
feat: 添加docker-compost
|
2020-11-12 01:29:46 +08:00 |
|
YuleiLan
|
3f3db768e7
|
feat: 添加docker-compose.
|
2020-11-11 17:26:39 +08:00 |
|
Mr. Lan
|
fd0661dd8d
|
feat: add Dockerfile.
|
2020-11-11 08:54:47 +08:00 |
|
lanyulei
|
3b272f84d4
|
Merge pull request #89 from lanyulei/dev
fix: 调整任务创建的文件权限。
|
2020-11-05 16:52:48 +08:00 |
|
YuleiLan
|
7bdcd9a79f
|
fix: 调整任务创建的文件权限。
|
2020-11-05 16:52:21 +08:00 |
|
wei
|
066432d538
|
Update go.mod
update gopsutil v3.20.10+incompatible
|
2020-11-05 11:25:07 +08:00 |
|
lanyulei
|
e443d4d7cf
|
Merge pull request #87 from lanyulei/dev
fix: 修复上传文件时，request host越界问题。fix #86
|
2020-11-04 16:26:08 +08:00 |
|
YuleiLan
|
7506bca2ad
|
fix: 修复上传文件时，request host越界问题。fix #86
|
2020-11-04 16:25:24 +08:00 |
|
lanyulei
|
b23d8bed66
|
Merge pull request #85 from lanyulei/dev
fix: 完善ldap连接。
|
2020-11-04 13:40:10 +08:00 |
|
YuleiLan
|
6b80768e5e
|
fix: 完善ldap连接。
|
2020-11-04 13:39:22 +08:00 |
|
lanyulei
|
f5e8755340
|
Merge pull request #81 from aleiphoenix/master
use DialTLS instead of StartTLS on ldap.Conn
|
2020-11-04 13:37:20 +08:00 |
|
lanyulei
|
b11f2cf772
|
Merge pull request #84 from lanyulei/dev
修复会签bug
|
2020-11-04 00:49:48 +08:00 |
|
Mr. Lan
|
7133e91552
|
fix: 修复会签bug，fix #82
|
2020-11-04 00:48:04 +08:00 |
|
aleiphoenix
|
0523e6777d
|
use DialTLS instead of StartTLS on ldap.Conn
|
2020-11-03 12:36:34 +08:00 |
|
Mr. Lan
|
536a4c5686
|
Merge branch 'dev' of https://github.com/lanyulei/ferry2 into dev
|
2020-11-02 21:42:02 +08:00 |
|
lanyulei
|
a85e11574d
|
Merge pull request #78 from lanyulei/dev
fix: fix bug.
|
2020-10-28 10:52:24 +08:00 |
|
YuleiLan
|
fea43a65ea
|
fix: fix bug.
|
2020-10-28 10:51:35 +08:00 |
|
lanyulei
|
d9a7f70829
|
Merge pull request #77 from lanyulei/dev
fix: fix bug.
|
2020-10-28 10:14:57 +08:00 |
|
YuleiLan
|
ea3769142e
|
fix: fix bug.
|
2020-10-28 10:11:34 +08:00 |
|
Mr. Lan
|
54182fd609
|
Merge branch 'dev' of https://github.com/lanyulei/ferry2 into dev
|
2020-10-22 23:10:14 +08:00 |
|
lanyulei
|
c4df68d715
|
Merge pull request #75 from lanyulei/dev
feat: 补充前端编译程序。
|
2020-10-22 10:09:10 +08:00 |
|
YuleiLan
|
47d44b0357
|
feat: 补充前端编译程序。
|
2020-10-22 10:07:48 +08:00 |
|
lanyulei
|
bcddaf6705
|
Merge pull request #74 from lanyulei/dev
审批退回无法编辑
|
2020-10-14 18:04:31 +08:00 |
|
YuleiLan
|
c1ee9415a1
|
fix: 审批退回无法编辑, fix #71
|
2020-10-14 18:03:11 +08:00 |
|
Mr. Lan
|
ccc0a1c3c1
|
fix: fix bug.
|
2020-10-13 22:37:35 +08:00 |
|
lanyulei
|
fd74df8289
|
Merge pull request #73 from lanyulei/dev
feat: 兼容前后端不分离的情况。
|
2020-10-13 00:17:04 +08:00 |
|
Mr. Lan
|
65b8090ad0
|
feat: 兼容前后端不分离的情况。
|
2020-10-13 00:14:14 +08:00 |
|
lanyulei
|
db8b5faf0e
|
Merge pull request #69 from lanyulei/dev
fix: 修复工单列表展示bug。
|
2020-10-09 00:59:01 +08:00 |
|
Mr. Lan
|
87ba9e8943
|
fix: 修复工单列表展示bug。
|
2020-10-09 00:58:14 +08:00 |
|
lanyulei
|
a529d695b6
|
Merge pull request #68 from lanyulei/dev
Dev
|
2020-10-09 00:41:32 +08:00 |
|