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/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, 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 0fd499e1..b1762d37 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/bytedance/go-tagexpr/v2 v2.7.10 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.3 + 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 @@ -29,4 +29,4 @@ require ( gorm.io/driver/postgres v1.0.6-0.20201208020313-1ed927cfab53 gorm.io/driver/sqlite v1.1.5-0.20201206014648-c84401fbe3ba gorm.io/gorm v1.21.6 -) \ No newline at end of file +) 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..88d12534 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 @@ -15,19 +14,10 @@ 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: name: go-admin-v1 - namespace: go-admin labels: app: go-admin version: v1 @@ -43,10 +33,10 @@ spec: app: go-admin version: v1 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} + imagePullPolicy: IfNotPresent ports: - containerPort: 8000 volumeMounts: @@ -57,9 +47,6 @@ spec: - name: go-admin-config mountPath: /config/ readOnly: true - env: - - name: COMMIT_TAG - value: "DRONE_COMMIT" volumes: - name: go-admin persistentVolumeClaim: