1.6

version
修复页面加载错误，支持dnspod国际版
2026-05-10 15:36:26 +02:00 · 2024-07-07 15:54:11 +08:00 · 2024-07-07 13:39:52 +08:00 · 2024-07-07 13:39:27 +08:00 · 2024-06-09 10:11:00 +08:00
28 changed files with 405 additions and 40 deletions
--- a/app/command/Dmtask.php
+++ b/app/command/Dmtask.php
@@ -10,6 +10,7 @@ use think\console\input\Argument;
 use think\console\input\Option;
 use think\console\Output;
 use think\facade\Db;
+use think\facade\Config;
 use app\lib\TaskRunner;

 class Dmtask extends Command
@@ -23,6 +24,9 @@ class Dmtask extends Command

    protected function execute(Input $input, Output $output)
    {
+        $res = Db::name('config')->cache('configs',0)->column('value','key');
+        Config::set($res, 'sys');
+
        config_set('run_error', '');
        if(!extension_loaded('swoole')){
            $output->writeln('[Error] 未安装Swoole扩展');
--- a/app/command/Opiptask.php
+++ b/app/command/Opiptask.php
@@ -10,6 +10,7 @@ use think\console\input\Argument;
 use think\console\input\Option;
 use think\console\Output;
 use think\facade\Db;
+use think\facade\Config;
 use app\lib\OptimizeService;

 class Opiptask extends Command
@@ -23,6 +24,9 @@ class Opiptask extends Command

    protected function execute(Input $input, Output $output)
    {
+        $res = Db::name('config')->cache('configs',0)->column('value','key');
+        Config::set($res, 'sys');
+        
        (new OptimizeService())->execute();
    }
 }
--- a/app/controller/Dmonitor.php
+++ b/app/controller/Dmonitor.php
@@ -86,6 +86,7 @@ class Dmonitor extends BaseController
                    'frequency' => input('post.frequency/d'),
                    'cycle' => input('post.cycle/d'),
                    'timeout' => input('post.timeout/d'),
+                    'proxy' => input('post.proxy/d'),
                    'remark' => input('post.remark', null, 'trim'),
                    'recordinfo' => input('post.recordinfo', null, 'trim'),
                    'addtime' => time(),
@@ -121,6 +122,7 @@ class Dmonitor extends BaseController
                    'frequency' => input('post.frequency/d'),
                    'cycle' => input('post.cycle/d'),
                    'timeout' => input('post.timeout/d'),
+                    'proxy' => input('post.proxy/d'),
                    'remark' => input('post.remark', null, 'trim'),
                    'recordinfo' => input('post.recordinfo', null, 'trim'),
                ];
@@ -233,6 +235,23 @@ class Dmonitor extends BaseController
        return View::fetch();
    }

+    public function proxyset()
+    {
+        if(!checkPermission(2)) return $this->alert('error', '无权限');
+        if(request()->isPost()){
+            $params = input('post.');
+            foreach ($params as $key=>$value){
+                if (empty($key)) {
+                    continue;
+                }
+                config_set($key, $value);
+                Cache::delete('configs'); 
+            }
+            return json(['code'=>0, 'msg'=>'succ']);
+        }
+        return View::fetch();
+    }
+
    public function mailtest()
    {
        if(!checkPermission(2)) return $this->alert('error', '无权限');
@@ -246,6 +265,21 @@ class Dmonitor extends BaseController
        }
    }

