From 24370899ab509d2c097f0aaf98d7376f2b2cc713 Mon Sep 17 00:00:00 2001 From: linwenxiang <991154416@qq.com> Date: Wed, 31 Mar 2021 21:02:12 +0800 Subject: [PATCH 1/5] =?UTF-8?q?perf=20=F0=9F=91=8C=EF=BC=9A=20=E5=8D=87?= =?UTF-8?q?=E7=BA=A7go-admin-core=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index c7552bc7..08141506 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5 github.com/casbin/casbin/v2 v2.25.1 github.com/gin-gonic/gin v1.6.3 - github.com/go-admin-team/go-admin-core v1.3.2-rc.0 + github.com/go-admin-team/go-admin-core v1.3.4-0.20210331124757-4c4d0bf6c336 github.com/google/uuid v1.2.0 github.com/mojocn/base64Captcha v1.3.1 github.com/mssola/user_agent v0.5.2 From 7112323a5e09430f86599652eeaa552c81ef7e77 Mon Sep 17 00:00:00 2001 From: linwenxiang <991154416@qq.com> Date: Wed, 31 Mar 2021 21:56:38 +0800 Subject: [PATCH 2/5] =?UTF-8?q?perf=20=F0=9F=91=8C=EF=BC=9A=20=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/database/initialize.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/database/initialize.go b/common/database/initialize.go index 2a6a9aa8..b7804355 100644 --- a/common/database/initialize.go +++ b/common/database/initialize.go @@ -37,7 +37,7 @@ func setupSimpleDatabase(host string, c *toolsConfig.Database) { c.Registers[i].Policy, c.Registers[i].Tables) } - resolverConfig := toolsDB.NewConfigure(c.Source, c.MaxIdleConns, c.MaxOpenConns, c.ConnMaxIdleTime, c.ConnMaxLifetime, registers) + resolverConfig := toolsDB.NewConfigure(c.Source, c.MaxIdleConns, c.MaxOpenConns, c.ConnMaxIdleTime, c.ConnMaxLifeTime, registers) db, err := resolverConfig.Init(&gorm.Config{ NamingStrategy: schema.NamingStrategy{ SingularTable: true, From e034e5b1ea06ca6214f9ff9ad3239ca3819e51a4 Mon Sep 17 00:00:00 2001 From: linwenxiang <991154416@qq.com> Date: Tue, 6 Apr 2021 18:10:53 +0800 Subject: [PATCH 3/5] =?UTF-8?q?ci=20:green=5Fheart:=20=E4=BF=AE=E6=94=B9k8?= =?UTF-8?q?s=20yaml=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/.drone.yml | 25 ------------------------- scripts/k8s/deploy.yml | 13 +------------ 2 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 scripts/.drone.yml diff --git a/scripts/.drone.yml b/scripts/.drone.yml deleted file mode 100644 index 0bbe6bd3..00000000 --- a/scripts/.drone.yml +++ /dev/null @@ -1,25 +0,0 @@ -kind: pipeline -type: kubernetes -name: drone -steps: - - name: cmd - image: alpine - commands: - - sed -i 's/DRONE_COMMIT/${DRONE_COMMIT}/g' scripts/k8s/deploy.yml - - name: docker - image: plugins/docker - settings: - username: - from_secret: username - password: - from_secret: password - repo: registry.cn-shanghai.aliyuncs.com/go-admin-team/go-admin - tags: v1.2.2 - registry: registry.cn-shanghai.aliyuncs.com - - name: dron8s - image: bh90210/dron8s:latest - settings: - yaml: - - ./scripts/k8s/deploy.yml - kubeconfig: - from_secret: kubeconfig diff --git a/scripts/k8s/deploy.yml b/scripts/k8s/deploy.yml index f69d7e42..4a8d16b3 100644 --- a/scripts/k8s/deploy.yml +++ b/scripts/k8s/deploy.yml @@ -15,14 +15,6 @@ spec: selector: app: go-admin --- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: go-admin-go-admin - namespace: go-admin - labels: - account: go-admin ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -46,7 +38,7 @@ spec: serviceAccountName: go-admin-go-admin containers: - name: go-admin - image: registry.cn-shanghai.aliyuncs.com/go-admin-team/go-admin:v1.2.2 + image: ${IMAGE} ports: - containerPort: 8000 volumeMounts: @@ -57,9 +49,6 @@ spec: - name: go-admin-config mountPath: /config/ readOnly: true - env: - - name: COMMIT_TAG - value: "DRONE_COMMIT" volumes: - name: go-admin persistentVolumeClaim: From eddfe263084294468399c6ebb4fb92bed0ab4489 Mon Sep 17 00:00:00 2001 From: linwenxiang <991154416@qq.com> Date: Wed, 7 Apr 2021 23:01:32 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat=20=E2=9C=A8=20=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=A0=81store=E6=94=AF=E6=8C=81go-admin=20cache?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- cmd/api/server.go | 6 +++++- common/middleware/handler/auth.go | 5 +++++ go.mod | 2 +- scripts/k8s/deploy.yml | 3 --- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8f4facd2..71c81a82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,4 +23,4 @@ COPY --from=builder /usr/share/zoneinfo/Asia/Shanghai /etc/localtime EXPOSE 8000 -CMD ["/go-admin","server","-c", "/config/settings.yml"] +CMD ["/go-admin","server","-c", "/config/settings.yml"] \ No newline at end of file diff --git a/cmd/api/server.go b/cmd/api/server.go index dde90443..7e382cb8 100644 --- a/cmd/api/server.go +++ b/cmd/api/server.go @@ -3,6 +3,8 @@ package api import ( "context" "fmt" + "github.com/go-admin-team/go-admin-core/tools/captcha" + "go-admin/common/middleware/handler" "log" "net/http" "os" @@ -71,6 +73,8 @@ func setup() { log.Fatalf("cache setup error, %s\n", err.Error()) } sdk.Runtime.SetCacheAdapter(cacheAdapter) + //5. 设置验证码store + handler.SetStore(captcha.NewCacheStore(cacheAdapter, 600)) usageStr := `starting api server...` log.Println(usageStr) @@ -150,4 +154,4 @@ func run() error { func tip() { usageStr := `欢迎使用 ` + pkg.Green(`go-admin `+global.Version) + ` 可以使用 ` + pkg.Red(`-h`) + ` 查看命令` fmt.Printf("%s \n\n", usageStr) -} \ No newline at end of file +} diff --git a/common/middleware/handler/auth.go b/common/middleware/handler/auth.go index 1021c59a..392d227d 100644 --- a/common/middleware/handler/auth.go +++ b/common/middleware/handler/auth.go @@ -20,6 +20,11 @@ import ( var store = base64Captcha.DefaultMemStore +// SetStore 设置store +func SetStore(s base64Captcha.Store) { + store = s +} + func PayloadFunc(data interface{}) jwt.MapClaims { if v, ok := data.(map[string]interface{}); ok { u, _ := v["user"].(SysUser) diff --git a/go.mod b/go.mod index 08141506..a766e1e5 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5 github.com/casbin/casbin/v2 v2.25.1 github.com/gin-gonic/gin v1.6.3 - github.com/go-admin-team/go-admin-core v1.3.4-0.20210331124757-4c4d0bf6c336 + github.com/go-admin-team/go-admin-core v1.3.0-rc.0.0.20210407093008-7e27bec63f3e github.com/google/uuid v1.2.0 github.com/mojocn/base64Captcha v1.3.1 github.com/mssola/user_agent v0.5.2 diff --git a/scripts/k8s/deploy.yml b/scripts/k8s/deploy.yml index 4a8d16b3..9931afaf 100644 --- a/scripts/k8s/deploy.yml +++ b/scripts/k8s/deploy.yml @@ -3,7 +3,6 @@ apiVersion: v1 kind: Service metadata: name: go-admin - namespace: go-admin labels: app: go-admin service: go-admin @@ -19,7 +18,6 @@ apiVersion: apps/v1 kind: Deployment metadata: name: go-admin-v1 - namespace: go-admin labels: app: go-admin version: v1 @@ -35,7 +33,6 @@ spec: app: go-admin version: v1 spec: - serviceAccountName: go-admin-go-admin containers: - name: go-admin image: ${IMAGE} From 40cd55da90d1f9281be0648f26c740403ec39647 Mon Sep 17 00:00:00 2001 From: linwenxiang <991154416@qq.com> Date: Thu, 8 Apr 2021 13:53:44 +0800 Subject: [PATCH 5/5] =?UTF-8?q?ci=20:green=5Fheart:=20=E4=BF=AE=E6=94=B9k8?= =?UTF-8?q?s=20yaml=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/k8s/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/k8s/deploy.yml b/scripts/k8s/deploy.yml index 9931afaf..88d12534 100644 --- a/scripts/k8s/deploy.yml +++ b/scripts/k8s/deploy.yml @@ -36,6 +36,7 @@ spec: containers: - name: go-admin image: ${IMAGE} + imagePullPolicy: IfNotPresent ports: - containerPort: 8000 volumeMounts: