1.0.1

wenjie · wenjie · commit 2e66e9ad6f22 · 2017-06-19T22:08:14.000+08:00
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -5,24 +5,26 @@ grunt.config.init({
     pkg: grunt.file.readJSON('gruntPackage.json'),
     'create-windows-installer': {
         x64:{
-            version:'1.0.0',
-            authors:'Wenjie',
-            loadingGif:'./src/icon/loading.gif',
+            version:'1.0.1',
+            authors:'wenjie',
             appDirectory:'./OutApp/proxy-win32-x64',//要打包的输入目录
-            outputDirectory:'./OutPut/win64',//grunt打包后的输出目录
+            outputDirectory:'./OutPut/win64/',//grunt打包后的输出目录
             exe:'proxy.exe',
             description:'Wenjie Development of Intranet penetration tools',
-            noMsi:true,
+            setupIcon:'./src/icon/favicon@64.ico',
+            remoteReleases:'http://downloads.tryto.cn/proxy/new/win64/',
+            noMsi:true
         },
         x32:{
-            version:'1.0.0',
-            authors:'Wenjie',
-            loadingGif:'./src/icon/loading.gif',
+            version:'1.0.1',
+            authors:'wenjie',
             appDirectory:'./OutApp/proxy-win32-ia32',//要打包的输入目录
-            outputDirectory:'./OutPut/win32',//grunt打包后的输出目录
+            outputDirectory:'./OutPut/win32/',//grunt打包后的输出目录
             exe:'proxy.exe',
             description:'Wenjie Development of Intranet penetration tools',
-            noMsi:true,
+            setupIcon:'./src/icon/favicon@64.ico',
+            remoteReleases:'http://downloads.tryto.cn/proxy/new/win32/',
+            noMsi:true
         },
     }
 });
diff --git a/README.md b/README.md
@@ -25,6 +25,6 @@ grunt
 
 ## 下载
 
-- [proxy-win-x64](http://downloads.tryto.cn/proxy/1.0.0/win64.zip) - Windows x64
-- [proxy-win-x32](http://downloads.tryto.cn/proxy/1.0.0/win32.zip) - Windows x32
+- [proxy-win-x64](http://downloads.tryto.cn/proxy/1.0.1/win64.zip) - Windows x64
+- [proxy-win-x32](http://downloads.tryto.cn/proxy/1.0.1/win32.zip) - Windows x32
 
diff --git a/gruntPackage.json b/gruntPackage.json
@@ -1,6 +1,6 @@
 {
   "name": "proxy",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "devDependencies": {
     "grunt": "^1.2.0",
     "grunt-electron-installer": "^2.1.0"    
diff --git a/html/index.html b/html/index.html
@@ -11,6 +11,7 @@
 </head>
 <body>
   <div class="container">
+      <p class="pull-right"><em class="version"></em></p>
       <div class="page-header">
         <h1>Proxy<small>内网穿透</small></h1>
       </div>
diff --git a/main.js b/main.js
@@ -20,7 +20,7 @@ const CrawlService = require('./proxy/crawlService');
 const appIcon = require('./proxy/appIcon');
 
 //url协议,用于地址打开
-app.setAsDefaultProtocolClient('wj-proxy')
+// app.setAsDefaultProtocolClient('wj-proxy')
 
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
diff --git a/package.json b/package.json
@@ -1,16 +1,16 @@
 {
   "name": "proxy",
-  "version": "1.0.0",
-  "description": "",
+  "version": "1.0.1",
+  "authors": "Wenjie",
+  "description": "Wenjie Development of Intranet penetration tools",
   "main": "main.js",
   "scripts": {
     "start": "electron .",
     "packager": "electron-packager ./ proxy --all --out ./OutApp --version 1.6.1 --overwrite --icon=./src/icon/favicon@64.ico --version-string.CompanyName=proxy --version-string.ProductName=proxy"
   },
   "license": "",
   "dependencies": {
-    "request": "2.81.0",
-    "debug": "2.6.8"
+    "request": "2.81.0"
   },
   "devDependencies": {
     "electron": "~1.6.2",
diff --git a/proxy/proxy.js b/proxy/proxy.js
@@ -1,7 +1,9 @@
 const ipcRenderer = require('electron').ipcRenderer;
 const shell = require('electron').shell
+const package = require('../package')
 
 $(function () {
+	$('.version').html('version:'+package.version);
 	//表单提交
 	$('.run').on('click',function (event) {
 		event.preventDefault();

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "proxy",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.0.1",`
`4`	`4`	`"devDependencies": {`
`5`	`5`	`"grunt": "^1.2.0",`
`6`	`6`	`"grunt-electron-installer": "^2.1.0"`