+    public function tgbottest()
+    {
+        if(!checkPermission(2)) return $this->alert('error', '无权限');
+        $tgbot_token = config_get('tgbot_token');
+        $tgbot_chatid = config_get('tgbot_chatid');
+        if(empty($tgbot_token) || empty($tgbot_chatid)) return json(['code'=>-1, 'msg'=>'请先保存设置']);
+        $content = "<strong>消息发送测试</strong>\n\n这是一封测试消息！\n\n来自：".request()->root(true);
+        $result = \app\lib\MsgNotice::send_telegram_bot($content);
+        if($result === true){
+            return json(['code'=>0, 'msg'=>'消息发送成功！']);
+        }else{
+            return json(['code'=>-1, 'msg'=>'消息发送失败！'.$result]);
+        }
+    }
+
    public function clean()
    {
        if(!checkPermission(2)) return $this->alert('error', '无权限');
--- a/app/controller/Domain.php
+++ b/app/controller/Domain.php
@@ -7,6 +7,7 @@ use think\facade\Db;
 use think\facade\View;
 use think\facade\Request;
 use app\lib\DnsHelper;
+use Exception;

 class Domain extends BaseController
 {
@@ -253,9 +254,9 @@ class Domain extends BaseController
        $minTTL = cache('min_ttl_'.$drow['id']);
        if(empty($recordLine)){
            $dns = DnsHelper::getModel($drow['aid'], $drow['name'], $drow['thirdid']);
-            if(!$dns) return $this->alert('error', 'DNS模块不存在');
+            if(!$dns) throw new Exception('DNS模块不存在');
            $recordLine = $dns->getRecordLine();
-            if(!$recordLine) return $this->alert('error', '获取解析线路列表失败，'.$dns->getError());
+            if(!$recordLine) throw new Exception('获取解析线路列表失败，'.$dns->getError());
            cache('record_line_'.$drow['id'], $recordLine, 604800);
            $minTTL = $dns->getMinTTL();
            if($minTTL){
--- a/app/lib/CheckUtils.php
+++ b/app/lib/CheckUtils.php
@@ -4,7 +4,7 @@ namespace app\lib;

 class CheckUtils
 {
-    public static function curl($url, $timeout, $ip = null)
+    public static function curl($url, $timeout, $ip = null, $proxy = false)
    {
        $status = true;
        $errmsg = null;
@@ -19,6 +19,28 @@ class CheckUtils
            }
        }
        $ch = curl_init();
+        if($proxy){
+            $proxy_server = config_get('proxy_server');
+            $proxy_port = intval(config_get('proxy_port'));
+            $proxy_userpwd = config_get('proxy_user').':'.config_get('proxy_pwd');
+            $proxy_type = config_get('proxy_type');
+            if($proxy_type == 'https'){
+                $proxy_type = CURLPROXY_HTTPS;
+            }elseif($proxy_type == 'sock4'){
+                $proxy_type = CURLPROXY_SOCKS4;
+            }elseif($proxy_type == 'sock5'){
+                $proxy_type = CURLPROXY_SOCKS5;
+            }else{
+                $proxy_type = CURLPROXY_HTTP;
+            }
+            curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_BASIC);
+            curl_setopt($ch, CURLOPT_PROXY, $proxy_server);
+            curl_setopt($ch, CURLOPT_PROXYPORT, $proxy_port);
+            if($proxy_userpwd != ':'){
+                curl_setopt($ch, CURLOPT_PROXYUSERPWD, $proxy_userpwd);
+            }
+            curl_setopt($ch, CURLOPT_PROXYTYPE, $proxy_type);
+        }
        curl_setopt($ch, CURLOPT_URL, $url);
        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
--- a/app/lib/DnsHelper.php
+++ b/app/lib/DnsHelper.php
@@ -65,7 +65,7 @@ class DnsHelper
            'name' => 'Cloudflare',
            'config' => [
                'ak' => '邮箱地址',
-                'sk' => 'API密钥'
+                'sk' => 'API密钥/令牌'
            ],
            'remark' => 2,
            'status' => false,
--- a/app/lib/MsgNotice.php
+++ b/app/lib/MsgNotice.php
@@ -41,8 +41,13 @@ class MsgNotice
            self::send_mail($mail_name, $mail_title, $mail_content);
        }
        if(config_get('notice_wxtpl') == 1){
-            $mail_content = str_replace(['<br/>', '<b>', '</b>'], ["\n\n", '**', '**'], $mail_content);
-            self::send_wechat_tplmsg($mail_title, $mail_content);
+            $content = str_replace(['<br/>', '<b>', '</b>'], ["\n\n", '**', '**'], $mail_content);
+            self::send_wechat_tplmsg($mail_title, $content);
+        }
+        if(config_get('notice_tgbot') == 1){
+            $content = str_replace('<br/>', "\n", $mail_content);
+            $content = "<strong>".$mail_title."</strong>\n".$content;
+            self::send_telegram_bot($content);
        }
    }
    
@@ -102,4 +107,61 @@ class MsgNotice
 			return $arr['msg'];
 		}
    }
