From 316b4a9ecbc8d6706b46c8cb4268fdb8fbee5bab Mon Sep 17 00:00:00 2001 From: lyy0709 <65712338+lyy0709@users.noreply.github.com> Date: Sun, 14 Apr 2024 00:17:42 +0800 Subject: [PATCH 01/10] Update setup.html --- resource/template/setup.html | 118 ++++++++++++++++++++++++++++------- 1 file changed, 94 insertions(+), 24 deletions(-) diff --git a/resource/template/setup.html b/resource/template/setup.html index 6532d87..8ee58e0 100644 --- a/resource/template/setup.html +++ b/resource/template/setup.html @@ -3,40 +3,110 @@ + 表单页面 - + -
-

蟑螂账号管理

+
+

蟑螂账号管理

-
- - +
+
-
- - - 显示密码 +
+ +
- - + +
{{.result}}
-
- - + - \ No newline at end of file + From edd369ed957c2c235cf8581b1198df75daef23b9 Mon Sep 17 00:00:00 2001 From: lyy0709 <65712338+lyy0709@users.noreply.github.com> Date: Tue, 16 Apr 2024 14:00:49 +0800 Subject: [PATCH 02/10] Update proxyapi.go --- api/proxyapi.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/api/proxyapi.go b/api/proxyapi.go index f3910f2..d090f1a 100644 --- a/api/proxyapi.go +++ b/api/proxyapi.go @@ -40,6 +40,10 @@ func ProxyApi(r *ghttp.Request) { header := r.Request.Header header.Set("Origin", "https://chat.openai.com") header.Set("Referer", "https://chat.openai.com/") + accessToken := config.GetAccessToken(ctx) + if accessToken != "" { + header.Set("Authorization", "Bearer "+ accessToken) + } utils.HeaderModify(&r.Request.Header) proxy.ServeHTTP(r.Response.RawWriter(), r.Request) From 08dbb86bfed97c9248edcf6ecd31167436f45f69 Mon Sep 17 00:00:00 2001 From: lyy0709 <65712338+lyy0709@users.noreply.github.com> Date: Tue, 16 Apr 2024 15:44:48 +0800 Subject: [PATCH 03/10] Add files via upload --- docker-compose.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..ed5f033 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3.8' +services: + cockroachai-v2: + image: lyy0709/cockroachai-v2:latest + ports: + - "9000:9315" #左侧为暴露的端口 + volumes: + - ./config.yaml:/config.yaml + - ./resource:/app/resource \ No newline at end of file From 5d930ba69167d5ac2ae9bb27b2c0ea5cd0817e41 Mon Sep 17 00:00:00 2001 From: lyy0709 <65712338+lyy0709@users.noreply.github.com> Date: Tue, 16 Apr 2024 20:09:17 +0800 Subject: [PATCH 04/10] Update api.go --- api/api.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/api/api.go b/api/api.go index dcf5ea3..30a5d0e 100644 --- a/api/api.go +++ b/api/api.go @@ -24,9 +24,16 @@ func init() { group.GET("/login", Login) group.POST("/login", LoginPost) group.GET("/auth/logout", AuthLogout) + group.POST("/api/accounts/data_export", NotFound) // 禁用导出 + group.POST("/api/payments/checkout", NotFound) // 禁用支付 } +// NotFound 404 +func NotFound(r *ghttp.Request) { + r.Response.WriteStatus(http.StatusNotFound) +} + // Init initializes the api module. func Init(ctx g.Ctx) { g.Log().Info(ctx, "Api module initialized") From 09cdca40c8a55ab91d3cd1a3f1ac83878aff5d6b Mon Sep 17 00:00:00 2001 From: lyy0709 <65712338+lyy0709@users.noreply.github.com> Date: Tue, 16 Apr 2024 20:15:39 +0800 Subject: [PATCH 05/10] Update api.go --- api/api.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/api/api.go b/api/api.go index 30a5d0e..6cdd12b 100644 --- a/api/api.go +++ b/api/api.go @@ -1,6 +1,9 @@ package api -import "github.com/gogf/gf/v2/frame/g" +import ( + "github.com/gogf/gf/v2/frame/g" + "github.com/gogf/gf/v2/net/ghttp" +) func init() { s := g.Server() From 3c0b96318c5ed239d86775431984fc01db7345ac Mon Sep 17 00:00:00 2001 From: lyy0709 <65712338+lyy0709@users.noreply.github.com> Date: Tue, 16 Apr 2024 20:16:04 +0800 Subject: [PATCH 06/10] Update api.go --- api/api.go | 1 + 1 file changed, 1 insertion(+) diff --git a/api/api.go b/api/api.go index 6cdd12b..a1b8634 100644 --- a/api/api.go +++ b/api/api.go @@ -1,6 +1,7 @@ package api import ( + "net/http" "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/net/ghttp" ) From 88cae2d539628c0d9593d1e75d7e8d14cbe780a1 Mon Sep 17 00:00:00 2001 From: lyy0709 <65712338+lyy0709@users.noreply.github.com> Date: Tue, 16 Apr 2024 20:37:16 +0800 Subject: [PATCH 07/10] Update api.go --- api/api.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/api/api.go b/api/api.go index a1b8634..ebbf0bd 100644 --- a/api/api.go +++ b/api/api.go @@ -2,6 +2,8 @@ package api import ( "net/http" + "net/http/httputil" + "net/url" "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/net/ghttp" ) @@ -28,8 +30,8 @@ func init() { group.GET("/login", Login) group.POST("/login", LoginPost) group.GET("/auth/logout", AuthLogout) - group.POST("/api/accounts/data_export", NotFound) // 禁用导出 - group.POST("/api/payments/checkout", NotFound) // 禁用支付 + group.POST("/backend-api/accounts/data_export", NotFound) // 禁用导出 + group.POST("/backend-api/payments/checkout", NotFound) // 禁用支付 } From a0d7bbd56bdf0879c82249f13aaf70f4614b043a Mon Sep 17 00:00:00 2001 From: lyy0709 <65712338+lyy0709@users.noreply.github.com> Date: Tue, 16 Apr 2024 20:40:51 +0800 Subject: [PATCH 08/10] Update api.go --- api/api.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/api/api.go b/api/api.go index ebbf0bd..bc18bf2 100644 --- a/api/api.go +++ b/api/api.go @@ -2,8 +2,6 @@ package api import ( "net/http" - "net/http/httputil" - "net/url" "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/net/ghttp" ) From f25bca7f2bbf40c7bd1c17065e686d0549ac0a1f Mon Sep 17 00:00:00 2001 From: lyy0709 <65712338+lyy0709@users.noreply.github.com> Date: Tue, 16 Apr 2024 20:52:56 +0800 Subject: [PATCH 09/10] Update api.go --- api/api.go | 1 + 1 file changed, 1 insertion(+) diff --git a/api/api.go b/api/api.go index bc18bf2..857ed36 100644 --- a/api/api.go +++ b/api/api.go @@ -28,6 +28,7 @@ func init() { group.GET("/login", Login) group.POST("/login", LoginPost) group.GET("/auth/logout", AuthLogout) + group.ALL("/public-api/referral/invites/*any", NotFound) //禁用邀请 group.POST("/backend-api/accounts/data_export", NotFound) // 禁用导出 group.POST("/backend-api/payments/checkout", NotFound) // 禁用支付 From 20ac9891eed24f48ceb580edc16458b614a1ddbf Mon Sep 17 00:00:00 2001 From: lyy0709 <65712338+lyy0709@users.noreply.github.com> Date: Tue, 16 Apr 2024 21:01:43 +0800 Subject: [PATCH 10/10] Update Dockerfile --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3f5f0cc..50905ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,8 +31,11 @@ COPY --from=builder /usr/share/zoneinfo /usr/share/zoneinfo # 从 builder 镜像中复制应用到当前镜像中 COPY --from=builder /app/main /app/main +# 从 builder 镜像中复制应用到当前镜像中 +COPY --from=builder /app/resource /app/resource + # 指定环境变量 TZ，你可以在运行 Docker 容器时通过 -e 参数来覆盖这个值 ENV TZ=Asia/Shanghai # 指定容器启动时运行的命令 -ENTRYPOINT ["/app/main"] \ No newline at end of file +ENTRYPOINT ["/app/main"]