update

web/admin/site/proxy.py

@@ -42,10 +42,11 @@ def set_proxy():
     host = request.form.get('host', '')
     name = request.form.get('name', '')
     open_proxy = request.form.get('open_proxy', '')
+    open_cors = request.form.get('open_cors','')
     open_cache = request.form.get('open_cache', '')
     cache_time = request.form.get('cache_time', '')
     proxy_id = request.form.get('id', '')
-    return MwSites.instance().setProxy(site_name,site_from,to,host,name,open_proxy, open_cache,cache_time, proxy_id)
+    return MwSites.instance().setProxy(site_name,site_from,to,host,name,open_proxy,open_cors,open_cache,cache_time, proxy_id)
 
 # 设置代理状态
 @blueprint.route('/set_proxy_status', endpoint='set_proxy_status', methods=['POST'])

web/static/app/site.js

@@ -1617,15 +1617,20 @@ function toProxy(siteName, type, obj) {
 			btn: ['提交','关闭'],
 			content: "<form id='form_proxy' class='divtable pd15' style='padding-bottom: 10px'>\
 				<div class='line'>\
-					<span class='tname'>开启代理</span>\
+					<span class='tname' style='line-height:20px;'>开启代理</span>\
 					<div class='info-r ml0 mt5'>\
 						<input name='open_proxy' class='btswitch btswitch-ios' type='checkbox' checked>\
 						<label id='open_proxy' class='btswitch-btn' for='openProxy' style='float:left'></label>\
 						<div style='display: inline-block'>\
-							<span class='tname' style='margin-left:15px;position: relative;top: -5px;'>是否缓存</span>\
+							<span class='tname' style='position: relative;top: -5px;'>是否缓存</span>\
 							<input class='btswitch btswitch-ios' type='checkbox' name='open_cache'>\
 							<label class='btswitch-btn' id='open_cache' for='openCache' style='float:left'></label>\
 						</div>\
+						<div style='display: inline-block'>\
+							<span class='tname' style='position: relative;top: -5px;'>是否跨域</span>\
+							<input class='btswitch btswitch-ios' type='checkbox' name='open_cors'>\
+							<label class='btswitch-btn' id='open_cors' for='open_cors' style='float:left'></label>\
+						</div>\
 					</div>\
 				</div>\
 				<div class='line'>\
@@ -1666,13 +1671,21 @@ function toProxy(siteName, type, obj) {
 			success:function(){
 
 				if (typeof(obj) != 'undefined'){
-					// console.log(obj);
+					console.log(obj);
 					$('input[name="name"]').val(obj['name']).attr('readonly','readonly').addClass('disabled');
 					if (obj['open_cache'] == 'on'){
 						$("input[name='open_cache']").prop("checked",true);
 						$('#cache_time').show();
 					}
 
+					if (obj['open_cors'] == 'on'){
+						$("input[name='open_cors']").prop("checked",true);
+					}
+
+					if (obj['open_proxy'] == 'on'){
+						$("input[name='open_proxy']").prop("checked",true);
+					}
+
 					$('input[name="from"]').val(obj['from']);
 					$('input[name="to"]').val(obj['to']);
 
@@ -1722,6 +1735,15 @@ function toProxy(siteName, type, obj) {
 						$("input[name='open_cache']").prop("checked",true);
 					}
 				});
+
+				$('#open_cors').click(function(){
+					var status = $("input[name='open_cors']").prop("checked")==true?1:0;
+					if(status==1){
+						$("input[name='open_cors']").prop("checked",false);
+					}else{
+						$("input[name='open_cors']").prop("checked",true);
+					}
+				});
 			},
 			yes:function(index,layer_ro){
 				var data = $('#form_proxy').serializeArray();

web/utils/site.py

@@ -1479,7 +1479,7 @@ class sites(object):
         mw.writeFile(vhost_file, content)
 
     # 设置 网站 反向代理列表
-    def setProxy(self, site_name, site_from, to, host, name, open_proxy, open_cache, cache_time, proxy_id):
+    def setProxy(self, site_name, site_from, to, host, name, open_proxy, open_cors, open_cache, cache_time, proxy_id):
         from urllib.parse import urlparse
         if  site_name == "" or site_from == "" or to == "" or host == "" or name == "":
             return mw.returnData(False, "必填项不能为空")
@@ -1593,8 +1593,9 @@ location ^~ {from} {\n\
                 "to": to,
                 "host": host,
                 "open_cache": open_cache,
-                "open_proxy": open_proxy,
                 "cache_time": cache_time,
+                "open_proxy": open_proxy,
+                "open_cors": open_cors,
                 "id": proxy_id,
             })
         else:
@@ -1610,8 +1611,9 @@ location ^~ {from} {\n\
             data[dindex]['to'] = to
             data[dindex]['host'] = host
             data[dindex]['open_cache'] = open_cache
-            data[dindex]['open_proxy'] = open_proxy
             data[dindex]['cache_time'] = cache_time
+            data[dindex]['open_proxy'] = open_proxy
+            data[dindex]['open_cors'] = open_cors
 
         if open_proxy != 'on':
             os.rename(conf_proxy, conf_bk)