+
+    public static function send_telegram_bot($content){
+        $tgbot_token = config_get('tgbot_token');
+        $tgbot_chatid = config_get('tgbot_chatid');
+        if(!$tgbot_token||!$tgbot_chatid)return false;
+        $url = 'https://api.telegram.org/bot'.$tgbot_token.'/sendMessage';
+        $post = ['chat_id'=>$tgbot_chatid, 'text'=>$content, 'parse_mode'=>'HTML'];
+        $result = self::telegram_curl($url, http_build_query($post));
+        $arr = json_decode($result, true);
+        if(isset($arr['ok']) && $arr['ok']==true){
+            return true;
+        }else{
+            return $arr['description'];
+        }
+    }
+
+    private static function telegram_curl($url, $post){
+        $ch = curl_init();
+        if(config_get('tgbot_proxy') == 1){
+            $proxy_server = config_get('proxy_server');
+            $proxy_port = intval(config_get('proxy_port'));
+            $proxy_userpwd = config_get('proxy_user').':'.config_get('proxy_pwd');
+            $proxy_type = config_get('proxy_type');
+            if($proxy_type == 'https'){
+                $proxy_type = CURLPROXY_HTTPS;
+            }elseif($proxy_type == 'sock4'){
+                $proxy_type = CURLPROXY_SOCKS4;
+            }elseif($proxy_type == 'sock5'){
+                $proxy_type = CURLPROXY_SOCKS5;
+            }else{
+                $proxy_type = CURLPROXY_HTTP;
+            }
+            curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_BASIC);
+            curl_setopt($ch, CURLOPT_PROXY, $proxy_server);
+            curl_setopt($ch, CURLOPT_PROXYPORT, $proxy_port);
+            if($proxy_userpwd != ':'){
+                curl_setopt($ch, CURLOPT_PROXYUSERPWD, $proxy_userpwd);
+            }
+            curl_setopt($ch, CURLOPT_PROXYTYPE, $proxy_type);
+        }
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+        $httpheader[] = "Accept: */*";
+        $httpheader[] = "Accept-Encoding: gzip,deflate,sdch";
+        $httpheader[] = "Accept-Language: zh-CN,zh;q=0.8";
+        $httpheader[] = "Connection: close";
+        curl_setopt($ch, CURLOPT_HTTPHEADER, $httpheader);
+        curl_setopt($ch, CURLOPT_POST, 1);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $post);
+        curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (Linux; U; Android 4.0.4; es-mx; HTC_One_X Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0");
+        curl_setopt($ch, CURLOPT_ENCODING, "gzip");
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        $ret = curl_exec($ch);
+        curl_close($ch);
+        return $ret;
+    }
 }
