XiaoMo/anyproxy
1
0
Fork 0
mirror of https://github.com/alibaba/anyproxy.git synced 2025-04-23 15:31:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
加里 2014-10-31 18:51:45 +08:00
commit 93aa79b02a
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -24,7 +24,8 @@
"socks5-https-client": "^0.2.2", "socks5-https-client": "^0.2.2",
"stream-throttle": "^0.1.3", "stream-throttle": "^0.1.3",
"ws": "^0.4.32", "ws": "^0.4.32",
"cookie":"^0.1.2" "cookie":"^0.1.2",
"mysql":"^2.5.2"
}, },
"devDependencies": {}, "devDependencies": {},
"scripts": { "scripts": {

1
proxy.js
View File

@ -7,6 +7,7 @@ try{
GLOBAL.util['jsdom'] = require('jsdom'); GLOBAL.util['jsdom'] = require('jsdom');
GLOBAL.util['cookie'] = require('cookie'); GLOBAL.util['cookie'] = require('cookie');
GLOBAL.util['jquery'] = require('jquery'); GLOBAL.util['jquery'] = require('jquery');
GLOBAL.util['mysql'] = require('mysql');
GLOBAL.util['Socks5ClientHttpAgent'] = require('socks5-http-client/lib/Agent'); GLOBAL.util['Socks5ClientHttpAgent'] = require('socks5-http-client/lib/Agent');
GLOBAL.util['Socks5ClientHttpsAgent'] = require('socks5-https-client/lib/Agent'); GLOBAL.util['Socks5ClientHttpsAgent'] = require('socks5-https-client/lib/Agent');
}catch(e){} }catch(e){}