version

fix
2026-05-09 15:06:28 +02:00 · 2024-08-05 17:10:43 +08:00 · 2024-07-25 22:37:41 +08:00 · 2024-07-25 20:39:21 +08:00 · 2024-07-07 15:54:11 +08:00 · 2024-07-07 13:39:52 +08:00
46 changed files with 1081 additions and 120 deletions
--- a/.example.env
+++ b/.example.env
@@ -2,7 +2,6 @@ APP_DEBUG = false

 [APP]
 DEFAULT_TIMEZONE = Asia/Shanghai
-SYS_KEY = {syskey}

 [DATABASE]
 TYPE = mysql
--- a/README.md
+++ b/README.md
@@ -83,6 +83,20 @@ location / {
 </IfModule>
 ```

+### Docker部署方法
+
+首先需要安装Docker，然后执行以下命令拉取镜像并启动（启动后监听8081端口）：
+
+```
+docker run --name dnsmgr -dit -p 8081:80 -v /var/dnsmgr:/app/www netcccyun/dnsmgr
+```
+
+访问并安装好后如果容灾切换未自动启动，重启容器即可：
+
+```
+docker restart dnsmgr
+```
+
 ### 版权信息

 版权所有Copyright © 2023~2024 by 消失的彩虹海(https://blog.cccyun.cn)
--- 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/common.php
+++ b/app/common.php
@@ -232,7 +232,8 @@ function getMillisecond()
 }

 function getDnsType($value){
-	if(filter_var($value, FILTER_VALIDATE_IP))return 'A';
+	if(filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4))return 'A';
+	else if(filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))return 'AAAA';
 	else return 'CNAME';
 }

--- a/app/controller/Auth.php
+++ b/app/controller/Auth.php
@@ -47,7 +47,7 @@ class Auth extends BaseController
                DB::name('user')->where('id', $user['id'])->update(['lasttime' => date("Y-m-d H:i:s")]);
                $session = md5($user['id'].$user['password']);
                $expiretime = time()+2562000;
-                $token = authcode("user\t{$user['id']}\t{$session}\t{$expiretime}", 'ENCODE', env('app.sys_key'));
+                $token = authcode("user\t{$user['id']}\t{$session}\t{$expiretime}", 'ENCODE', config_get('sys_key'));
                cookie('user_token', $token, ['expire' => $expiretime, 'httponly' => true]);
                if (file_exists($login_limit_file)) {
                    unlink($login_limit_file);
@@ -93,7 +93,7 @@ class Auth extends BaseController
        if($timestamp < time()-300 || $timestamp > time()+300){
            return $this->alert('error', '时间戳无效');
        }
-        if(md5(env('app.sys_key').$domain.$timestamp.$token.env('app.sys_key')) !== $sign){
+        if(md5(config_get('sys_key').$domain.$timestamp.$token.config_get('sys_key')) !== $sign){
            return $this->alert('error', '签名错误');
        }
        if($token != cache('quicklogin_'.$domain)){
@@ -111,7 +111,7 @@ class Auth extends BaseController

        $session = md5($row['id'].$row['name']);
        $expiretime = time()+2562000;
-        $token = authcode("domain\t{$row['id']}\t{$session}\t{$expiretime}", 'ENCODE', env('app.sys_key'));
+        $token = authcode("domain\t{$row['id']}\t{$session}\t{$expiretime}", 'ENCODE', config_get('sys_key'));
        cookie('user_token', $token, ['expire' => $expiretime, 'httponly' => true]);
        return redirect('/record/'.$row['id']);
    }
--- 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
 {
@@ -155,7 +156,7 @@ class Domain extends BaseController

        $select = Db::name('domain')->alias('A')->join('account B','A.aid = B.id');
        if(!empty($kw)){
-            $select->whereLike('name', '%'.$kw.'%');
+            $select->whereLike('name|A.remark', '%'.$kw.'%');
        }
        if(!empty($type)){
            $select->whereLike('B.type', $type);
@@ -164,7 +165,7 @@ class Domain extends BaseController
            $select->where('is_hide', 0)->where('A.name', 'in', request()->user['permission']);
        }
        $total = $select->count();
-        $rows = $select->fieldRaw('A.*,B.type,B.remark')->order('A.id','desc')->limit($offset, $limit)->select();
+        $rows = $select->fieldRaw('A.*,B.type,B.remark aremark')->order('A.id','desc')->limit($offset, $limit)->select();

        $list = [];
        foreach($rows as $row){
@@ -210,9 +211,11 @@ class Domain extends BaseController
            if(!$row) return json(['code'=>-1, 'msg'=>'域名不存在']);
            $is_hide = input('post.is_hide/d');
            $is_sso = input('post.is_sso/d');
+            $remark = input('post.remark', null, 'trim');
            Db::name('domain')->where('id', $id)->update([
                'is_hide' => $is_hide,
                'is_sso' => $is_sso,
+                'remark' => $remark,
            ]);
            return json(['code'=>0, 'msg'=>'修改域名配置成功！']);
        }elseif($act == 'del'){
@@ -251,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){
@@ -289,7 +292,7 @@ class Domain extends BaseController
            $token = getSid();
            cache('quicklogin_'.$drow['name'], $token, 3600);
            $timestamp = time();
-            $sign = md5(env('app.sys_key').$drow['name'].$timestamp.$token.env('app.sys_key'));
+            $sign = md5(config_get('sys_key').$drow['name'].$timestamp.$token.config_get('sys_key'));
            $drow['loginurl'] = request()->root(true).'/quicklogin?domain='.$drow['name'].'&timestamp='.$timestamp.'&token='.$token.'&sign='.$sign;
        }

@@ -327,6 +330,7 @@ class Domain extends BaseController
        $id = input('param.id/d');
        $keyword = input('post.keyword', null, 'trim');
        $subdomain = input('post.subdomain', null, 'trim');
+        $value = input('post.value', null, 'trim');
        $type = input('post.type', null, 'trim');
        $line = input('post.line', null, 'trim');
        $status = input('post.status', null, 'trim');
@@ -345,10 +349,10 @@ class Domain extends BaseController
        if(!checkPermission(0, $drow['name'])) return json(['total'=>0, 'rows'=>[]]);

        $dns = DnsHelper::getModel($drow['aid'], $drow['name'], $drow['thirdid']);
-        $domainRecords = $dns->getDomainRecords($page, $limit, $keyword, $subdomain, $type, $line, $status);
+        $domainRecords = $dns->getDomainRecords($page, $limit, $keyword, $subdomain, $value, $type, $line, $status);
        if(!$domainRecords) return json(['total'=>0, 'rows'=>[]]);

-        if($domainRecords['total'] != $drow['recordcount']){
+        if(empty($keyword) && empty($subdomain) && empty($type) && empty($line) && empty($status) && empty($value) && $domainRecords['total'] != $drow['recordcount']){
            Db::name('domain')->where('id', $id)->update(['recordcount'=>$domainRecords['total']]);
        }

@@ -534,6 +538,7 @@ class Domain extends BaseController
        }

        $success = 0;
+        $fail = 0;
        $dns = DnsHelper::getModel($drow['aid'], $drow['name'], $drow['thirdid']);
        if($action == 'open'){
            foreach($recordids as $recordid){
@@ -559,10 +564,136 @@ class Domain extends BaseController
                }
            }
            $msg = '成功删除'.$success.'条解析记录';
+        }else if($action == 'remark'){
+            $remark = input('post.remark', null, 'trim');
+            if(empty($remark)) $remark = null;
+            foreach($recordids as $recordid){
+                if($dns->updateDomainRecordRemark($recordid, $remark)){
+                    $success++;
+                }else{
+                    $fail++;
+                }
+            }
+            $msg = '批量修改备注，成功'.$success.'条，失败'.$fail.'条';
        }
        return json(['code'=>0, 'msg'=>$msg]);
    }

+    public function record_batch_edit(){
+        $id = input('param.id/d');
+        $drow = Db::name('domain')->where('id', $id)->find();
+        if(!$drow){
+            return json(['code'=>-1, 'msg'=>'域名不存在']);
+        }
+        if(!checkPermission(0, $drow['name'])) return $this->alert('error', '无权限');
+
+        $action = input('post.action', null, 'trim');
+        $recordinfo = input('post.recordinfo', null, 'trim');
+        $recordinfo = json_decode($recordinfo, true);
+
+        if($action == 'value'){
+            $type = input('post.type', null, 'trim');
+            $value = input('post.value', null, 'trim');
+    
+            if(empty($recordinfo) || empty($type) || empty($value)){
+                return json(['code'=>-1, 'msg'=>'参数不能为空']);
+            }
+    
+            $dns = DnsHelper::getModel($drow['aid'], $drow['name'], $drow['thirdid']);
+    
+            $success = 0; $fail = 0;
+            foreach($recordinfo as $record){
+                $recordid = $dns->updateDomainRecord($record['recordid'], $record['name'], $type, $value, $record['line'], $record['ttl'], $record['mx'], $record['remark']);
+                if($recordid){
+                    $this->add_log($drow['name'], '修改解析', $type.'记录 '.$record['name'].' '.$value.' (线路:'.$record['line'].' TTL:'.$record['ttl'].')');
+                    $success++;
+                }else{
+                    $fail++;
+                }
+            }
+            return json(['code'=>0, 'msg'=>'批量修改解析记录，成功'.$success.'条，失败'.$fail.'条']);
+
+        }else if($action == 'line'){
+            $line = input('post.line', null, 'trim');
+
+            if(empty($recordinfo) || empty($line)){
+                return json(['code'=>-1, 'msg'=>'参数不能为空']);
+            }
+
+            $dns = DnsHelper::getModel($drow['aid'], $drow['name'], $drow['thirdid']);
+    
+            $success = 0; $fail = 0;
+            foreach($recordinfo as $record){
+                $recordid = $dns->updateDomainRecord($record['recordid'], $record['name'], $record['type'], $record['value'], $line, $record['ttl'], $record['mx'], $record['remark']);
+                if($recordid){
+                    $this->add_log($drow['name'], '修改解析', $record['type'].'记录 '.$record['name'].' '.$record['value'].' (线路:'.$line.' TTL:'.$record['ttl'].')');
+                    $success++;
+                }else{
+                    $fail++;
+                }
+            }
+            return json(['code'=>0, 'msg'=>'批量修改解析线路，成功'.$success.'条，失败'.$fail.'条']);
+        }
+    }
+
+    public function record_batch_add(){
+        $id = input('param.id/d');
+        $drow = Db::name('domain')->where('id', $id)->find();
+        if(!$drow){
+            return $this->alert('error', '域名不存在');
+        }
+        $dnstype = Db::name('account')->where('id', $drow['aid'])->value('type');
+        if(!checkPermission(0, $drow['name'])) return $this->alert('error', '无权限');
+
+        if(request()->isAjax()){
+            $record = input('post.record', null, 'trim');
+            $type = input('post.type', null, 'trim');
+            $line = input('post.line', null, 'trim');
+            $ttl = input('post.ttl/d', 600);
+            $mx = input('post.mx/d', 1);
+            $recordlist = explode("\n", $record);
+
+            if(empty($record) || empty($recordlist)){
+                return json(['code'=>-1, 'msg'=>'参数不能为空']);
+            }
+            
+            $dns = DnsHelper::getModel($drow['aid'], $drow['name'], $drow['thirdid']);
+
+            $success = 0; $fail = 0;
+            foreach($recordlist as $record){
+                $record = trim($record);
+                $arr = explode(' ', $record);
+                if(empty($record) || empty($arr[0]) || empty($arr[1])) continue;
+                $thistype = empty($type) ? getDnsType($arr[1]) : $type;
+                $recordid = $dns->addDomainRecord($arr[0], $thistype, $arr[1], $line, $ttl, $mx);
+                if($recordid){
+                    $this->add_log($drow['name'], '添加解析', $thistype.'记录 '.$arr[0].' '.$arr[1].' (线路:'.$line.' TTL:'.$ttl.')');
+                    $success++;
+                }else{
+                    $fail++;
+                }
+            }
+            return json(['code'=>0, 'msg'=>'批量添加解析，成功'.$success.'条，失败'.$fail.'条']);
+        }
+
+        list($recordLine, $minTTL) = $this->get_line_and_ttl($drow);
+
+        $recordLineArr = [];
+        foreach($recordLine as $key=>$item){
+            $recordLineArr[] = ['id'=>strval($key), 'name'=>$item['name'], 'parent'=>$item['parent']];
+        }
+
+        $dnsconfig = DnsHelper::$dns_config[$dnstype];
+        $dnsconfig['type'] = $dnstype;
+
+        View::assign('domainId', $id);
+        View::assign('domainName', $drow['name']);
+        View::assign('recordLine', $recordLineArr);
+        View::assign('minTTL', $minTTL?$minTTL:1);
+        View::assign('dnsconfig', $dnsconfig);
+        return view('batchadd');
+    }
+
    public function record_log(){
        $id = input('param.id/d');
        $drow = Db::name('domain')->where('id', $id)->find();
--- a/app/controller/Index.php
+++ b/app/controller/Index.php
@@ -61,7 +61,11 @@ class Index extends BaseController
            $value=trim($value);
            if(empty($value))continue;
            $value = str_replace('dnsmgr_',$mysql_prefix,$value);
-            Db::execute($value);
+            try{
+                Db::execute($value);
+            }catch(Exception $e){
+                
+            }
        }
    }

--- a/app/controller/Install.php
+++ b/app/controller/Install.php
@@ -29,7 +29,7 @@ class Install extends BaseController
            }

            $configdata = file_get_contents(app()->getRootPath().'.example.env');
-            $configdata = str_replace(['{syskey}','{dbhost}','{dbname}','{dbuser}','{dbpwd}','{dbport}','{dbprefix}'], [random(16), $mysql_host, $mysql_name, $mysql_user, $mysql_pwd, $mysql_port, $mysql_prefix], $configdata);
+            $configdata = str_replace(['{dbhost}','{dbname}','{dbuser}','{dbpwd}','{dbport}','{dbprefix}'], [$mysql_host, $mysql_name, $mysql_user, $mysql_pwd, $mysql_port, $mysql_prefix], $configdata);

            try{
                $DB=new PDO("mysql:host=".$mysql_host.";dbname=".$mysql_name.";port=".$mysql_port,$mysql_user,$mysql_pwd);
@@ -53,6 +53,7 @@ class Install extends BaseController
            $sqls=explode(';', $sqls);

            $password = password_hash($admin_password, PASSWORD_DEFAULT);
+            $sqls[]="REPLACE INTO `".$mysql_prefix."config` VALUES ('sys_key', '".random(16)."')";
            $sqls[]="INSERT INTO `".$mysql_prefix."user` (`username`,`password`,`level`,`regtime`,`lasttime`,`status`) VALUES ('".addslashes($admin_username)."', '$password', 2, NOW(), NOW(), 1)";

            $success=0;$error=0;$errorMsg=null;
--- a/app/controller/Optimizeip.php
+++ b/app/controller/Optimizeip.php
@@ -69,7 +69,7 @@ class Optimizeip extends BaseController
                    'recordnum' => input('post.recordnum/d'),
                    'ttl' => input('post.ttl/d'),
                    'remark' => input('post.remark', null, 'trim'),
-                    'addtime' => time(),
+                    'addtime' => date('Y-m-d H:i:s'),
                    'active' => 1
                ];
    
--- 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/DnsInterface.php
+++ b/app/lib/DnsInterface.php
@@ -10,7 +10,7 @@ interface DnsInterface

    function getDomainList($KeyWord=null, $PageNumber=1, $PageSize=20);

-    function getDomainRecords($PageNumber=1, $PageSize=20, $KeyWord = null, $SubDomain = null, $Type = null, $Line = null, $Status = null);
+    function getDomainRecords($PageNumber=1, $PageSize=20, $KeyWord = null, $SubDomain = null, $Value = null, $Type = null, $Line = null, $Status = null);

    function getSubDomainRecords($SubDomain, $PageNumber=1, $PageSize=20, $Type = null, $Line = null);

--- 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/aliyun.php
+++ b/app/lib/dns/aliyun.php
@@ -49,10 +49,10 @@ class aliyun implements DnsInterface {
 	}

 	//获取解析记录列表
-	public function getDomainRecords($PageNumber=1, $PageSize=20, $KeyWord = null, $SubDomain = null, $Type = null, $Line = null, $Status = null){
+	public function getDomainRecords($PageNumber=1, $PageSize=20, $KeyWord = null, $SubDomain = null, $Value = null, $Type = null, $Line = null, $Status = null){
 		$param = ['Action' => 'DescribeDomainRecords', 'DomainName' => $this->domain, 'PageNumber' => $PageNumber, 'PageSize' => $PageSize];
-		if(!empty($SubDomain) || !empty($Type) || !empty($Line)){
-			$param += ['SearchMode' => 'ADVANCED', 'RRKeyWord' => $SubDomain, 'ValueKeyWord' => $KeyWord, 'Type' => $Type, 'Line' => $Line, 'ValueKeyWord' => $KeyWord];
+		if(!empty($SubDomain) || !empty($Type) || !empty($Line) || !empty($Value)){
+			$param += ['SearchMode' => 'ADVANCED', 'RRKeyWord' => $SubDomain, 'ValueKeyWord' => $Value, 'Type' => $Type, 'Line' => $Line];
 		}elseif(!empty($KeyWord)){
 			$param += ['KeyWord' => $KeyWord];
 		}
--- a/app/lib/dns/baidu.php
+++ b/app/lib/dns/baidu.php
@@ -48,7 +48,7 @@ class baidu implements DnsInterface {
 	}

 	//获取解析记录列表
-	public function getDomainRecords($PageNumber=1, $PageSize=20, $KeyWord = null, $SubDomain = null, $Type = null, $Line = null, $Status = null){
+	public function getDomainRecords($PageNumber=1, $PageSize=20, $KeyWord = null, $SubDomain = null, $Value = null, $Type = null, $Line = null, $Status = null){
 		$marker = cookie('baidu_record_marker');
 		$query = ['rr' => $KeyWord];
 		if(!isNullOrEmpty(($SubDomain))){
@@ -81,7 +81,7 @@ class baidu implements DnsInterface {
 	//获取子域名解析记录列表
 	public function getSubDomainRecords($SubDomain, $PageNumber=1, $PageSize=20, $Type = null, $Line = null){
 		if($SubDomain == '')$SubDomain='@';
-		return $this->getDomainRecords($PageNumber, $PageSize, null, $SubDomain, $Type, $Line);
+		return $this->getDomainRecords($PageNumber, $PageSize, null, $SubDomain, null, $Type, $Line);
 	}

 	//获取解析记录详细信息
--- a/app/lib/dns/cloudflare.php
+++ b/app/lib/dns/cloudflare.php
@@ -48,7 +48,12 @@ class cloudflare implements DnsInterface {
 	}

 	//获取解析记录列表
-	public function getDomainRecords($PageNumber=1, $PageSize=20, $KeyWord = null, $SubDomain = null, $Type = null, $Line = null, $Status = null){
+	public function getDomainRecords($PageNumber=1, $PageSize=20, $KeyWord = null, $SubDomain = null, $Value = null, $Type = null, $Line = null, $Status = null){
+		if(!isNullOrEmpty($SubDomain)){
+			if($SubDomain == '@')$SubDomain=$this->domain;
+			else $SubDomain .= '.'.$this->domain;
+		}
+		if(!isNullOrEmpty($Value)) $KeyWord = $Value;
 		$param = ['name' => $SubDomain, 'type' => $Type, 'search' => $KeyWord, 'page' => $PageNumber, 'per_page' => $PageSize];
 		if(!isNullOrEmpty($Line)){
 			$param['proxied'] = $Line == '1' ? 'true' : 'false';
@@ -67,7 +72,7 @@ class cloudflare implements DnsInterface {
 					'Line' => $row['proxied'] ? '1' : '0',
 					'TTL' => $row['ttl'],
 					'MX' => isset($row['priority']) ? $row['priority'] : null,
-					'Status' => $row['locked'] ? '0' : '1',
+					'Status' => '1',
 					'Weight' => null,
 					'Remark' => $row['comment'],
 					'UpdateTime' => $row['modified_on'],
@@ -80,9 +85,7 @@ class cloudflare implements DnsInterface {

 	//获取子域名解析记录列表
 	public function getSubDomainRecords($SubDomain, $PageNumber=1, $PageSize=20, $Type = null, $Line = null){
-		if($SubDomain == '@')$SubDomain=$this->domain;
-		else $SubDomain .= '.'.$this->domain;
-		return $this->getDomainRecords($PageNumber, $PageSize, null, $SubDomain, $Type, $Line);
+		return $this->getDomainRecords($PageNumber, $PageSize, null, $SubDomain, null, $Type, $Line);
 	}

 	//获取解析记录详细信息
@@ -99,7 +102,7 @@ class cloudflare implements DnsInterface {
 				'Line' => $data['result']['proxied'] ? '1' : '0',
 				'TTL' => $data['result']['ttl'],
 				'MX' => isset($data['result']['priority']) ? $data['result']['priority'] : null,
-				'Status' => $data['result']['locked'] ? '0' : '1',
+				'Status' => '1',
 				'Weight' => null,
 				'Remark' => $data['result']['comment'],
 				'UpdateTime' => $data['result']['modified_on'],
@@ -175,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/dnsla.php
+++ b/app/lib/dns/dnsla.php
@@ -49,7 +49,7 @@ class dnsla implements DnsInterface {
 	}

 	//获取解析记录列表
-	public function getDomainRecords($PageNumber=1, $PageSize=20, $KeyWord = null, $SubDomain = null, $Type = null, $Line = null, $Status = null){
+	public function getDomainRecords($PageNumber=1, $PageSize=20, $KeyWord = null, $SubDomain = null, $Value = null, $Type = null, $Line = null, $Status = null){
 		$param = ['domainId' => $this->domainid, 'pageIndex' => $PageNumber, 'pageSize' => $PageSize];
 		if(!isNullOrEmpty(($KeyWord))){
 			$param['host'] = $KeyWord;
@@ -63,6 +63,9 @@ class dnsla implements DnsInterface {
 		if(!isNullOrEmpty(($SubDomain))){
 			$param['host'] = $SubDomain;
 		}
+		if(!isNullOrEmpty(($Value))){
+			$param['data'] = $Value;
+		}
 		$data = $this->execute('GET', '/api/recordList', $param);
 		if($data){
 			$list = [];
@@ -90,7 +93,7 @@ class dnsla implements DnsInterface {
 	//获取子域名解析记录列表
 	public function getSubDomainRecords($SubDomain, $PageNumber=1, $PageSize=20, $Type = null, $Line = null){
 		if($SubDomain == '')$SubDomain='@';
-		return $this->getDomainRecords($PageNumber, $PageSize, null, $SubDomain, $Type, $Line);
+		return $this->getDomainRecords($PageNumber, $PageSize, null, $SubDomain, null, $Type, $Line);
 	}

 	//获取解析记录详细信息
--- 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;
@@ -51,12 +52,18 @@ class dnspod implements DnsInterface {
 	}

 	//获取解析记录列表
-	public function getDomainRecords($PageNumber=1, $PageSize=20, $KeyWord = null, $SubDomain = null, $Type = null, $Line = null, $Status = null){
+	public function getDomainRecords($PageNumber=1, $PageSize=20, $KeyWord = null, $SubDomain = null, $Value = null, $Type = null, $Line = null, $Status = null){
 		$offset = ($PageNumber-1)*$PageSize;
-		if(!isNullOrEmpty($Status)){
+		if(!isNullOrEmpty($Status) || !isNullOrEmpty($Value)){
 			$action = 'DescribeRecordFilterList';
-			$Status = $Status == '1' ? 'ENABLE' : 'DISABLE';
-			$param = ['Domain' => $this->domain, 'Subdomain' => $SubDomain, 'Keyword' => $KeyWord, 'Offset' => $offset, 'Limit' => $PageSize, 'RecordStatus' => [$Status]];
+			$param = ['Domain' => $this->domain, 'Offset' => $offset, 'Limit' => $PageSize, 'RecordValue' => $Value];
+			if(!isNullOrEmpty($SubDomain)) $param['SubDomain'] = $SubDomain;
+			if(!isNullOrEmpty($KeyWord)) $param['Keyword'] = $KeyWord;
+			if(!isNullOrEmpty($Value)) $param['RecordValue'] = $Value;
+			if(!isNullOrEmpty($Status)){
+				$Status = $Status == '1' ? 'ENABLE' : 'DISABLE';
+				$param['RecordStatus'] = [$Status];
+			}
 			if(!isNullOrEmpty($Type)) $param['RecordType'] = [$this->convertType($Type)];
 			if(!isNullOrEmpty($Line)) $param['RecordLine'] = [$Line];
 		}else{
@@ -93,7 +100,7 @@ class dnspod implements DnsInterface {
 	//获取子域名解析记录列表
 	public function getSubDomainRecords($SubDomain, $PageNumber=1, $PageSize=20, $Type = null, $Line = null){
 		if($SubDomain == '')$SubDomain='@';
-		return $this->getDomainRecords($PageNumber, $PageSize, null, $SubDomain, $Type, $Line);
+		return $this->getDomainRecords($PageNumber, $PageSize, null, $SubDomain, null, $Type, $Line);
 	}

 	//获取解析记录详细信息
@@ -188,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;
 	}
@@ -205,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;
 	}
@@ -227,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/lib/dns/huawei.php
+++ b/app/lib/dns/huawei.php
@@ -49,10 +49,15 @@ class huawei implements DnsInterface {
 	}

 	//获取解析记录列表
-	public function getDomainRecords($PageNumber=1, $PageSize=20, $KeyWord = null, $SubDomain = null, $Type = null, $Line = null, $Status = null){
+	public function getDomainRecords($PageNumber=1, $PageSize=20, $KeyWord = null, $SubDomain = null, $Value = null, $Type = null, $Line = null, $Status = null){
 		$offset = ($PageNumber-1)*$PageSize;
-		$query = ['type' => $Type, 'line_id' => $Line, 'name' => $KeyWord, 'status' => $Status, 'offset' => $offset, 'limit' => $PageSize];
-		if(!isNullOrEmpty(($SubDomain))){
+		$query = ['type' => $Type, 'line_id' => $Line, 'name' => $KeyWord, 'offset' => $offset, 'limit' => $PageSize];
+		if(!isNullOrEmpty($Status)){
+			$Status = $Status == '1' ? 'ACTIVE' : 'DISABLE';
+			$query['status'] = $Status;
+		}
+		if(!isNullOrEmpty($SubDomain)){
+			$SubDomain = $this->getHost($SubDomain);
 			$query['name'] = $SubDomain;
 			$query['search_mode'] = 'equal';
 		}
@@ -83,8 +88,7 @@ class huawei implements DnsInterface {

 	//获取子域名解析记录列表
 	public function getSubDomainRecords($SubDomain, $PageNumber=1, $PageSize=20, $Type = null, $Line = null){
-		$SubDomain = $this->getHost($SubDomain);
-		return $this->getDomainRecords($PageNumber, $PageSize, null, $SubDomain, $Type, $Line);
+		return $this->getDomainRecords($PageNumber, $PageSize, null, $SubDomain, null, $Type, $Line);
 	}

 	//获取解析记录详细信息
@@ -113,6 +117,7 @@ class huawei implements DnsInterface {
 	//添加解析记录
 	public function addDomainRecord($Name, $Type, $Value, $Line = '0', $TTL = 600, $MX = 1, $Remark = null){
 		$Name = $this->getHost($Name);
+		if($Type == 'TXT' && substr($Value, 0, 1) != '"') $Value = '"'.$Value.'"';
 		$records = explode(',', $Value);
 		$params = ['name' => $Name, 'type' => $this->convertType($Type), 'records' => $records, 'line'=>$Line, 'ttl' => intval($TTL), 'description' => $Remark];
 		if($Type == 'MX')$param['weight'] = intval($MX);
@@ -123,6 +128,7 @@ class huawei implements DnsInterface {
 	//修改解析记录
 	public function updateDomainRecord($RecordId, $Name, $Type, $Value, $Line = '0', $TTL = 600, $MX = 1, $Remark = null){
 		$Name = $this->getHost($Name);
+		if($Type == 'TXT' && substr($Value, 0, 1) != '"') $Value = '"'.$Value.'"';
 		$records = explode(',', $Value);
 		$params = ['name' => $Name, 'type' => $this->convertType($Type), 'records' => $records, 'line'=>$Line, 'ttl' => intval($TTL), 'description' => $Remark];
 		if($Type == 'MX')$param['weight'] = intval($MX);
--- a/app/lib/dns/west.php
+++ b/app/lib/dns/west.php
@@ -50,8 +50,8 @@ class west implements DnsInterface {
 	}

 	//获取解析记录列表
-	public function getDomainRecords($PageNumber=1, $PageSize=20, $KeyWord = null, $SubDomain = null, $Type = null, $Line = null, $Status = null){
-		$param = ['act' => 'getdnsrecord', 'domain' => $this->domain, 'type' => $Type, 'line' => $Line, 'host' => $KeyWord, 'pageno' => $PageNumber, 'limit' => $PageSize];
+	public function getDomainRecords($PageNumber=1, $PageSize=20, $KeyWord = null, $SubDomain = null, $Value = null, $Type = null, $Line = null, $Status = null){
+		$param = ['act' => 'getdnsrecord', 'domain' => $this->domain, 'type' => $Type, 'line' => $Line, 'host' => $KeyWord, 'value' => $Value, 'pageno' => $PageNumber, 'limit' => $PageSize];
 		if(!isNullOrEmpty(($SubDomain))){
 			$param['host'] = $SubDomain;
 		}
@@ -82,7 +82,7 @@ class west implements DnsInterface {
 	//获取子域名解析记录列表
 	public function getSubDomainRecords($SubDomain, $PageNumber=1, $PageSize=20, $Type = null, $Line = null){
 		if($SubDomain == '')$SubDomain='@';
-		return $this->getDomainRecords($PageNumber, $PageSize, null, $SubDomain, $Type, $Line);
+		return $this->getDomainRecords($PageNumber, $PageSize, null, $SubDomain, null, $Type, $Line);
 	}

 	//获取解析记录详细信息
--- a/app/middleware/AuthUser.php
+++ b/app/middleware/AuthUser.php
@@ -12,8 +12,8 @@ class AuthUser
        $islogin = false;
        $cookie = cookie('user_token');
        $user = null;
-        if($cookie){
-            $token=authcode($cookie, 'DECODE', env('app.sys_key'));
+        if($cookie && config_get('sys_key')){
+            $token=authcode($cookie, 'DECODE', config_get('sys_key'));
            if($token){
                list($type, $uid, $sid, $expiretime) = explode("\t", $token);
                if($type == 'user'){
--- a/app/middleware/LoadConfig.php
+++ b/app/middleware/LoadConfig.php
@@ -6,6 +6,7 @@ namespace app\middleware;
 use Exception;
 use think\facade\Db;
 use think\facade\Config;
+use think\facade\Cache;

 class LoadConfig
 {
@@ -31,6 +32,11 @@ class LoadConfig
        
        try{
            $res = Db::name('config')->cache('configs',0)->column('value','key');
+            if(empty($res['sys_key']) && !empty(env('app.sys_key'))){
+                config_set('sys_key', env('app.sys_key'));
+                Cache::delete('configs');
+                $res['sys_key'] = env('app.sys_key');
+            }
            Config::set($res, 'sys');
        }catch(Exception $e){
            if(!strpos($e->getMessage(), 'doesn\'t exist')){
--- 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', '1005');
+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');
@@ -33,6 +33,7 @@ CREATE TABLE `dnsmgr_domain` (
  `is_hide` tinyint(1) NOT NULL DEFAULT '0',
  `is_sso` tinyint(1) NOT NULL DEFAULT '0',
  `recordcount` int(1) NOT NULL DEFAULT '0',
+  `remark` varchar(100) DEFAULT NULL,
  PRIMARY KEY (`id`),
  KEY `name` (`name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
@@ -91,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
@@ -59,4 +59,10 @@ CREATE TABLE IF NOT EXISTS `dnsmgr_optimizeip` (
  `errmsg` varchar(100) DEFAULT NULL,
  PRIMARY KEY (`id`),
  KEY `did` (`did`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+ALTER TABLE `dnsmgr_domain`
+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
@@ -103,11 +103,11 @@
          {if request()->user['type'] eq 'user'}<li class="{:checkIfActive('index')}">
            <a href="/"><i class="fa fa-home fa-fw"></i> <span>后台首页</span></a>
          </li>{/if}
-          <li class="{:checkIfActive('domain,record,record_log')}">
+          <li class="{:checkIfActive('domain,record,record_log,record_batch_add')}">
            <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,6 +152,7 @@ new Vue({
            frequency: 5,
            timeout: 2,
            cycle: 3,
+            proxy: 0,
        },
        recordList: [],
        typeList: [
--- 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/batchadd.html
+++ b/app/view/domain/batchadd.html
@@ -0,0 +1,139 @@
+{extend name="common/layout" /}
+{block name="title"}批量添加解析 - {$domainName}{/block}
+{block name="main"}
+<div class="row" id="app">
+<div class="col-xs-12 center-block" style="float: none;">
+<div class="panel panel-default">
+<div class="panel-heading"><h3 class="panel-title"><a href="/record/{$domainId}" class="btn btn-sm btn-default pull-right" style="margin-top:-6px"><i class="fa fa-reply fa-fw"></i> 返回</a>批量添加解析 - {$domainName}</h3></div>
+<div class="panel-body">
+  <form onsubmit="return false" method="post" class="form-horizontal" role="form" id="form-store">
+    <div class="form-group">
+        <label class="col-sm-3 col-xs-12 control-label no-padding-right">主机记录&记录值</label>
+        <div class="col-sm-6">
+            <textarea name="record" placeholder="主机记录和记录值用空格隔开，一行一个" class="form-control" rows="8" required></textarea>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="col-sm-3 control-label no-padding-right">记录类型</label>
+        <div class="col-sm-6">
+            <select name="type" class="form-control">
+                <option value="">A / CNAME / AAAA 自动识别</option>
+                <option value="A">A</option>
+                <option value="CNAME">CNAME</option>
+                <option value="AAAA">AAAA</option>
+                <option value="NS">NS</option>
+                <option value="MX">MX</option>
+                <option value="SRV">SRV</option>
+                <option value="TXT">TXT</option>
+                <option value="CAA">CAA</option>
+                {if $dnsconfig.redirect}<option value="REDIRECT_URL">显性URL</option>
+                <option value="FORWARD_URL">隐性URL</option>{/if}
+            </select>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="col-sm-3 control-label no-padding-right">线路类型</label>
+        <div class="col-sm-6" id="line_list">
+        </div>
+    </div>
+    <div class="form-group" style="display:none" id="mx_type">
+        <label class="col-sm-3 control-label no-padding-right">MX优先级</label>
+        <div class="col-sm-6">
+            <input type="text" class="form-control" name="mx" value="10">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="col-sm-3 control-label no-padding-right">TTL</label>
+        <div class="col-sm-6">
+            <input type="text" class="form-control" name="ttl" value="600" placeholder="指解析结果在DNS服务器中的缓存时间" required min="{$minTTL}">
+        </div>
+    </div>
+    <div class="form-group">
+        <div class="col-sm-offset-3 col-sm-6"><button type="button" class="btn btn-primary" onclick="save()">保存</button></div>
+    </div>
+  </form>
+</div>
+</div>
+{/block}
+{block name="script"}
+<script src="{$cdnpublic}layer/3.1.1/layer.js"></script>
+<script src="/static/js/bootstrapValidator.min.js"></script>
+<script>
+var recordLine = {$recordLine|json_encode|raw};
+var dnsconfig = {$dnsconfig|json_encode|raw};
+var defaultLine = recordLine[0].id;
+$(document).ready(function(){
+    $("select[name=type]").change(function(){
+		if($(this).val() == 'MX'){
+			$("#mx_type").show();
+		}else{
+			$("#mx_type").hide();
+		}
+	});
+
+    $("#form-store").bootstrapValidator();
+    initLine();
+});
+
+function initLine(option, elem){
+	option = option || '';
+	elem = elem || 'line_list';
+	$("#"+elem).empty();
+	$.each(recordLine, function(index, item){
+		if(item.parent == null){
+			option += '<option value="'+item.id+'">'+item.name+'</option>';
+		}
+	})
+	$("#"+elem).append('<select name="line" class="form-control" onchange="changeLine(this, \''+elem+'\')">'+option+'</select>');
+}
+function changeLine(obj, elem){
+	var line = $(obj).val();
+	var flag = false;
+	$("#"+elem).children().each(function(index, elem){
+		if(flag) $(elem).remove()
+		if(obj == elem){
+			flag = true;
+		}
+	})
+	if($(obj).find("option:selected").text() == '子集线路（非必填）') return;
+	var tempLine = recordLine.filter((x) => x.parent == line)
+	if(tempLine.length > 0){
+		var option = '<option value="'+line+'">子集线路（非必填）</option>';
+		$.each(tempLine, function(index, item){
+			option += '<option value="'+item.id+'">'+item.name+'</option>';
+		})
+		$("#"+elem).append('<select name="line" class="form-control" onchange="changeLine(this, \''+elem+'\')">'+option+'</select>');
+	}
+}
+function save(){
+	$("#form-store").data("bootstrapValidator").validate();
+	if(!$("#form-store").data("bootstrapValidator").isValid()){
+		return;
+	}
+	var act = $("#form-store input[name=action]").val();
+	var ii = layer.load(2);
+	$.ajax({
+		type : 'POST',
+		url : '/record/batchadd/{$domainId}',
+		data : $("#form-store").serialize(),
+		dataType : 'json',
+		success : function(data) {
+			layer.close(ii);
+			if(data.code == 0){
+				layer.alert(data.msg,{
+					icon: 1,
+					closeBtn: false
+				}, function(){
+					if(document.referrer.indexOf('/record?') > 0)
+                        window.location.href = document.referrer;
+                    else
+                        window.location.href = '/record/{$domainId}';
+				});
+			}else{
+				layer.alert(data.msg, {icon: 2})
+			}
+		}
+	});
+}
+</script>
+{/block}
--- a/app/view/domain/domain.html
+++ b/app/view/domain/domain.html
@@ -74,6 +74,12 @@
 							</div>
 						</div>
 					</div>
+					<div class="form-group">
+						<label class="col-sm-3 control-label no-padding-right">备注</label>
+						<div class="col-sm-9">
+							<input type="text" class="form-control" name="remark" placeholder="">
+						</div>
+					</div>
 				</form>
 			</div>
 			<div class="modal-footer">
@@ -91,7 +97,7 @@
 <form onsubmit="return searchSubmit()" method="GET" class="form-inline" id="searchToolbar">
  <div class="form-group">
 	<label>搜索</label>
-    <input type="text" class="form-control" name="kw" placeholder="域名">
+    <input type="text" class="form-control" name="kw" placeholder="域名或备注">
  </div>
  <div class="form-group">
 	<select name="type" class="form-control"><option value="">所有平台</option>{foreach $types as $k=>$v}
@@ -112,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>
@@ -139,7 +145,7 @@ $(document).ready(function(){
 				field: 'typename',
 				title: '平台账户',
 				formatter: function(value, row, index) {
-					return '<span title="'+row.remark+'" data-toggle="tooltip" data-placement="right" title="Tooltip on right"><img src="/static/images/'+row.type+'.ico" class="type-logo"></img>'+value+'('+row.aid+')</span>';
+					return '<span title="'+row.aremark+'" data-toggle="tooltip" data-placement="right" title="Tooltip on right"><img src="/static/images/'+row.type+'.ico" class="type-logo"></img>'+value+'('+row.aid+')</span>';
 				}
 			},
            {
@@ -157,6 +163,10 @@ $(document).ready(function(){
 				field: 'addtime',
 				title: '添加时间'
 			},
+			{
+				field: 'remark',
+				title: '备注'
+			},
 			{
 				field: 'is_hide',
 				title: '是否隐藏',
@@ -256,6 +266,7 @@ function editframe(id){
 				$("#form-store2 input[name=id]").val(data.data.id);
 				$("#form-store2 select[name=is_hide]").val(data.data.is_hide);
 				$("#form-store2 select[name=is_sso]").val(data.data.is_sso);
+				$("#form-store2 input[name=remark]").val(data.data.remark);
 			}else{
 				layer.alert(data.msg, {icon: 2})
 			}
--- 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
@@ -78,6 +78,78 @@ td{overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width:360px;
 		</div>
 	</div>
 </div>
+<div class="modal" id="modal-store2" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static">
+	<div class="modal-dialog">
+		<div class="modal-content animated flipInX">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal"><span
+							aria-hidden="true">&times;</span><span
+							class="sr-only">Close</span></button>
+				<h4 class="modal-title" id="modal-title">批量修改解析记录</h4>
+			</div>
+			<div class="modal-body">
+				<form class="form-horizontal" id="form-store2">
+					<input type="hidden" name="action" value="value"/>
+					<input type="hidden" name="recordinfo"/>
+					<div class="form-group">
+						<label class="col-sm-3 control-label">记录类型</label>
+						<div class="col-sm-9">
+							<select name="type" class="form-control">
+								<option value="A">A</option>
+								<option value="CNAME">CNAME</option>
+								<option value="AAAA">AAAA</option>
+								<option value="NS">NS</option>
+								<option value="MX">MX</option>
+								<option value="SRV">SRV</option>
+								<option value="TXT">TXT</option>
+								<option value="CAA">CAA</option>
+								{if $dnsconfig.redirect}<option value="REDIRECT_URL">显性URL</option>
+								<option value="FORWARD_URL">隐性URL</option>{/if}
+							</select>
+						</div>
+					</div>
+					<div class="form-group">
+						<label class="col-sm-3 control-label no-padding-right">记录值</label>
+						<div class="col-sm-9">
+							<input type="text" class="form-control" name="value" placeholder="输入记录值" required>
+						</div>
+					</div>
+				</form>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-white" data-dismiss="modal">关闭</button>
+				<button type="button" class="btn btn-primary" id="store" onclick="batch_save()">保存</button>
+			</div>
+		</div>
+	</div>
+</div>
+<div class="modal" id="modal-store3" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static">
+	<div class="modal-dialog">
+		<div class="modal-content animated flipInX">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal"><span
+							aria-hidden="true">&times;</span><span
+							class="sr-only">Close</span></button>
+				<h4 class="modal-title" id="modal-title">批量修改解析线路</h4>
+			</div>
+			<div class="modal-body">
+				<form class="form-horizontal" id="form-store3">
+					<input type="hidden" name="action" value="line"/>
+					<input type="hidden" name="recordinfo"/>
+					<div class="form-group">
+						<label class="col-sm-3 control-label">线路类型</label>
+						<div class="col-sm-9" id="line_list3">
+						</div>
+					</div>
+				</form>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-white" data-dismiss="modal">关闭</button>
+				<button type="button" class="btn btn-primary" id="store" onclick="batch_save_line()">保存</button>
+			</div>
+		</div>
+	</div>
+</div>
 <div class="row">
 	<div class="col-xs-12 center-block" style="float: none;">
 	<div class="panel panel-default panel-default">
@@ -87,6 +159,7 @@ td{overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width:360px;
 	<div class="panel-body">
 	
 <form onsubmit="return searchSubmit()" method="GET" class="form-inline" id="searchToolbar">
+<div id="searchbox1">
  <div class="form-group">
 	<label>搜索</label>
    <input type="text" class="form-control" name="keyword" placeholder="输入关键字">
@@ -99,12 +172,45 @@ td{overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width:360px;
  <a href="javascript:addframe()" class="btn btn-success"><i class="fa fa-plus"></i> 添加记录</a>
  <div class="btn-group" role="group">
 	<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">批量操作 <span class="caret"></span></button>
-	<ul class="dropdown-menu"><li><a href="javascript:operation('open')">启用</a></li><li><a href="javascript:operation('pause')">暂停</a></li><li><a href="javascript:operation('delete')">删除</a></li></ul>
+	<ul class="dropdown-menu"><li><a href="/record/batchadd/{$domainId}">添加</a></li><li><a href="javascript:operation('open')">启用</a></li><li><a href="javascript:operation('pause')">暂停</a></li><li><a href="javascript:operation('edit')">修改记录</a></li><li><a href="javascript:operation('editline')">修改线路</a></li>{if $dnsconfig.remark == 1}<li><a href="javascript:operation('editremark')">修改备注</a></li>{/if}<li><a href="javascript:operation('delete')">删除</a></li></ul>
  </div>
  <div class="btn-group" role="group">
 	<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">日志 <span class="caret"></span></button>
 	<ul class="dropdown-menu"><li><a href="/log?domain={$domainName}">本站日志</a></li>{if $dnsconfig.log}<li><a href="/record/log/{$domainId}">域名日志</a></li>{/if}</ul>
  </div>
+  <a href="javascript:advanceSearch()" class="btn"><i class="fa fa-angle-down"></i> 高级搜索</a>
+</div>
+<div id="searchbox2" style="display:none">
+  <div class="form-group">
+	<select name="type" class="form-control"><option value="">全部类型</option>
+		<option value="A">A</option>
+		<option value="CNAME">CNAME</option>
+		<option value="AAAA">AAAA</option>
+		<option value="NS">NS</option>
+		<option value="MX">MX</option>
+		<option value="SRV">SRV</option>
+		<option value="TXT">TXT</option>
+		<option value="CAA">CAA</option>
+		{if $dnsconfig.redirect}<option value="REDIRECT_URL">显性URL</option>
+		<option value="FORWARD_URL">隐性URL</option>{/if}
+	</select>
+  </div>
+  <div class="form-group">
+    <input type="text" class="form-control" name="subdomain" placeholder="输入主机记录">
+  </div>
+  <div class="form-group">
+	<select name="line" class="form-control"><option value="">全部线路</option></select>
+  </div>
+  <div class="form-group">
+    <input type="text" class="form-control" name="value" placeholder="输入记录值">
+  </div>
+  <div class="form-group">
+	<select name="status" class="form-control"><option value="">所有状态</option><option value="1">启用</option><option value="0">暂停</option></select>
+  </div>
+  <button type="submit" class="btn btn-primary"><i class="fa fa-search"></i> 搜索</button>
+  <a href="javascript:searchClear()" class="btn btn-default" title="刷新解析记录列表"><i class="fa fa-refresh"></i> 刷新</a>
+  <a href="javascript:advanceSearch()" class="btn"><i class="fa fa-angle-up"></i> 收起</a>
+</div>
 </form>

      <table id="listTable">
@@ -116,17 +222,17 @@ 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"></script>
+<script src="/static/js/custom.js?v=1002"></script>
 <script>
 var recordLine = {$recordLine|json_encode|raw};
 var dnsconfig = {$dnsconfig|json_encode|raw};
 var defaultLine = recordLine[0].id;
 $(document).ready(function(){
 	updateToolbar();
-	const defaultPageSize = 15;
+	let defaultPageSize = getCookie('record_pagesize') ? getCookie('record_pagesize') : 15;
 	const pageNumber = typeof window.$_GET['pageNumber'] != 'undefined' ? parseInt(window.$_GET['pageNumber']) : 1;
 	const pageSize = typeof window.$_GET['pageSize'] != 'undefined' ? parseInt(window.$_GET['pageSize']) : defaultPageSize;

@@ -218,6 +324,12 @@ $(document).ready(function(){
 				}
 			},
 		],
+		onPageChange: function(number, size){
+			if(size != defaultPageSize){
+				defaultPageSize = size;
+				setCookie('record_pagesize', size);
+			}
+		},
 	});

 	$("select[name=type]").change(function(){
@@ -229,21 +341,29 @@ $(document).ready(function(){
 	});

 	$("#form-store").bootstrapValidator();
+	$("#form-store2").bootstrapValidator();
+
+	$.each(recordLine, function(index, item){
+		if(item.parent == null){
+			$("#searchToolbar select[name='line']").append('<option value="'+item.id+'">'+item.name+'</option>');
+		}
+	})
 })
-function initLine(option){
+function initLine(option, elem){
 	option = option || '';
-	$("#line_list").empty();
+	elem = elem || 'line_list';
+	$("#"+elem).empty();
 	$.each(recordLine, function(index, item){
 		if(item.parent == null){
 			option += '<option value="'+item.id+'">'+item.name+'</option>';
 		}
 	})
-	$("#line_list").append('<select name="line" class="form-control" onchange="changeLine(this)">'+option+'</select>');
+	$("#"+elem).append('<select name="line" class="form-control" onchange="changeLine(this, \''+elem+'\')">'+option+'</select>');
 }
-function changeLine(obj){
+function changeLine(obj, elem){
 	var line = $(obj).val();
 	var flag = false;
-	$("#line_list").children().each(function(index, elem){
+	$("#"+elem).children().each(function(index, elem){
 		if(flag) $(elem).remove()
 		if(obj == elem){
 			flag = true;
@@ -256,7 +376,7 @@ function changeLine(obj){
 		$.each(tempLine, function(index, item){
 			option += '<option value="'+item.id+'">'+item.name+'</option>';
 		})
-		$("#line_list").append('<select name="line" class="form-control" onchange="changeLine(this)">'+option+'</select>');
+		$("#"+elem).append('<select name="line" class="form-control" onchange="changeLine(this, \''+elem+'\')">'+option+'</select>');
 	}
 }
 function addframe(){
@@ -409,6 +529,29 @@ function operation(action){
 		layer.msg('请选择要操作的记录');
 		return;
 	}
+	if(action == 'edit'){
+		var records = [];
+		$.each(rows, function(index, item){
+			records.push({recordid:item.RecordId, name:item.Name, line:item.Line, mx:item.MX, ttl:item.TTL, remark:item.Remark});
+		})
+		batch_edit(records)
+		return;
+	}else if(action == 'editline'){
+		var records = [];
+		$.each(rows, function(index, item){
+			records.push({recordid:item.RecordId, name:item.Name, type:item.Type, value:item.Value, mx:item.MX, ttl:item.TTL, remark:item.Remark});
+		})
+		batch_edit_line(records)
+		return;
+	}else if(action == 'editremark'){
+		var ids = [];
+		$.each(rows, function(index, item){
+			ids.push(item.RecordId);
+		})
+		batch_edit_remark(ids)
+		return;
+	}
+
 	var ids = [];
 	$.each(rows, function(index, item){
 		ids.push(item.RecordId);
@@ -437,5 +580,124 @@ function operation(action){
 	  layer.close(confirmobj);
 	});
 }
+function batch_edit(records){
+	var row = $("#listTable").bootstrapTable('getSelections')[0];
+	$("#batch_num").text(records.length);
+	$("#modal-store2").modal('show');
+	$("#form-store2 input[name=recordinfo]").val(JSON.stringify(records));
+	$("#form-store2 input[name=recordid]").val(row.RecordId);
+	$("#form-store2 input[name=name]").val(row.Name);
+	$("#form-store2 select[name=type]").val(row.Type);
+	$("select[name=type]").change();
+	$("#form-store2 input[name=value]").val(row.Value);
+	$("#form-store2").data("bootstrapValidator").resetForm();
+}
+function batch_save(){
+	$("#form-store2").data("bootstrapValidator").validate();
+	if(!$("#form-store2").data("bootstrapValidator").isValid()){
+		return;
+	}
+	var ii = layer.load(2);
+	$.ajax({
+		type : 'POST',
+		url : '/record/batchedit/{$domainId}',
+		data : $("#form-store2").serialize(),
+		dataType : 'json',
+		success : function(data) {
+			layer.close(ii);
+			if(data.code == 0){
+				layer.alert(data.msg,{
+					icon: 1,
+					closeBtn: false
+				}, function(){
+					layer.closeAll();
+					$("#modal-store2").modal('hide');
+					searchSubmit();
+				});
+			}else{
+				layer.alert(data.msg, {icon: 2})
+			}
+		}
+	});
+}
+function batch_edit_line(records){
+	$("#batch_num").text(records.length);
+	$("#modal-store3").modal('show');
+	$("#form-store3 input[name=recordinfo]").val(JSON.stringify(records));
+	initLine('', 'line_list3');
+}
+function batch_save_line(){
+	var ii = layer.load(2);
+	$.ajax({
+		type : 'POST',
+		url : '/record/batchedit/{$domainId}',
+		data : $("#form-store3").serialize(),
+		dataType : 'json',
+		success : function(data) {
+			layer.close(ii);
+			if(data.code == 0){
+				layer.alert(data.msg,{
+					icon: 1,
+					closeBtn: false
+				}, function(){
+					layer.closeAll();
+					$("#modal-store3").modal('hide');
+					searchSubmit();
+				});
+			}else{
+				layer.alert(data.msg, {icon: 2})
+			}
+		}
+	});
+}
+function batch_edit_remark(recordids) {
+	layer.open({
+		type: 1,
+		area: ['350px'],
+		closeBtn: 2,
+		title: '批量修改备注',
+		content: '<div style="padding:15px"><div class="form-group"><input class="form-control" type="text" name="remark" value="" autocomplete="off" placeholder="备注信息"></div></div>',
+		btn: ['确认', '取消'],
+		yes: function(){
+			var remark = $("input[name='remark']").val();
+			var ii = layer.load(2, {shade:[0.1,'#fff']});
+			$.ajax({
+				type : 'POST',
+				url : '/record/batch/{$domainId}',
+				data : {action:'remark', recordids:recordids, remark:remark},
+				dataType : 'json',
+				success : function(data) {
+					layer.close(ii);
+					layer.alert(data.msg,{
+						icon: 1,
+						closeBtn: false
+					}, function(){
+						layer.closeAll();
+						searchSubmit();
+					});
+				},
+				error:function(data){
+					layer.close(ii);
+					layer.msg('服务器错误');
+				}
+			});
+		}
+	});
+}
+function advanceSearch(){
+	$('#searchToolbar').find('input[name]').each(function() {
+		$(this).val('');
+	});
+	$('#searchToolbar').find('select[name]').each(function() {
+		$(this).find('option:first').prop("selected", 'selected');
+	});
+	if($("#searchbox1").is(":visible")){
+		$("#searchbox1").slideUp();
+		$("#searchbox2").slideDown();
+	}else{
+		$("#searchbox2").slideUp();
+		$("#searchbox1").slideDown();
+	}
+}
 </script>
 {/block}
--- a/app/view/index/error.html
+++ b/app/view/index/error.html
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <meta id="viewport" name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <title>抱歉，出错了</title>
-    <link href="//res.wx.qq.com/open/libs/weui/0.4.3/weui.css" rel="stylesheet">
-    <style>.page{position:absolute;top:0;right:0;bottom:0;left:0;overflow-y:auto;-webkit-overflow-scrolling:touch;box-sizing:border-box}</style>
-</head>
-<body>
-    <div class="weui_msg">
-        <div class="weui_icon_area"><i class="weui_icon_info weui_icon_msg"></i></div>
-        <div class="weui_text_area">
-            <h4 class="weui_msg_title">{$errmsg}</h4>
-        </div>
-    </div>
-<script>
-document.body.addEventListener('touchmove', function (event) {
-	event.preventDefault();
-},{ passive: false });
-</script>
-</body>
-</html>
--- 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(){
@@ -155,7 +155,7 @@ function setActive(id, active){
 	}, 'json');
 }
 function delItem(id){
-	layer.confirm('确定要删除此切换策略吗？', {
+	layer.confirm('确定要删除此任务吗？', {
 		btn: ['确定','取消']
 	}, function(){
 		$.post('/optimizeip/opipform/del', {id: id}, function(data){
--- 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' => '1005',
+    'version' => '1012',

-    'dbversion' => '1005'
+    'dbversion' => '1011'
 ];
--- a/public/static/js/custom.js
+++ b/public/static/js/custom.js
@@ -15,7 +15,7 @@ if (parameter_str !== undefined) {
 }

 function searchSubmit(){
-	$('#listTable').bootstrapTable('refresh');
+	$('#listTable').bootstrapTable('selectPage', 1);
 	return false;
 }
 function searchClear(){
@@ -25,7 +25,7 @@ function searchClear(){
 	$('#searchToolbar').find('select[name]').each(function() {
 		$(this).find('option:first').prop("selected", 'selected');
 	});
-	$('#listTable').bootstrapTable('refresh');
+	$('#listTable').bootstrapTable('selectPage', 1);
 }
 function updateToolbar(){
    $('#searchToolbar').find(':input[name]').each(function() {
@@ -67,6 +67,7 @@ if (typeof $.fn.bootstrapTable !== "undefined") {
 		queryParamsType: '',
 		queryParams: function(params) {
 			$('#searchToolbar').find(':input[name]').each(function() {
+				if(!$(this).is(":visible")) return;
 				params[$(this).attr('name')] = $(this).val()
 			})
 			updateQueryStr(params);
@@ -130,4 +131,32 @@ var isMobile = function(){
 		return true;
 	}
 	return false;
+}
+
+function setCookie(name,value,expire = null)
+{
+	var cookie = name + "=" + escape(value);
+	if(expire){
+		var exp = new Date();
+		exp.setTime(exp.getTime() + expire*1000);
+		cookie += ";expires=" + exp.toGMTString();
+	}
+	document.cookie = cookie;
+}
+function getCookie(name)
+{
+	var arr,reg=new RegExp("(^| )"+name+"=([^;]*)(;|$)");
+	if(arr=document.cookie.match(reg))
+		return unescape(arr[2]);
+	else
+		return null;
+}
+function delCookie(name)
+{
+    var exp = new Date();
+    exp.setTime(exp.getTime() - 1);
+    var cval=getCookie(name);
+    if(cval!=null){
+      document.cookie= name + "="+cval+";expires="+exp.toGMTString();
+    }
 }
--- a/route/app.php
+++ b/route/app.php
@@ -56,6 +56,8 @@ Route::group(function () {
    Route::post('/record/status/:id', 'domain/record_status');
    Route::post('/record/remark/:id', 'domain/record_remark');
    Route::post('/record/batch/:id', 'domain/record_batch');
+    Route::post('/record/batchedit/:id', 'domain/record_batch_edit');
+    Route::any('/record/batchadd/:id', 'domain/record_batch_add');
    Route::any('/record/log/:id', 'domain/record_log');
    Route::post('/record/list', 'domain/record_list');
    Route::get('/record/:id', 'domain/record');
@@ -67,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	8bdf58651c	version	2024-08-05 17:10:43 +08:00
net909	350a0bd306	fix	2024-07-25 22:37:41 +08:00
net909	ab074da839	fix	2024-07-25 20:39:21 +08:00
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
net909	949b52722a	readme	2024-06-08 12:19:20 +08:00
net909	1c504f3b04	解析支持高级搜索	2024-06-07 18:25:31 +08:00
net909	8e4fd32f8c	fix	2024-05-24 15:11:28 +08:00
net909	5cd6b108f0	修改syskey存储	2024-05-23 16:26:40 +08:00
net909	424d2c8132	sql	2024-05-22 11:25:07 +08:00
net909	86bffab357	1.4	2024-05-22 11:24:13 +08:00
net909	c1edf905f3	优化解析记录分页	2024-05-22 11:17:34 +08:00
net909	b252816711	支持批量添加修改解析	2024-05-17 18:35:56 +08:00
net909	7a58292fb9	批量修改与添加	2024-05-10 19:43:52 +08:00
net909	d4b7bcfbf6	fix	2024-05-01 17:57:34 +08:00