Add v1.2-dev branch

增加1.2开发分支

CHANGELOG.md

@@ -3,6 +3,15 @@
 > 同时也欢迎大家的参与！感谢各位朋友的支持！ .TAT.
 
 ## 2016/04
+### /14
+  1. 增加文件管理模块拖拽文件上传功能
+
+### /13
+  1. 完全重写优化核心代码架构
+  2. 增强文件下载功能，支持稳定下载大文件
+  3. 优化HTTP请求函数
+  4. 增加显示文件管理左侧目录数
+
 ### /12
   1. 修复文件管理模板XSS安全问题
 

package.json

 {
   "name": "antsword",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "中国蚁剑是一款跨平台的开源网站管理工具",
   "main": "app.js",
   "dependencies": {
@@ -17,6 +17,7 @@
     "nugget": "^2.0.0",
     "superagent": "^1.6.1",
     "superagent-proxy": "^1.0.0",
+    "through": "^2.3.8",
     "webpack": "^1.12.14"
   },
   "scripts": {
@@ -29,14 +30,11 @@
     "type": "git",
     "url": "https://github.com/antoor/antSword"
   },
-  "debug": false,
+  "debug": true,
   "update": {
-    "md5": "13f38b143dfabf90ea296269acd5b547",
-    "logs": "添加 PHP Custom Spy，及多个 Shell 样本\n增加文件管理中可执行文件的提示样式\n调整文件管理中任务面板默认折叠（当有任务时自动展开",
-    "sources": {
-      "coding.net": "https://coding.net/api/share/download/573ed38e-ab89-4b16-86ff-2d0d58517a3f",
-      "github": "https://github.com/antoor/antSword/releases/download/1.1.2/update.zip"
-    }
+    "md5": "",
+    "logs": "",
+    "sources": {}
   },
   "bugs": {
     "url": "https://github.com/antoor/antSword/issues"

source/modules/settings/aproxy.jsx

@@ -106,17 +106,19 @@ class AProxy {
                 _aproxyauth = _formvals['username'] + ":" + _formvals['password'];
               }
               var _aproxyuri = _formvals['protocol'] + '://' + _aproxyauth + '@' +_server + ':' + _formvals['port'];
+              var hash = (String(+new Date) + String(Math.random())).substr(10, 10).replace('.', '_');
 
               antSword['ipcRenderer']
-              .on('aproxytest-error', (event, err) => {
+              .on(`aproxytest-error-${hash}`, (event, err) => {
                 layer.close(loadindex);
                 toastr.error(LANG['prompt']['error']+ "\n" + err['code'], LANG_T['error']);
               })
-              .on('aproxytest-success', (event, ret) => {
+              .on(`aproxytest-success-${hash}`, (event, ret) => {
                 layer.close(loadindex);
                 toastr.success(LANG['prompt']['success'], LANG_T['success']);
               })
               .send('aproxytest',{
+                hash: hash,
                 url: testurl || 'http://uyu.us',
                 aproxyuri: _aproxyuri
               });