Merge pull request #10 from Ccapton/develop

Develop
Ccapton · Nov 8, 2018 · 9f20066 · 9f20066
2 parents bad54b9 + 46f9b8a
commit 9f20066
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,8 @@
 # [brook](https://github.com/txthinking/brook)-web
-### [brook](https://github.com/txthinking/brook)程序服务端Web后台管理服务器（Linux|MacOS），基于python、flask、flask-restful，配合[caddy](https://github.com/mholt/caddy)反向代理https
+### [brook](https://github.com/txthinking/brook)程序服务端Web后台管理服务器（Linux|MacOS），基于python、flask、flask-restful
+
+### [安全性说明WiKi](https://github.com/Ccapton/brook-web/wiki/%E5%AE%89%E5%85%A8%E6%80%A7%E8%AF%B4%E6%98%8E)
+### [点我查看项目WiKi](https://github.com/Ccapton/brook-web/wiki)
 
 <div align="center">
 <img src="https://raw.githubusercontent.com/Ccapton/brook-web/master/image/brook-web.jpeg" height="350" width="400" >        

diff --git a/brook-web.py b/brook-web.py
@@ -588,6 +588,8 @@ def record_state(service_type=-1):
             current_server['state'] = 0
         if service_type == SERVICE_TYPE_SOCKS5:
             current_server['username'] = server['username']
+        elif service_type == SERVICE_TYPE_SS:
+            current_server['encode_method'] = 'aes-256-cfb'
         current_server['ip'] = host_ip
         if server.get('info'):
             current_server['info'] = server['info']

diff --git a/static/scripts/brook.js b/static/scripts/brook.js
@@ -292,7 +292,7 @@ function update_ui(brook_state_json) {
                             }
                             var linked_num_item = '<p class="port-detail-p">连接：'+state_jsons[j][i].linked_num+'</p>';
                             var psw_item = '<p class="port-detail-p">密码：'+state_jsons[j][i].psw+'</p>';
-                            var encode_method_item = '<p class="port-detail-p">加密方式：aes-256-cfb</p>';
+
                             var username_item = '<p class="port-detail-p">用户：'+state_jsons[j][i].username+'</p>';
                             var info_items = '';
                             var link_copy_item = '<a href="#myModal4" data-toggle="modal"><span id="copy-link-btn'+j+'-'+i+'" class="fui-link copy-link-btn" ></span></a>';
@@ -305,6 +305,7 @@ function update_ui(brook_state_json) {
                                 else
                                     info_items = username_item + psw_item +linked_num_item;
                             }else if (j == 1){
+                                var encode_method_item = '<p class="port-detail-p">加密方式：'+state_jsons[j][i].encode_method+'</p>';
                                 info_items = psw_item + encode_method_item + linked_num_item;
                             }else if (j == 0){
                                 info_items = psw_item + linked_num_item;
@@ -391,7 +392,7 @@ function update_ui(brook_state_json) {
                                 }
                             }else if(j == 1){
                                 $(port_detail_p[2]).text("密码："+state_jsons[j][i].psw);
-                                $(port_detail_p[3]).text("加密方式：aes-256-cfb");
+                                $(port_detail_p[3]).text("加密方式："+state_jsons[j][i].encode_method);
                                 $(port_detail_p[4]).text("连接："+state_jsons[j][i].linked_num);
                             }else if(j == 0){
                                 $(port_detail_p[2]).text("密码："+state_jsons[j][i].psw);