Merge branch 'dev' of https://github.com/go-admin-team/go-admin into dev
This commit is contained in:
commit
a1a41f0a86
6 files changed
+13
-42
No files matched your search
@@ -3,6 +3,8 @@ package api
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"github.com/go-admin-team/go-admin-core/tools/captcha"
|
||||||
|
"go-admin/common/middleware/handler"
|
||||||
"log"
|
"log"
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
@@ -71,6 +73,8 @@ func setup() {
|
|||||||
log.Fatalf("cache setup error, %s\n", err.Error())
|
log.Fatalf("cache setup error, %s\n", err.Error())
|
||||||
}
|
}
|
||||||
sdk.Runtime.SetCacheAdapter(cacheAdapter)
|
sdk.Runtime.SetCacheAdapter(cacheAdapter)
|
||||||
|
//5. 设置验证码store
|
||||||
|
handler.SetStore(captcha.NewCacheStore(cacheAdapter, 600))
|
||||||
|
|
||||||
usageStr := `starting api server...`
|
usageStr := `starting api server...`
|
||||||
log.Println(usageStr)
|
log.Println(usageStr)
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ func setupSimpleDatabase(host string, c *toolsConfig.Database) {
|
|||||||
c.Registers[i].Policy,
|
c.Registers[i].Policy,
|
||||||
c.Registers[i].Tables)
|
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{
|
db, err := resolverConfig.Init(&gorm.Config{
|
||||||
NamingStrategy: schema.NamingStrategy{
|
NamingStrategy: schema.NamingStrategy{
|
||||||
SingularTable: true,
|
SingularTable: true,
|
||||||
|
|||||||
@@ -20,6 +20,11 @@ import (
|
|||||||
|
|
||||||
var store = base64Captcha.DefaultMemStore
|
var store = base64Captcha.DefaultMemStore
|
||||||
|
|
||||||
|
// SetStore 设置store
|
||||||
|
func SetStore(s base64Captcha.Store) {
|
||||||
|
store = s
|
||||||
|
}
|
||||||
|
|
||||||
func PayloadFunc(data interface{}) jwt.MapClaims {
|
func PayloadFunc(data interface{}) jwt.MapClaims {
|
||||||
if v, ok := data.(map[string]interface{}); ok {
|
if v, ok := data.(map[string]interface{}); ok {
|
||||||
u, _ := v["user"].(SysUser)
|
u, _ := v["user"].(SysUser)
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ require (
|
|||||||
github.com/bytedance/go-tagexpr/v2 v2.7.10
|
github.com/bytedance/go-tagexpr/v2 v2.7.10
|
||||||
github.com/casbin/casbin/v2 v2.25.1
|
github.com/casbin/casbin/v2 v2.25.1
|
||||||
github.com/gin-gonic/gin v1.6.3
|
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/google/uuid v1.2.0
|
||||||
github.com/mojocn/base64Captcha v1.3.1
|
github.com/mojocn/base64Captcha v1.3.1
|
||||||
github.com/mssola/user_agent v0.5.2
|
github.com/mssola/user_agent v0.5.2
|
||||||
|
|||||||
@@ -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
|
|
||||||
+2
-15
@@ -3,7 +3,6 @@ apiVersion: v1
|
|||||||
kind: Service
|
kind: Service
|
||||||
metadata:
|
metadata:
|
||||||
name: go-admin
|
name: go-admin
|
||||||
namespace: go-admin
|
|
||||||
labels:
|
labels:
|
||||||
app: go-admin
|
app: go-admin
|
||||||
service: go-admin
|
service: go-admin
|
||||||
@@ -15,19 +14,10 @@ spec:
|
|||||||
selector:
|
selector:
|
||||||
app: go-admin
|
app: go-admin
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
|
||||||
kind: ServiceAccount
|
|
||||||
metadata:
|
|
||||||
name: go-admin-go-admin
|
|
||||||
namespace: go-admin
|
|
||||||
labels:
|
|
||||||
account: go-admin
|
|
||||||
---
|
|
||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
name: go-admin-v1
|
name: go-admin-v1
|
||||||
namespace: go-admin
|
|
||||||
labels:
|
labels:
|
||||||
app: go-admin
|
app: go-admin
|
||||||
version: v1
|
version: v1
|
||||||
@@ -43,10 +33,10 @@ spec:
|
|||||||
app: go-admin
|
app: go-admin
|
||||||
version: v1
|
version: v1
|
||||||
spec:
|
spec:
|
||||||
serviceAccountName: go-admin-go-admin
|
|
||||||
containers:
|
containers:
|
||||||
- name: go-admin
|
- name: go-admin
|
||||||
image: registry.cn-shanghai.aliyuncs.com/go-admin-team/go-admin:v1.2.2
|
image: ${IMAGE}
|
||||||
|
imagePullPolicy: IfNotPresent
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 8000
|
- containerPort: 8000
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
@@ -57,9 +47,6 @@ spec:
|
|||||||
- name: go-admin-config
|
- name: go-admin-config
|
||||||
mountPath: /config/
|
mountPath: /config/
|
||||||
readOnly: true
|
readOnly: true
|
||||||
env:
|
|
||||||
- name: COMMIT_TAG
|
|
||||||
value: "DRONE_COMMIT"
|
|
||||||
volumes:
|
volumes:
|
||||||
- name: go-admin
|
- name: go-admin
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
|
|||||||
Reference in new issue
Block a user