From 50bc864fdd29c04d836f041d4d707ee1fa314821 Mon Sep 17 00:00:00 2001 From: bjdgyc Date: Wed, 26 Apr 2023 21:14:40 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.sh b/build.sh index e8d2ce3..8abf20e 100644 --- a/build.sh +++ b/build.sh @@ -12,6 +12,9 @@ function RETVAL() { #当前目录 cpath=$(pwd) +ver=`cat server/base/app_ver.go | grep APP_VER | awk '{print $3}' | sed 's/"//g'` +echo "当前版本 $ver" + echo "编译前端项目" cd $cpath/web #国内可替换源加快速度 From fd5ec7f86a7f1cb0cd719d9c959c6e46a8053afb Mon Sep 17 00:00:00 2001 From: wsczx Date: Tue, 2 May 2023 00:38:17 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=85=BE=E8=AE=AF?= =?UTF-8?q?=E4=BA=91=E5=9B=A0DNS=E8=A7=A3=E6=9E=90=E7=94=9F=E6=95=88?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E7=94=B3=E8=AF=B7=E8=AF=81=E4=B9=A6=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/dbdata/cert.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/dbdata/cert.go b/server/dbdata/cert.go index 089a671..635a5ee 100644 --- a/server/dbdata/cert.go +++ b/server/dbdata/cert.go @@ -90,7 +90,7 @@ func GetDNSProvider(l *SettingLetsEncrypt) (Provider challenge.Provider, err err return } case "txcloud": - if Provider, err = tencentcloud.NewDNSProviderConfig(&tencentcloud.Config{SecretID: l.DNSProvider.TXCloud.SecretID, SecretKey: l.DNSProvider.TXCloud.SecretKey, TTL: 600}); err != nil { + if Provider, err = tencentcloud.NewDNSProviderConfig(&tencentcloud.Config{SecretID: l.DNSProvider.TXCloud.SecretID, SecretKey: l.DNSProvider.TXCloud.SecretKey, PropagationTimeout: 60 * time.Second, PollingInterval: 10 * time.Second, TTL: 600}); err != nil { return } case "cloudflare": From fe9b84ce98b574023f7895b45ddef309828194ca Mon Sep 17 00:00:00 2001 From: wsczx Date: Thu, 4 May 2023 19:08:40 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9cf=E4=BD=BF=E7=94=A8aut?= =?UTF-8?q?hToken=E7=9A=84=E6=96=B9=E5=BC=8F=E7=94=B3=E8=AF=B7=E8=AF=81?= =?UTF-8?q?=E4=B9=A6=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=9B=A0=E5=89=8D=E5=90=8E?= =?UTF-8?q?=E7=AB=AFcf=E5=90=8D=E7=A7=B0=E4=B8=8D=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E6=8C=87=E9=92=88=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/dbdata/cert.go | 8 ++++---- server/dbdata/db.go | 5 ++--- web/src/pages/set/Other.vue | 15 ++++----------- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/server/dbdata/cert.go b/server/dbdata/cert.go index 635a5ee..88769b1 100644 --- a/server/dbdata/cert.go +++ b/server/dbdata/cert.go @@ -61,8 +61,8 @@ type DNSProvider struct { SecretKey string `json:"secretKey"` } `json:"txcloud"` CfCloud struct { - AuthEmail string `json:"authEmail"` - AuthKey string `json:"authKey"` + // AuthEmail string `json:"authEmail"` + AuthToken string `json:"authToken"` } `json:"cfcloud"` } type LegoUserData struct { @@ -93,8 +93,8 @@ func GetDNSProvider(l *SettingLetsEncrypt) (Provider challenge.Provider, err err if Provider, err = tencentcloud.NewDNSProviderConfig(&tencentcloud.Config{SecretID: l.DNSProvider.TXCloud.SecretID, SecretKey: l.DNSProvider.TXCloud.SecretKey, PropagationTimeout: 60 * time.Second, PollingInterval: 10 * time.Second, TTL: 600}); err != nil { return } - case "cloudflare": - if Provider, err = cloudflare.NewDNSProviderConfig(&cloudflare.Config{AuthEmail: l.DNSProvider.CfCloud.AuthEmail, AuthKey: l.DNSProvider.CfCloud.AuthKey, TTL: 600}); err != nil { + case "cfcloud": + if Provider, err = cloudflare.NewDNSProviderConfig(&cloudflare.Config{AuthToken: l.DNSProvider.CfCloud.AuthToken, TTL: 600}); err != nil { return } } diff --git a/server/dbdata/db.go b/server/dbdata/db.go index 293e9b8..bfb023e 100644 --- a/server/dbdata/db.go +++ b/server/dbdata/db.go @@ -115,9 +115,8 @@ func addInitData() error { SecretKey string `json:"secretKey"` }{SecretID: "", SecretKey: ""}, CfCloud: struct { - AuthEmail string `json:"authEmail"` - AuthKey string `json:"authKey"` - }{AuthEmail: "", AuthKey: ""}}, + AuthToken string `json:"authToken"` + }{AuthToken: ""}}, } err = SettingSessAdd(sess, provider) if err != nil { diff --git a/web/src/pages/set/Other.vue b/web/src/pages/set/Other.vue index 04a0e9b..0574a09 100644 --- a/web/src/pages/set/Other.vue +++ b/web/src/pages/set/Other.vue @@ -318,8 +318,7 @@ export default { secretKey: "", }, cfcloud: { - authEmail: "", - authKey: "", + authToken: "", }, }, customCert: { cert: "", key: "" }, @@ -399,19 +398,13 @@ export default { ], cfcloud: [ { - label: "Email", - prop: "email", - component: "el-input", - type: "text", - }, - { - label: "AuthKey", - prop: "authKey", + label: "AuthToken", + prop: "authToken", component: "el-input", type: "password", rules: { required: true, - message: "请输入正确的APIKey", + message: "请输入正确的AuthToken", trigger: "blur", }, }, From 60095fbc9b986a28c251b34225d73544305a90a2 Mon Sep 17 00:00:00 2001 From: wsczx Date: Thu, 4 May 2023 22:24:53 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=AA=8C=E8=AF=81DNS?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4=E5=92=8C=E8=BD=AE=E8=AE=AD?= =?UTF-8?q?=E9=97=B4=E9=9A=94=EF=BC=8C=E9=81=BF=E5=85=8D=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E8=AF=81=E4=B9=A6=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/dbdata/cert.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/server/dbdata/cert.go b/server/dbdata/cert.go index 88769b1..db87b84 100644 --- a/server/dbdata/cert.go +++ b/server/dbdata/cert.go @@ -61,7 +61,6 @@ type DNSProvider struct { SecretKey string `json:"secretKey"` } `json:"txcloud"` CfCloud struct { - // AuthEmail string `json:"authEmail"` AuthToken string `json:"authToken"` } `json:"cfcloud"` } @@ -86,15 +85,15 @@ type LeGoClient struct { func GetDNSProvider(l *SettingLetsEncrypt) (Provider challenge.Provider, err error) { switch l.Name { case "aliyun": - if Provider, err = alidns.NewDNSProviderConfig(&alidns.Config{APIKey: l.DNSProvider.AliYun.APIKey, SecretKey: l.DNSProvider.AliYun.SecretKey, TTL: 600}); err != nil { + if Provider, err = alidns.NewDNSProviderConfig(&alidns.Config{APIKey: l.DNSProvider.AliYun.APIKey, SecretKey: l.DNSProvider.AliYun.SecretKey, PropagationTimeout: 60 * time.Second, PollingInterval: 2 * time.Second, TTL: 600}); err != nil { return } case "txcloud": - if Provider, err = tencentcloud.NewDNSProviderConfig(&tencentcloud.Config{SecretID: l.DNSProvider.TXCloud.SecretID, SecretKey: l.DNSProvider.TXCloud.SecretKey, PropagationTimeout: 60 * time.Second, PollingInterval: 10 * time.Second, TTL: 600}); err != nil { + if Provider, err = tencentcloud.NewDNSProviderConfig(&tencentcloud.Config{SecretID: l.DNSProvider.TXCloud.SecretID, SecretKey: l.DNSProvider.TXCloud.SecretKey, PropagationTimeout: 60 * time.Second, PollingInterval: 2 * time.Second, TTL: 600}); err != nil { return } case "cfcloud": - if Provider, err = cloudflare.NewDNSProviderConfig(&cloudflare.Config{AuthToken: l.DNSProvider.CfCloud.AuthToken, TTL: 600}); err != nil { + if Provider, err = cloudflare.NewDNSProviderConfig(&cloudflare.Config{AuthToken: l.DNSProvider.CfCloud.AuthToken, PropagationTimeout: 60 * time.Second, PollingInterval: 2 * time.Second, TTL: 600}); err != nil { return } } From c63e4f33d5fc1266923da6951cdd001d29bc52e1 Mon Sep 17 00:00:00 2001 From: wsczx Date: Thu, 4 May 2023 23:32:16 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=B7=BB=E5=8A=A0=E7=AD=89=E5=BE=85=E6=95=88?= =?UTF-8?q?=E6=9E=9C=EF=BC=8C=E9=81=BF=E5=85=8D=E6=97=A0=E6=B3=95=E5=8F=8A?= =?UTF-8?q?=E6=97=B6=E8=8E=B7=E5=8F=96=E5=90=8E=E7=AB=AF=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/pages/set/Other.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/web/src/pages/set/Other.vue b/web/src/pages/set/Other.vue index 0574a09..d7375bf 100644 --- a/web/src/pages/set/Other.vue +++ b/web/src/pages/set/Other.vue @@ -544,12 +544,20 @@ export default { }); break; case "letsCert": + var loading = this.$loading({ + lock: true, + text: "证书申请中...", + spinner: "el-icon-loading", + background: "rgba(0, 0, 0, 0.7)", + }); axios.post("/set/other/createcert", this.letsCert).then((resp) => { var rdata = resp.data; console.log(rdata); if (rdata.code === 0) { + loading.close(); this.$message.success(rdata.msg); } else { + loading.close(); this.$message.error(rdata.msg); } }); From 14efb14a9a68b081808c9f34b2e41207eec1ba19 Mon Sep 17 00:00:00 2001 From: bjdgyc Date: Tue, 30 May 2023 15:52:20 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=8A=A5=E9=94=99=EF=BC=8C=E5=81=9C=E6=AD=A2?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/base/cmd.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/base/cmd.go b/server/base/cmd.go index ca4d095..b2a5e35 100644 --- a/server/base/cmd.go +++ b/server/base/cmd.go @@ -80,7 +80,6 @@ func initCmd() { linkViper.SetEnvPrefix("link") // 基础配置 - for _, v := range configs { if v.Typ == cfgStr { rootCmd.Flags().StringP(v.Name, v.Short, v.ValStr, v.Usage) @@ -113,7 +112,7 @@ func initCmd() { linkViper.SetConfigFile(conf) err = linkViper.ReadInConfig() if err != nil { - fmt.Println("Using config file:", err) + panic("config file err:" + err.Error()) } }) } From d36e2fe85add97aebb9ea8bfe02e38c0f3f9003e Mon Sep 17 00:00:00 2001 From: bjdgyc Date: Thu, 8 Jun 2023 17:09:19 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=AF=94=E8=BE=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/base/log.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/base/log.go b/server/base/log.go index debb283..309716c 100644 --- a/server/base/log.go +++ b/server/base/log.go @@ -103,7 +103,7 @@ func logLevel2Int(l string) int { } lvl := LogLevelInfo for k, v := range levels { - if strings.EqualFold(strings.ToLower(l), strings.ToLower(v)) { + if strings.ToLower(l) == strings.ToLower(v) { lvl = k } } From e31b5d83d42018850ede2d9cc7b76834fa50bfc9 Mon Sep 17 00:00:00 2001 From: lanrenwo Date: Wed, 14 Jun 2023 14:30:18 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BB=84=E5=88=97?= =?UTF-8?q?=E8=A1=A8-=E5=B8=A6=E5=AE=BD=E9=99=90=E5=88=B6=E7=9A=84?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E4=BB=8EBYTE=E4=BF=AE=E6=94=B9=E4=B8=BAMbps?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/pages/group/List.vue | 44 ++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/web/src/pages/group/List.vue b/web/src/pages/group/List.vue index 3a7ed31..4f71eb7 100644 --- a/web/src/pages/group/List.vue +++ b/web/src/pages/group/List.vue @@ -47,7 +47,12 @@ + label="带宽限制" + width="90"> + + width="180">