Skip to content

Commit 636438c

Browse files
author
root
committed
ver1.7.5 新增webssh终端页面新增文件上传与下载功能(支持5GB以下文件);...
1 parent a396bae commit 636438c

File tree

188 files changed

+27954
-876
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+27954
-876
lines changed

.idea/workspace.xml

Lines changed: 245 additions & 211 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,19 @@
44

55
# 安装
66
首先其他依赖服务(docker方式)
7+
78
**redis**
89
```
910
docker run --name redis-server -p 6379:6379 -d redis:latest
1011
```
12+
1113
**guacd**
1214
```
1315
docker run --name guacd -p 4822:4822 -d guacamole/guacd
1416
```
1517

1618
然后部署 devops
19+
1720
**原始方式**
1821
```
1922
# 安装相关库
@@ -30,14 +33,23 @@ celery -A devops worker -l info -c 3 --max-tasks-per-child 40
3033
sh start_docker.sh
3134
```
3235

33-
- 其他依赖服务相关配置见项目配置文件:settings.py
36+
- 其他依赖服务相关配置见项目配置文件:devops/settings.py
3437
- windows 对 celery 兼容很差,无法正常使用,所以请使用 linux 部署,推荐 Centos 7 系列
38+
- 调用scrt或者xshell客户端使用的是 URL PROTOCOL,需要本机安装 apploader,具体登陆后见:个人信息 - 配置
3539

3640
访问首页:http://127.0.0.1:8000
3741
账号: admin 密码:123456
3842

3943

4044
# 升级日志
45+
46+
### ver1.7.5
47+
修正强制断开clissh后保存2次终端日志的BUG;
48+
新增会话在一定时间内无操作自动断开功能(默认30分钟,settings.py中可配置);
49+
个人信息中新增调用本地SSH客户端与本地SFTP客户端相关配置;
50+
webssh终端页面新增文件上传与下载功能(支持5GB以下文件);
51+
修正clissh连接后无法使用sz下载文件和rz上传文件的bug;
52+
4153
### ver1.7.4
4254
新增webguacamole、webssh、webtelnet会话锁定与解锁功能;微调web终端ui;
4355

73 Bytes
Binary file not shown.

apploader/apploader.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,19 @@
88

99

1010
def main():
11+
tags = ''
1112
try:
1213
tags = parse.unquote(sys.argv[1])
1314
if tags.endswith('/'): # 当前URL PROTOCOL协议传过来的数据中无 '/' 时,默认会在字符末尾添加一个 '/',需要去掉
1415
tags = tags[:-1]
15-
# print(tags)
1616
tags = tags.split('://')
1717
del tags[0]
18-
# print(tags)
19-
subprocess.Popen('://'.join(tags))
20-
# time.sleep(20)
21-
except:
22-
print(traceback.format_exc())
23-
time.sleep(20)
18+
subprocess.Popen('://'.join(tags)) # 如果程序调用参数中有 :// 时
19+
except Exception:
20+
print('调用客户端错误,请检查程序路径或者参数是否正确')
21+
print('://'.join(tags))
22+
time.sleep(60)
23+
2424

25-
2625
if __name__ == '__main__':
2726
main()

apploader/apploader.spec

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# -*- mode: python ; coding: utf-8 -*-
2+
3+
block_cipher = None
4+
5+
6+
a = Analysis(['apploader.py'],
7+
pathex=['C:\\Users\\leffss\\Desktop\\devops\\apploader'],
8+
binaries=[],
9+
datas=[],
10+
hiddenimports=[],
11+
hookspath=[],
12+
runtime_hooks=[],
13+
excludes=[],
14+
win_no_prefer_redirects=False,
15+
win_private_assemblies=False,
16+
cipher=block_cipher,
17+
noarchive=False)
18+
pyz = PYZ(a.pure, a.zipped_data,
19+
cipher=block_cipher)
20+
exe = EXE(pyz,
21+
a.scripts,
22+
a.binaries,
23+
a.zipfiles,
24+
a.datas,
25+
[],
26+
name='apploader',
27+
debug=False,
28+
bootloader_ignore_signals=False,
29+
strip=False,
30+
upx=True,
31+
upx_exclude=[],
32+
runtime_tmpdir=None,
33+
console=True )

0 commit comments

Comments
 (0)