--- a/app/lib/TaskRunner.php
+++ b/app/lib/TaskRunner.php
@@ -39,7 +39,7 @@ class TaskRunner
 			}
        }else{
            if($row['checktype'] == 2){
-                $result = CheckUtils::curl($row['checkurl'], $row['timeout'], $row['main_value']);
+                $result = CheckUtils::curl($row['checkurl'], $row['timeout'], $row['main_value'], $row['proxy'] == 1);
            }else if($row['checktype'] == 1){
                $result = CheckUtils::tcp($row['main_value'], $row['tcpport'], $row['timeout']);
            }else{
--- a/app/lib/dns/cloudflare.php
+++ b/app/lib/dns/cloudflare.php
@@ -178,10 +178,16 @@ class cloudflare implements DnsInterface {
 	private function send_reuqest($method, $path, $params = null){
 		$url = $this->baseUrl . $path;
 		
-		$headers = [
-			'X-Auth-Email: '.$this->Email,
-			'X-Auth-Key: '.$this->ApiKey,
-		];
+		if(preg_match('/^[0-9a-z]+$/i',$this->ApiKey)){
+			$headers = [
+				'X-Auth-Email: '.$this->Email,
+				'X-Auth-Key: '.$this->ApiKey,
+			];
+		}else{
+			$headers = [
+				'Authorization: Bearer '.$this->ApiKey,
+			];
+		}

 		$body = '';
        if ($method == 'GET' || $method == 'DELETE') {
--- a/app/lib/dns/dnspod.php
+++ b/app/lib/dns/dnspod.php
@@ -12,6 +12,7 @@ class dnspod implements DnsInterface {
 	private $error;
 	private $domain;
 	private $domainid;
+	private $domainInfo;

 	function __construct($config){
 		$this->SecretId = $config['ak'];
@@ -24,7 +25,7 @@ class dnspod implements DnsInterface {
 	}

 	public function check(){
-		if($this->getAccountInfo() != false){
+		if($this->getDomainList() != false){
 			return true;
 		}
 		return false;
@@ -194,6 +195,15 @@ class dnspod implements DnsInterface {
 			$list = [];
 			$this->processLineList($list, $data['LineList'], null);
 			return $list;
+		}else{
+			$data = $this->getRecordLineByGrade();
+			if($data){
+				$list = [];
+				foreach($data as $row){
+					$list[$row['LineId']] = ['name'=>$row['Name'], 'parent'=>null];
+				}
+				return $list;
+			}
 		}
 		return false;
 	}
@@ -211,11 +221,12 @@ class dnspod implements DnsInterface {

 	//获取域名概览信息
 	public function getDomainInfo(){
-		$action = 'DescribeDomainPreview';
+		$action = 'DescribeDomain';
 		$param = ['Domain' => $this->domain];
 		$data = $this->send_reuqest($action, $param);
 		if($data){
-			return $data['Domain'];
+			$this->domainInfo = $data['DomainInfo'];
+			return $data['DomainInfo'];
 		}
 		return false;
 	}
@@ -233,16 +244,36 @@ class dnspod implements DnsInterface {

 	//获取域名最低TTL
 	public function getMinTTL(){
+		if($this->domainInfo){
+			return $this->domainInfo['TTL'];
+		}
 		$PurviewList = $this->getDomainPurview();
 		if($PurviewList){
 			foreach($PurviewList as $row){
-				if($row['Name'] == '记录 TTL 最低'){
+				if($row['Name'] == '记录 TTL 最低' || $row['Name'] == 'Min TTL value'){
 					return intval($row['Value']);
 				}
 			}
 		}
 		return false;
 	}
+	
+	//获取等级允许的线路
+	public function getRecordLineByGrade(){
+		$action = 'DescribeRecordLineList';
+		$param = ['Domain' => $this->domain, 'DomainGrade' => ''];
+		$data = $this->send_reuqest($action, $param);
+		if($data){
+			$line_list = $data['LineList'];
+			if(!empty($data['LineGroupList'])){
+				foreach($data['LineGroupList'] as $row){
+					$line_list[] = ['Name' => $row['Name'], 'LineId' => $row['LineId']];
+				}
+				return $line_list;
+			}
+		}
+		return false;
+	}

 	//获取用户信息
 	public function getAccountInfo(){
--- a/app/middleware/ViewOutput.php
+++ b/app/middleware/ViewOutput.php
@@ -18,7 +18,7 @@ class ViewOutput
    {
        View::assign('islogin', $request->islogin);
        View::assign('user', $request->user);
-        View::assign('cdnpublic', '//lib.baomitu.com/');
+        View::assign('cdnpublic', 'https://s4.zstatic.net/ajax/libs/');
        View::assign('skin', getAdminSkin());
        return $next($request);
    }
--- a/app/sql/install.sql
+++ b/app/sql/install.sql
@@ -5,7 +5,7 @@ CREATE TABLE `dnsmgr_config` (
  PRIMARY KEY (`key`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-INSERT INTO `dnsmgr_config` VALUES ('version', '1007');
+INSERT INTO `dnsmgr_config` VALUES ('version', '1011');
 INSERT INTO `dnsmgr_config` VALUES ('notice_mail', '0');
 INSERT INTO `dnsmgr_config` VALUES ('notice_wxtpl', '0');
 INSERT INTO `dnsmgr_config` VALUES ('mail_smtp', 'smtp.qq.com');
@@ -92,6 +92,7 @@ CREATE TABLE `dnsmgr_dmtask` (
  `cycle` tinyint(5) NOT NULL DEFAULT 3,
  `timeout` tinyint(5) NOT NULL DEFAULT 2,
  `remark` varchar(100) DEFAULT NULL,
+  `proxy` tinyint(1) NOT NULL DEFAULT 0,
  `addtime` int(11) NOT NULL DEFAULT 0,
  `checktime` int(11) NOT NULL DEFAULT 0,
  `checknexttime` int(11) NOT NULL DEFAULT 0,
--- a/app/sql/update.sql
+++ b/app/sql/update.sql
@@ -62,4 +62,7 @@ CREATE TABLE IF NOT EXISTS `dnsmgr_optimizeip` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

 ALTER TABLE `dnsmgr_domain`
-ADD COLUMN `remark` varchar(100) DEFAULT NULL;
+ADD COLUMN `remark` varchar(100) DEFAULT NULL;
+
+ALTER TABLE `dnsmgr_dmtask`
+ADD COLUMN `proxy` tinyint(1) NOT NULL DEFAULT 0;
--- a/app/view/common/layout.html
+++ b/app/view/common/layout.html
@@ -107,7 +107,7 @@
            <a href="/domain"><i class="fa fa-list-ul fa-fw"></i> <span>域名管理</span></a>
          </li>
          {if request()->user['level'] eq 2}
-          <li class="treeview {:checkIfActive('overview,task,noticeset,taskinfo,taskform')}">
+          <li class="treeview {:checkIfActive('overview,task,noticeset,taskinfo,taskform,proxyset')}">
            <a href="javascript:;">
              <i class="fa fa-heartbeat fa-fw"></i>
              <span>容灾切换</span>
@@ -119,6 +119,7 @@
              <li><a href="/dmonitor/overview"><i class="fa fa-circle-o"></i> 运行概览</a></li>
              <li><a href="/dmonitor/task"><i class="fa fa-circle-o"></i> 切换策略</a></li>
              <li><a href="/dmonitor/noticeset"><i class="fa fa-circle-o"></i> 通知设置</a></li>
+              <li><a href="/dmonitor/proxyset"><i class="fa fa-circle-o"></i> 代理设置</a></li>
            </ul>
          </li>
          <li class="treeview {:checkIfActive('opipset,opiplist,opipform')}">
--- a/app/view/dmonitor/noticeset.html
+++ b/app/view/dmonitor/noticeset.html
@@ -15,6 +15,10 @@
 	  <label class="col-sm-3 control-label">微信公众号通知</label>
 	  <div class="col-sm-9"><select class="form-control" name="notice_wxtpl" default="{:config_get('notice_wxtpl')}"><option value="0">关闭</option><option value="1">开启</option></select></div>
 	</div>
+	<div class="form-group">
+		<label class="col-sm-3 control-label">Telegram机器人通知</label>
+		<div class="col-sm-9"><select class="form-control" name="notice_tgbot" default="{:config_get('notice_tgbot')}"><option value="0">关闭</option><option value="1">开启</option></select></div>
+	  </div>
 	<div class="form-group">
 	  <div class="col-sm-offset-3 col-sm-9"><input type="submit" name="submit" value="保存" class="btn btn-primary btn-block"/></div>
 	</div>
@@ -99,6 +103,34 @@
 <b>WxPusher：</b><a href="https://wxpusher.zjiecode.com/admin/" target="_blank" rel="noopener noreferrer">点此进入</a> ，注册并且创建应用 -> 将appToken填写到上方输入框 -> 扫码关注应用 -> 在用户列表查看自己的UID填写到上方输入框<br/>
 </div>
 </div>
+<div class="panel panel-info">
+<div class="panel-heading"><h3 class="panel-title">Telegram机器人接口设置</h3></div>
+<div class="panel-body">
+  <form onsubmit="return saveSetting(this)" method="post" class="form-horizontal" role="form">
+	<div class="form-group">
+	  <label class="col-sm-3 control-label">Token</label>
+	  <div class="col-sm-9"><input type="text" name="tgbot_token" value="{:config_get('tgbot_token')}" class="form-control"/></div>
+	</div>
+	<div class="form-group">
+	  <label class="col-sm-3 control-label">Chat Id</label>
+	  <div class="col-sm-9"><input type="text" name="tgbot_chatid" value="{:config_get('tgbot_chatid')}" class="form-control"/></div>
+	</div>
+	<div class="form-group">
+		<label class="col-sm-3 control-label">使用代理服务器</label>
+		<div class="col-sm-9"><select class="form-control" name="tgbot_proxy" default="{:config_get('tgbot_proxy')}"><option value="0">否</option><option value="1">是</option></select></div>
+	  </div>
+	<div class="form-group">
+	  <div class="col-sm-offset-3 col-sm-9">
+		<input type="submit" name="submit" value="保存" class="btn btn-primary btn-block"/>
+		<a href="javascript:tgbottest()" class="btn btn-default btn-block">发送测试消息</a>
+	</div>
+	</div>
+  </form>
+</div>
+<div class="panel-footer">
+与<a href="https://t.me/BotFather" target="_blank" rel="noopener noreferrer">@BotFather</a>对话，使用/newbot命令创建一个新的机器人，根据提示输入机器人的名称和用户名，可得到Token，或使用/mybots命令查看已创建的机器人；与<a href="https://t.me/getmyid_bot" target="_blank" rel="noopener noreferrer">@getmyid_bot</a>对话，可得到Chat Id<br/>
+</div>
+</div>
 </div>
 </div>
 {/block}
@@ -129,7 +161,7 @@ function saveSetting(obj){
 		success : function(data) {
 			layer.close(ii);
 			if(data.code == 0){
-				layer.alert('设置保存成功！', {
+				layer.alert('设置保存成功！<br/>重启检测进程或容器后生效', {
 					icon: 1,
 					closeBtn: false
 				}, function(){
@@ -166,5 +198,25 @@ function mailtest(){
 		}
 	});
 }
+function tgbottest(){
+	var ii = layer.load(2, {shade:[0.1,'#fff']});
+	$.ajax({
+		type : 'GET',
+		url : '/dmonitor/tgbottest',
+		dataType : 'json',
+		success : function(data) {
+			layer.close(ii);
+			if(data.code == 0){
+				layer.alert(data.msg, {icon: 1});
+			}else{
+				layer.alert(data.msg, {icon: 2})
+			}
+		},
+		error:function(data){
+            layer.close(ii);
+			layer.msg('服务器错误');
+		}
+	});
+}
 </script>
 {/block}
--- a/app/view/dmonitor/proxyset.html
+++ b/app/view/dmonitor/proxyset.html
@@ -0,0 +1,129 @@
+{extend name="common/layout" /}
+{block name="title"}容灾切换代理设置{/block}
+{block name="main"}
+<div class="row">
+<div class="col-xs-12 col-sm-8 col-lg-6 center-block" style="float: none;">
+<div class="panel panel-info">
+<div class="panel-heading"><h3 class="panel-title">代理服务器设置</h3></div>
+<div class="panel-body">
+  <form onsubmit="return saveSetting(this)" method="post" class="form-horizontal" role="form">
+	<div class="form-group">
+	  <label class="col-sm-3 control-label">代理IP</label>
+	  <div class="col-sm-9"><input type="text" name="proxy_server" value="{:config_get('proxy_server')}" class="form-control"/></div>
+	</div><br/>
+	<div class="form-group">
+	  <label class="col-sm-3 control-label">代理端口</label>
+	  <div class="col-sm-9"><input type="text" name="proxy_port" value="{:config_get('proxy_port')}" class="form-control"/></div>
+	</div><br/>
+	<div class="form-group">
+	  <label class="col-sm-3 control-label">代理账号</label>
+	  <div class="col-sm-9"><input type="text" name="proxy_user" value="{:config_get('proxy_user')}" class="form-control" placeholder="没有请留空"/></div>
+	</div><br/>
+	<div class="form-group">
+	  <label class="col-sm-3 control-label">代理密码</label>
+	  <div class="col-sm-9"><input type="text" name="proxy_pwd" value="{:config_get('proxy_pwd')}" class="form-control" placeholder="没有请留空"/></div>
+	</div><br/>
+	<div class="form-group">
+	  <label class="col-sm-3 control-label">代理协议</label>
+	  <div class="col-sm-9"><select class="form-control" name="proxy_type" default="{:config_get('proxy_type')}">
+	  <option value="http">HTTP</option>
+	  <option value="https">HTTPS</option>
+	  <option value="sock4">SOCK4</option>
+	  <option value="sock5">SOCK5</option>
+	  </select></div>
+	</div><br/>
+	<div class="form-group">
+	  <div class="col-sm-offset-3 col-sm-9"><input type="submit" name="submit" value="保存" class="btn btn-primary btn-block"/></div>
+	</div>
+  </form>
+</div>
+</div>
+</div>
+</div>
+{/block}
+{block name="script"}
+<script src="{$cdnpublic}layer/3.1.1/layer.js"></script>
+<script>
+var items = $("select[default]");
+for (i = 0; i < items.length; i++) {
+	$(items[i]).val($(items[i]).attr("default")||0);
+}
+$("select[name='mail_type']").change(function(){
+	if($(this).val() == 0){
+		$("#frame_set1").show();
+		$("#frame_set2").hide();
+	}else{
+		$("#frame_set1").hide();
+		$("#frame_set2").show();
+	}
+});
+$("select[name='mail_type']").change();
+function saveSetting(obj){
+	var ii = layer.load(2, {shade:[0.1,'#fff']});
+	$.ajax({
+		type : 'POST',
+		url : '',
+		data : $(obj).serialize(),
+		dataType : 'json',
+		success : function(data) {
+			layer.close(ii);
+			if(data.code == 0){
+				layer.alert('设置保存成功！', {
+					icon: 1,
+					closeBtn: false
+				}, function(){
+				  window.location.reload()
+				});
+			}else{
+				layer.alert(data.msg, {icon: 2})
+			}
+		},
+		error:function(data){
+            layer.close(ii);
+			layer.msg('服务器错误');
+		}
+	});
+	return false;
+}
+function mailtest(){
+	var ii = layer.load(2, {shade:[0.1,'#fff']});
+	$.ajax({
+		type : 'GET',
+		url : '/dmonitor/mailtest',
+		dataType : 'json',
+		success : function(data) {
+			layer.close(ii);
+			if(data.code == 0){
+				layer.alert(data.msg, {icon: 1});
+			}else{
+				layer.alert(data.msg, {icon: 2})
+			}
+		},
+		error:function(data){
+            layer.close(ii);
+			layer.msg('服务器错误');
+		}
+	});
+}
+function tgbottest(){
+	var ii = layer.load(2, {shade:[0.1,'#fff']});
+	$.ajax({
+		type : 'GET',
+		url : '/dmonitor/tgbottest',
+		dataType : 'json',
+		success : function(data) {
+			layer.close(ii);
+			if(data.code == 0){
+				layer.alert(data.msg, {icon: 1});
+			}else{
+				layer.alert(data.msg, {icon: 2})
+			}
+		},
+		error:function(data){
+            layer.close(ii);
+			layer.msg('服务器错误');
+		}
+	});
+}
+</script>
+{/block}
--- a/app/view/dmonitor/task.html
+++ b/app/view/dmonitor/task.html
@@ -33,8 +33,8 @@ tbody tr>td:nth-child(2){overflow: hidden;text-overflow: ellipsis;white-space: n
 {/block}
 {block name="script"}
 <script src="{$cdnpublic}layer/3.1.1/layer.js"></script>
-<script src="{$cdnpublic}bootstrap-table/1.20.2/bootstrap-table.min.js"></script>
-<script src="{$cdnpublic}bootstrap-table/1.20.2/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.21.4/bootstrap-table.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.21.4/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
 <script src="/static/js/custom.js"></script>
 <script>
 $(document).ready(function(){
--- a/app/view/dmonitor/taskform.html
+++ b/app/view/dmonitor/taskform.html
@@ -70,6 +70,17 @@
            <input type="text" name="checkurl" v-model="set.checkurl" placeholder="填写以http(s)://开头的完整地址，http状态码须为2xx/3xx" class="form-control" data-bv-uri="true" required>
        </div>
    </div>
+    <div class="form-group" v-show="set.type<=2&&set.checktype==2">
+        <label class="col-sm-3 control-label no-padding-right">使用代理请求</label>
+        <div class="col-sm-6">
+            <label class="radio-inline">
+                <input type="radio" name="proxy" value="0" v-model="set.proxy"> 否
+            </label>
+            <label class="radio-inline">
+                <input type="radio" name="proxy" value="1" v-model="set.proxy"> 是
+            </label>
+        </div>
+    </div>
    <div class="form-group" v-show="set.type<=2&&set.checktype>0">
        <label class="col-sm-3 control-label no-padding-right">最大超时时间</label>
        <div class="col-sm-3">
@@ -141,12 +152,14 @@ new Vue({
            frequency: 5,
            timeout: 2,
            cycle: 3,
+            proxy: 0,
        },
        recordList: [],
        typeList: [
            {value:0, label:'无操作'},
            {value:1, label:'暂停解析'},
            {value:2, label:'切换备用解析'},
+            {value:3, label:'条件开启解析'},
        ],
        checktypeList: [
            {value:0, label:'PING', disabled: support_ping=='0'},
--- a/app/view/dmonitor/taskinfo.html
+++ b/app/view/dmonitor/taskinfo.html
@@ -30,8 +30,8 @@ tbody tr>td:nth-child(4){overflow: hidden;text-overflow: ellipsis;white-space: n
 {/block}
 {block name="script"}
 <script src="{$cdnpublic}layer/3.1.1/layer.js"></script>
-<script src="{$cdnpublic}bootstrap-table/1.20.2/bootstrap-table.min.js"></script>
-<script src="{$cdnpublic}bootstrap-table/1.20.2/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.21.4/bootstrap-table.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.21.4/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
 <script src="/static/js/custom.js"></script>
 <script>
 var action_name = {$info.action_name|json_encode|raw};
--- a/app/view/domain/account.html
+++ b/app/view/domain/account.html
@@ -81,8 +81,8 @@
 {/block}
 {block name="script"}
 <script src="{$cdnpublic}layer/3.1.1/layer.js"></script>
-<script src="{$cdnpublic}bootstrap-table/1.20.2/bootstrap-table.min.js"></script>
-<script src="{$cdnpublic}bootstrap-table/1.20.2/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.21.4/bootstrap-table.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.21.4/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
 <script src="/static/js/custom.js"></script>
 <script>
 var dnsconfig = {$dnsconfig|json_encode|raw};
--- a/app/view/domain/domain.html
+++ b/app/view/domain/domain.html
@@ -118,8 +118,8 @@
 {/block}
 {block name="script"}
 <script src="{$cdnpublic}layer/3.1.1/layer.js"></script>
-<script src="{$cdnpublic}bootstrap-table/1.20.2/bootstrap-table.min.js"></script>
-<script src="{$cdnpublic}bootstrap-table/1.20.2/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.21.4/bootstrap-table.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.21.4/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
 <script src="{$cdnpublic}select2/4.0.13/js/select2.min.js"></script>
 <script src="{$cdnpublic}select2/4.0.13/js/i18n/zh-CN.min.js"></script>
 <script src="/static/js/custom.js"></script>
--- a/app/view/domain/log.html
+++ b/app/view/domain/log.html
@@ -16,8 +16,8 @@
 {/block}
 {block name="script"}
 <script src="{$cdnpublic}layer/3.1.1/layer.js"></script>
-<script src="{$cdnpublic}bootstrap-table/1.20.2/bootstrap-table.min.js"></script>
-<script src="{$cdnpublic}bootstrap-table/1.20.2/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.21.4/bootstrap-table.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.21.4/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
 <script src="/static/js/custom.js"></script>
 <script>
 $(document).ready(function(){
--- a/app/view/domain/record.html
+++ b/app/view/domain/record.html
@@ -222,8 +222,8 @@ td{overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width:360px;
 {/block}
 {block name="script"}
 <script src="{$cdnpublic}layer/3.1.1/layer.js"></script>
-<script src="{$cdnpublic}bootstrap-table/1.20.2/bootstrap-table.min.js"></script>
-<script src="{$cdnpublic}bootstrap-table/1.20.2/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.21.4/bootstrap-table.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.21.4/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
 <script src="/static/js/bootstrapValidator.min.js"></script>
 <script src="/static/js/custom.js?v=1002"></script>
 <script>
--- a/app/view/optimizeip/opiplist.html
+++ b/app/view/optimizeip/opiplist.html
@@ -33,8 +33,8 @@ tbody tr>td:nth-child(2){overflow: hidden;text-overflow: ellipsis;white-space: n
 {/block}
 {block name="script"}
 <script src="{$cdnpublic}layer/3.1.1/layer.js"></script>
-<script src="{$cdnpublic}bootstrap-table/1.20.2/bootstrap-table.min.js"></script>
-<script src="{$cdnpublic}bootstrap-table/1.20.2/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.21.4/bootstrap-table.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.21.4/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
 <script src="/static/js/custom.js"></script>
 <script>
 $(document).ready(function(){
--- a/app/view/user/log.html
+++ b/app/view/user/log.html
@@ -27,8 +27,8 @@
 {/block}
 {block name="script"}
 <script src="{$cdnpublic}layer/3.1.1/layer.js"></script>
-<script src="{$cdnpublic}bootstrap-table/1.20.2/bootstrap-table.min.js"></script>
-<script src="{$cdnpublic}bootstrap-table/1.20.2/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.21.4/bootstrap-table.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.21.4/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
 <script src="/static/js/custom.js"></script>
 <script>
 $(document).ready(function(){
--- a/app/view/user/user.html
+++ b/app/view/user/user.html
@@ -109,8 +109,8 @@
 {/block}
 {block name="script"}
 <script src="{$cdnpublic}layer/3.1.1/layer.js"></script>
-<script src="{$cdnpublic}bootstrap-table/1.20.2/bootstrap-table.min.js"></script>
-<script src="{$cdnpublic}bootstrap-table/1.20.2/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.21.4/bootstrap-table.min.js"></script>
+<script src="{$cdnpublic}bootstrap-table/1.21.4/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js"></script>
 <script src="{$cdnpublic}select2/4.0.13/js/select2.min.js"></script>
 <script src="{$cdnpublic}select2/4.0.13/js/i18n/zh-CN.min.js"></script>
 <script src="/static/js/custom.js"></script>
--- a/config/app.php
+++ b/config/app.php
@@ -31,7 +31,7 @@ return [
    'show_error_msg'   => true,
    'exception_tmpl'   => \think\facade\App::getAppPath() . 'view/exception.tpl',

-    'version' => '1009',
+    'version' => '1011',

-    'dbversion' => '1007'
+    'dbversion' => '1011'
 ];
--- a/route/app.php
+++ b/route/app.php
@@ -69,7 +69,9 @@ Route::group(function () {
    Route::any('/dmonitor/task/:action', 'dmonitor/taskform');
    Route::get('/dmonitor/task', 'dmonitor/task');
    Route::any('/dmonitor/noticeset', 'dmonitor/noticeset');
+    Route::any('/dmonitor/proxyset', 'dmonitor/proxyset');
    Route::get('/dmonitor/mailtest', 'dmonitor/mailtest');
+    Route::get('/dmonitor/tgbottest', 'dmonitor/tgbottest');
    Route::post('/dmonitor/clean', 'dmonitor/clean');

    Route::any('/optimizeip/opipset', 'optimizeip/opipset');
Author	SHA1	Message	Date
net909	57a237f898	1.6	2024-07-07 15:54:11 +08:00
net909	bf6a091c8d	version	2024-07-07 13:39:52 +08:00
net909	14700052b8	修复页面加载错误，支持dnspod国际版	2024-07-07 13:39:27 +08:00
net909	f43f2b196d	fix	2024-06-09 10:11:00 +08:00