diff --git a/README.md b/README.md
index 07be232..558fda3 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,17 @@
 # 哪吒面板
 
-![dashboard](https://img.shields.io/badge/管理面板-v0.4.1-brightgreen?style=for-the-badge&logo=github) ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/naiba/nezha/Dashboard%20image?label=%E9%9D%A2%E6%9D%BF%E6%9E%84%E5%BB%BA&logo=github&style=for-the-badge) ![Agent release](https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&label=Agent&style=for-the-badge&logo=github) ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/naiba/nezha/Agent%20release?label=Agent%20%E6%9E%84%E5%BB%BA&logo=github&style=for-the-badge)
+![dashboard](https://img.shields.io/badge/管理面板-v0.4.2-brightgreen?style=for-the-badge&logo=github) ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/naiba/nezha/Dashboard%20image?label=%E9%9D%A2%E6%9D%BF%E6%9E%84%E5%BB%BA&logo=github&style=for-the-badge) ![Agent release](https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&label=Agent&style=for-the-badge&logo=github) ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/naiba/nezha/Agent%20release?label=Agent%20%E6%9E%84%E5%BB%BA&logo=github&style=for-the-badge)
 
 系统状态监控报警、API(SSL证书变更、即将到期、到期)/TCP端口存活/PING 监控、计划任务(可以定时在Agent上执行命令，备份、重启、What ever you want)、极省资源，64M 服务器也能装 agent。
 
+\>> [查看针友列表](https://www.google.com/search?q=%22powered+by+%E5%93%AA%E5%90%92%E9%9D%A2%E6%9D%BF%22&filter=0) (Google)
+
+\>> QQ交流群：955957790
+
 |   默认主题   | DayNight [@JackieSung](https://github.com/JackieSung4ev) |  hotaru [@CokeMine](https://github.com/CokeMine)   |
 | ---- | ---- | ---- |
 |   ![首页截图1](https://s3.ax1x.com/2020/12/07/DvTCwD.jpg)   | <img src="https://s3.ax1x.com/2021/01/20/sfJv2q.jpg"/> | <img src="https://s3.ax1x.com/2020/12/09/rPF4xJ.png" width="1600px" /> |
 
-\>> [查看针友列表](https://www.google.com/search?q=%22powered+by+%E5%93%AA%E5%90%92%E9%9D%A2%E6%9D%BF%22&filter=0) (Google)
-
 ## 一键脚本
 
 建议使用 WatchTower 自动更新面板，Windows终端可以使用 nssm 配置自启动（见尾部教程）
diff --git a/cmd/agent/main.go b/cmd/agent/main.go
index 135533f..7480f05 100644
--- a/cmd/agent/main.go
+++ b/cmd/agent/main.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"crypto/tls"
 	"errors"
+	"flag"
 	"fmt"
 	"log"
 	"net"
@@ -17,7 +18,6 @@ import (
 	"github.com/genkiroid/cert"
 	"github.com/go-ping/ping"
 	"github.com/p14yground/go-github-selfupdate/selfupdate"
-	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
 
 	"github.com/naiba/nezha/model"
@@ -29,30 +29,17 @@ import (
 )
 
 var (
-	clientID     string
 	server       string
 	clientSecret string
-	debug        bool
 	version      string
-
-	rootCmd = &cobra.Command{
-		Use:   "nezha-agent",
-		Short: "「哪吒面板」监控、备份、站点管理一站式服务",
-		Long: `哪吒面板
-================================
-监控、备份、站点管理一站式服务
-啦啦啦，啦啦啦，我是 mjj 小行家`,
-		Run:     run,
-		Version: version,
-	}
 )
 
 var (
 	reporting      bool
 	client         pb.NezhaServiceClient
 	ctx            = context.Background()
-	delayWhenError = time.Second * 10
-	updateCh       = make(chan struct{}, 0)
+	delayWhenError = time.Second * 10       // Agent 重连间隔
+	updateCh       = make(chan struct{}, 0) // Agent 自动更新间隔
 	httpClient     = &http.Client{
 		Transport: &http.Transport{
 			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
@@ -91,22 +78,28 @@ func init() {
 func main() {
 	// 来自于 GoReleaser 的版本号
 	dao.Version = version
-	rootCmd.PersistentFlags().StringVarP(&server, "server", "s", "localhost:5555", "客户端ID")
-	rootCmd.PersistentFlags().StringVarP(&clientID, "id", "i", "", "客户端ID")
-	rootCmd.PersistentFlags().StringVarP(&clientSecret, "secret", "p", "", "客户端Secret")
-	rootCmd.PersistentFlags().BoolVarP(&debug, "debug", "d", false, "开启Debug")
-	if err := rootCmd.Execute(); err != nil {
-		fmt.Println(err)
-		os.Exit(1)
-	}
-}
 
-func run(cmd *cobra.Command, args []string) {
+	var debug bool
+	flag.String("i", "", "unused 旧Agent兼容")
+	flag.BoolVar(&debug, "d", false, "允许不安全连接")
+	flag.StringVar(&server, "s", "localhost:5555", "管理面板RPC端口")
+	flag.StringVar(&clientSecret, "p", "", "Agent连接Secret")
+	flag.Parse()
+
 	dao.Conf = &model.Config{
 		Debug: debug,
 	}
+
+	if server == "" || clientSecret == "" {
+		flag.Usage()
+		return
+	}
+
+	run()
+}
+
+func run() {
 	auth := rpc.AuthHandler{
-		ClientID:     clientID,
 		ClientSecret: clientSecret,
 	}
 
diff --git a/cmd/dashboard/controller/member_api.go b/cmd/dashboard/controller/member_api.go
index 40de3cd..f19ebc2 100644
--- a/cmd/dashboard/controller/member_api.go
+++ b/cmd/dashboard/controller/member_api.go
@@ -60,6 +60,7 @@ func (ma *memberAPI) delete(c *gin.Context) {
 		err = dao.DB.Delete(&model.Server{}, "id = ?", id).Error
 		if err == nil {
 			dao.ServerLock.Lock()
+			delete(dao.SecretToID, dao.ServerList[id].Secret)
 			delete(dao.ServerList, id)
 			dao.ServerLock.Unlock()
 			dao.ReSortServer()
@@ -154,7 +155,7 @@ func (ma *memberAPI) addOrEditServer(c *gin.Context) {
 		s.Note = sf.Note
 		if sf.ID == 0 {
 			s.Secret = utils.MD5(fmt.Sprintf("%s%s%d", time.Now(), sf.Name, admin.ID))
-			s.Secret = s.Secret[:10]
+			s.Secret = s.Secret[:18]
 			err = dao.DB.Create(&s).Error
 		} else {
 			isEdit = true
@@ -178,6 +179,7 @@ func (ma *memberAPI) addOrEditServer(c *gin.Context) {
 		s.Host = &model.Host{}
 		s.State = &model.HostState{}
 		dao.ServerLock.Lock()
+		dao.SecretToID[s.Secret] = s.ID
 		dao.ServerList[s.ID] = &s
 		dao.ServerLock.Unlock()
 	}
@@ -264,15 +266,16 @@ func (ma *memberAPI) addOrEditCron(c *gin.Context) {
 		return
 	}
 
-	dao.ServerLock.Lock()
-	defer dao.ServerLock.Unlock()
-
+	dao.CronLock.Lock()
+	defer dao.CronLock.Unlock()
 	crOld := dao.Crons[cr.ID]
 	if crOld != nil && crOld.CronID != 0 {
 		dao.Cron.Remove(crOld.CronID)
 	}
 
 	cr.CronID, err = dao.Cron.AddFunc(cr.Scheduler, func() {
+		dao.ServerLock.RLock()
+		defer dao.ServerLock.RUnlock()
 		for j := 0; j < len(cr.Servers); j++ {
 			if dao.ServerList[cr.Servers[j]].TaskStream != nil {
 				dao.ServerList[cr.Servers[j]].TaskStream.Send(&pb.Task{
diff --git a/cmd/dashboard/main.go b/cmd/dashboard/main.go
index e34ce1c..39a6a51 100644
--- a/cmd/dashboard/main.go
+++ b/cmd/dashboard/main.go
@@ -27,6 +27,7 @@ func init() {
 	dao.Cron = cron.New(cron.WithLocation(shanghai))
 	dao.Crons = make(map[uint64]*model.Cron)
 	dao.ServerList = make(map[uint64]*model.Server)
+	dao.SecretToID = make(map[string]uint64)
 
 	err = dao.Conf.Read("data/config.yaml")
 	if err != nil {
@@ -68,6 +69,7 @@ func loadServers() {
 		innerS.Host = &model.Host{}
 		innerS.State = &model.HostState{}
 		dao.ServerList[innerS.ID] = &innerS
+		dao.SecretToID[innerS.Secret] = innerS.ID
 	}
 	dao.ReSortServer()
 }
diff --git a/go.mod b/go.mod
index 51ea4d3..27fb8f9 100644
--- a/go.mod
+++ b/go.mod
@@ -18,7 +18,6 @@ require (
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/shirou/gopsutil/v3 v3.20.11
-	github.com/spf13/cobra v0.0.5
 	github.com/spf13/viper v1.7.1
 	github.com/stretchr/testify v1.6.1
 	golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43
diff --git a/go.sum b/go.sum
index d222909..19cfe08 100644
--- a/go.sum
+++ b/go.sum
@@ -43,7 +43,6 @@ github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrU
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
-github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
@@ -60,14 +59,10 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
-github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
-github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
-github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -203,8 +198,6 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf h1:WfD7VjIE6z8dIvMsI4/s+1qr5EL+zoIGev1BQj1eoJ8=
 github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf/go.mod h1:hyb9oH7vZsitZCiBt0ZvifOrB+qc8PS5IiilCIb87rg=
-github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
-github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.1 h1:g39TucaRWyV3dwDO++eEc6qf8TVIQ/Da48WmqjZ3i7E=
@@ -229,7 +222,6 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
@@ -242,7 +234,6 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
@@ -289,7 +280,6 @@ github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/shirou/gopsutil/v3 v3.20.11 h1:NeVf1K0cgxsWz+N3671ojRptdgzvp7BXL3KV21R0JnA=
@@ -305,13 +295,10 @@ github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
-github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
 github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
 github.com/spf13/viper v1.7.1 h1:pM5oEahlgWv/WnHXpgbKz7iLIxRf65tye2Ci+XFK5sk=
 github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -329,13 +316,11 @@ github.com/tcnksm/go-gitconfig v0.1.2/go.mod h1:/8EhP4H7oJZdIPyT+/UIsG87kTzrzM4U
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
-github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/ulikunitz/xz v0.5.9 h1:RsKRIA2MO8x56wkkcd3LbtcE/uMszhb6DpRf+3uwa3I=
 github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
-github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -350,7 +335,6 @@ go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -447,7 +431,6 @@ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
diff --git a/model/server.go b/model/server.go
index ff7709f..f759d96 100644
--- a/model/server.go
+++ b/model/server.go
@@ -12,7 +12,7 @@ type Server struct {
 	Common
 	Name         string
 	Tag          string // 分组名
-	Secret       string `json:"-"`
+	Secret       string `gorm:"uniqueIndex" json:"-"`
 	Note         string `json:"-"` // 管理员可见备注
 	DisplayIndex int    // 展示排序，越大越靠前
 
diff --git a/resource/template/component/cron.html b/resource/template/component/cron.html
index fe8a1a0..527d93d 100644
--- a/resource/template/component/cron.html
+++ b/resource/template/component/cron.html
@@ -17,7 +17,7 @@
                 <textarea name="Command"></textarea>
             </div>
             <div class="field">
-                <label>执行服务器ID列表</label>
+                <label>执行服务器列表</label>
                 <div class="ui fluid multiple servers search selection dropdown">
                     <input type="hidden" name="ServersRaw">
                     <i class="dropdown icon"></i>
diff --git a/resource/template/dashboard/server.html b/resource/template/dashboard/server.html
index b794b22..8e0fc2d 100644
--- a/resource/template/dashboard/server.html
+++ b/resource/template/dashboard/server.html
@@ -13,11 +13,10 @@
         <table class="ui very basic table">
             <thead>
                 <tr>
-                    <th>排序</th>
+                    <th>ID(排序)</th>
                     <th>名称</th>
                     <th>分组</th>
                     <th>IP</th>
-                    <th>ID</th>
                     <th>密钥</th>
                     <th>备注</th>
                     <th>管理</th>
@@ -26,11 +25,10 @@
             <tbody>
                 {{range $server := .Servers}}
                 <tr>
-                    <td>{{$server.DisplayIndex}}</td>
+                    <td>{{$server.ID}}({{$server.DisplayIndex}})</td>
                     <td>{{$server.Name}}</td>
                     <td>{{$server.Tag}}</td>
                     <td>{{$server.Host.IP}}</td>
-                    <td>{{$server.ID}}</td>
                     <td>{{$server.Secret}}</td>
                     <td style="word-break: break-word;">{{$server.Note}}</td>
                     <td>
diff --git a/script/install.sh b/script/install.sh
index 714e86b..fb60708 100755
--- a/script/install.sh
+++ b/script/install.sh
@@ -200,12 +200,11 @@ modify_agent_config() {
         return 0
     fi
 
-    echo "请先在管理面板上添加服务器，获取到ID和密钥" &&
+    echo "请先在管理面板上添加Agent，记录下密钥" &&
         read -p "请输入一个解析到面板所在IP的域名（不可套CDN）: " nz_rpc_host &&
         read -p "请输入面板RPC端口: (5555)" nz_rpc_port &&
-        read -p "请输入Agent ID: " nezha_client_id &&
         read -p "请输入Agent 密钥: " nezha_client_secret
-    if [[ -z "${nz_rpc_host}" || -z "${nezha_client_id}" || -z "${nezha_client_secret}" ]]; then
+    if [[ -z "${nz_rpc_host}" || -z "${nezha_client_secret}" ]]; then
         echo -e "${red}所有选项都不能为空${plain}"
         before_show_menu
         return 1
@@ -217,7 +216,6 @@ modify_agent_config() {
 
     sed -i "s/nz_rpc_host/${nz_rpc_host}/" ${NZ_AGENT_SERVICE}
     sed -i "s/nz_rpc_port/${nz_rpc_port}/" ${NZ_AGENT_SERVICE}
-    sed -i "s/nezha_client_id/${nezha_client_id}/" ${NZ_AGENT_SERVICE}
     sed -i "s/nezha_client_secret/${nezha_client_secret}/" ${NZ_AGENT_SERVICE}
 
     echo -e "Agent配置 ${green}修改成功，请稍等重启生效${plain}"
diff --git a/script/nezha-agent.service b/script/nezha-agent.service
index 5b3577c..2fcb9c5 100644
--- a/script/nezha-agent.service
+++ b/script/nezha-agent.service
@@ -15,7 +15,7 @@ Type=simple
 User=root
 Group=root
 WorkingDirectory=/opt/nezha/agent/
-ExecStart=/opt/nezha/agent/nezha-agent -d -s nz_rpc_host:nz_rpc_port -i nezha_client_id -p nezha_client_secret
+ExecStart=/opt/nezha/agent/nezha-agent -s nz_rpc_host:nz_rpc_port -p nezha_client_secret
 Restart=always
 #Environment=DEBUG=true
 
diff --git a/service/dao/dao.go b/service/dao/dao.go
index fe9127b..43043d8 100644
--- a/service/dao/dao.go
+++ b/service/dao/dao.go
@@ -13,7 +13,7 @@ import (
 	pb "github.com/naiba/nezha/proto"
 )
 
-var Version = "v0.4.1" // ！！记得修改 README 重的 badge 版本！！
+var Version = "v0.4.2" // ！！记得修改 README 重的 badge 版本！！
 
 const (
 	SnapshotDelay = 3
@@ -26,6 +26,7 @@ var (
 	DB    *gorm.DB
 
 	ServerList map[uint64]*model.Server
+	SecretToID map[string]uint64
 	ServerLock sync.RWMutex
 
 	SortedServerList []*model.Server
diff --git a/service/rpc/auth.go b/service/rpc/auth.go
index 148ce2f..5d3485f 100644
--- a/service/rpc/auth.go
+++ b/service/rpc/auth.go
@@ -2,7 +2,6 @@ package rpc
 
 import (
 	"context"
-	"strconv"
 
 	"github.com/naiba/nezha/service/dao"
 	"google.golang.org/grpc/codes"
@@ -11,36 +10,34 @@ import (
 )
 
 type AuthHandler struct {
-	ClientID     string
 	ClientSecret string
 }
 
 func (a *AuthHandler) GetRequestMetadata(ctx context.Context, uri ...string) (map[string]string, error) {
-	return map[string]string{"client_id": a.ClientID, "client_secret": a.ClientSecret}, nil
+	return map[string]string{"client_secret": a.ClientSecret}, nil
 }
 
 func (a *AuthHandler) RequireTransportSecurity() bool {
 	return !dao.Conf.Debug
 }
 
-func (a *AuthHandler) Check(ctx context.Context) (clientID uint64, err error) {
+func (a *AuthHandler) Check(ctx context.Context) (uint64, error) {
 	md, ok := metadata.FromIncomingContext(ctx)
 	if !ok {
-		err = status.Errorf(codes.Unauthenticated, "获取 metaData 失败")
-		return
+		return 0, status.Errorf(codes.Unauthenticated, "获取 metaData 失败")
 	}
+
 	var clientSecret string
-	if value, ok := md["client_id"]; ok {
-		clientID, _ = strconv.ParseUint(value[0], 10, 64)
-	}
 	if value, ok := md["client_secret"]; ok {
 		clientSecret = value[0]
 	}
 
 	dao.ServerLock.RLock()
 	defer dao.ServerLock.RUnlock()
-	if server, has := dao.ServerList[clientID]; !has || server.Secret != clientSecret {
-		err = status.Errorf(codes.Unauthenticated, "客户端认证失败")
+	clientID, hasID := dao.SecretToID[clientSecret]
+	_, hasServer := dao.ServerList[clientID]
+	if !hasID || !hasServer {
+		return 0, status.Errorf(codes.Unauthenticated, "客户端认证失败")
 	}
-	return
+	return clientID, nil
 }