diff --git a/cert/gen-rootCA b/cert/gen-rootCA index bb85bc5..1f196c6 100755 --- a/cert/gen-rootCA +++ b/cert/gen-rootCA @@ -12,4 +12,6 @@ echo "=============" chmod 666 rootCA.* +open . + exit 0 \ No newline at end of file diff --git a/proxy.js b/proxy.js index 3d8bf69..ff3ec6d 100644 --- a/proxy.js +++ b/proxy.js @@ -51,15 +51,20 @@ var T_TYPE_HTTP = 0, DEFAULT_TYPE = T_TYPE_HTTP; var default_rule = require('./lib/rule_default'); +//may be unreliable in windows var anyproxyHome = path.join(util.getUserHome(),"/.anyproxy/"); -if(!fs.existsSync(anyproxyHome)){ - fs.mkdirSync(anyproxyHome); -} -if(fs.existsSync(path.join(anyproxyHome,"rule_default.js"))){ - default_rule = require(path.join(anyproxyHome,"rule_default")); -} -if(fs.existsSync(path.join(process.cwd(),'rule.js'))){ - default_rule = require(path.join(process.cwd(),'rule')); +try{ + if(!fs.existsSync(anyproxyHome)){ + fs.mkdirSync(anyproxyHome); + } + if(fs.existsSync(path.join(anyproxyHome,"rule_default.js"))){ + default_rule = require(path.join(anyproxyHome,"rule_default")); + } + if(fs.existsSync(path.join(process.cwd(),'rule.js'))){ + default_rule = require(path.join(process.cwd(),'rule')); + } +}catch(e){ + } //option diff --git a/web/css/page.css b/web/css/page.css index 3db3884..a2739db 100644 --- a/web/css/page.css +++ b/web/css/page.css @@ -1,3 +1,4 @@ +/*custom iconfont*/ @font-face {font-family: 'iconfont'; src: url('iconfont.eot'); /* IE9*/ src: url('iconfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ @@ -16,36 +17,67 @@ .topHead{ - background: #000; - height: 42px; + height: 55px; position: relative; - -webkit-box-shadow: 0px 3px 23px 0px rgba(50, 50, 50, 0.75); +/* -webkit-box-shadow: 0px 3px 23px 0px rgba(50, 50, 50, 0.75); -moz-box-shadow: 0px 3px 23px 0px rgba(50, 50, 50, 0.75); box-shadow: 0px 3px 23px 0px rgba(50, 50, 50, 0.75); +*/} + +.topHead .logoWrapper{ + float: left; + width: 220px; + height: 55px; + overflow: hidden; } .topHead h1{ color: #CCCCCC; - display: inline-block; +} + +.topHead .ctrlWrapper{ + height: 35px; + line-height: 35px; } .topHead .topBtn{ - margin: 0 5px; + margin-right: 8px; + transition:0.1s; + padding: 4px; + border-radius: 2px; +} + +.topHead .topBtn:hover{ + background: #07D; + transition:0.1s; + color: #FFF; +} + +.topHead a:hover{ + text-decoration: none; +} + +.topHead i{ + margin-right: 3px; } .topHead .btn_disable{ color: #777; } -.ruleDesc{ - background: #88C4FE; +.topHead .ruleDesc{ + height: 20px; border-bottom: 1px solid #333; } -.ruleDesc h4{ - color: #333; - line-height: 25px; - margin: 0; +.topHead .ruleDesc span{ + padding-left: 3px; +} + +.topHead .ctrlWrapper .sep{ + display: inline-block; + margin: 0 8px; + color: #777; } .mainTableWrapper{ diff --git a/web/index.html b/web/index.html index bb97e28..27194a3 100644 --- a/web/index.html +++ b/web/index.html @@ -11,15 +11,28 @@
-