Skip to content

Commit

Permalink
chore: update
Browse files Browse the repository at this point in the history
  • Loading branch information
alomerry committed May 5, 2024
1 parent 6699a08 commit e08ed21
Show file tree
Hide file tree
Showing 29 changed files with 593 additions and 84 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/backend-admin-service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
docker login --username=${{ secrets.DOCKER_USERNAME }} --password=${{ secrets.DOCKER_PASSWORD }} registry.cn-hangzhou.aliyuncs.com
cd golang/gw
chmod +x ./gw
docker build . --file Dockerfile --tag registry.cn-hangzhou.aliyuncs.com/alomerry/mix-admin:latest
docker build . --file docker/service/Dockerfile --tag registry.cn-hangzhou.aliyuncs.com/alomerry/mix-admin:latest
docker push registry.cn-hangzhou.aliyuncs.com/alomerry/mix-admin:latest
# https://github.com/marketplace/actions/http-request-action
- name: trigger rollout restart
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/backend-blog-service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
docker login --username=${{ secrets.DOCKER_USERNAME }} --password=${{ secrets.DOCKER_PASSWORD }} registry.cn-hangzhou.aliyuncs.com
cd golang/gw
chmod +x ./gw
docker build . --file Dockerfile --tag registry.cn-hangzhou.aliyuncs.com/alomerry/mix-blog:latest
docker build . --file docker/service/Dockerfile --tag registry.cn-hangzhou.aliyuncs.com/alomerry/mix-blog:latest
docker push registry.cn-hangzhou.aliyuncs.com/alomerry/mix-blog:latest
# https://github.com/marketplace/actions/http-request-action
- name: trigger rollout restart
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/backend-k8s-service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
docker login --username=${{ secrets.DOCKER_USERNAME }} --password=${{ secrets.DOCKER_PASSWORD }} registry.cn-hangzhou.aliyuncs.com
cd golang/gw
chmod +x ./gw
docker build . --file Dockerfile --tag registry.cn-hangzhou.aliyuncs.com/alomerry/mix-k8s:latest
docker build . --file docker/service/Dockerfile --tag registry.cn-hangzhou.aliyuncs.com/alomerry/mix-k8s:latest
docker push registry.cn-hangzhou.aliyuncs.com/alomerry/mix-k8s:latest
# https://github.com/marketplace/actions/http-request-action
- name: trigger rollout restart
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/frontend-blog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v3
with:
version: 8.15.3
version: 9.0.6
run_install: false
- name: Get pnpm store directory
shell: bash
Expand Down
51 changes: 51 additions & 0 deletions .github/workflows/job-admin-backup-db.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: 构建 admin 备份 db job 镜像

on:
push:
branches: [master]
paths:
- "golang/gw/service/admin/**"
- "golang/gw/core/db/**"

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: arduino/setup-protoc@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/setup-go@v5
with:
go-version: "1.21.5"
- name: 安装 protoc-gen-go/grpc/grpc-gateway/openapiv2 插件
run: |
go install google.golang.org/protobuf/cmd/[email protected]
go install google.golang.org/grpc/cmd/[email protected]
go install github.com/grpc-ecosystem/grpc-gateway/v2/[email protected]
go install github.com/grpc-ecosystem/grpc-gateway/v2/[email protected]
- name: 生成桩文件
run: |
export PATH="$PATH:$(go env GOPATH)/bin"
cd golang/gw
./build.sh proto
- name: 构建二进制
run: |
cd golang/gw/
go build -o gw service/admin/main.go
- name: 构建镜像推送到 aliyun
run: |
docker version
docker login --username=${{ secrets.DOCKER_USERNAME }} --password=${{ secrets.DOCKER_PASSWORD }} registry.cn-hangzhou.aliyuncs.com
cd golang/gw
chmod +x ./gw
docker build . --file docker/jobs/Dockerfile --tag registry.cn-hangzhou.aliyuncs.com/alomerry/mix-admin:latest
docker push registry.cn-hangzhou.aliyuncs.com/alomerry/mix-admin:latest
# https://github.com/marketplace/actions/http-request-action
- name: trigger rollout restart
uses: fjogeleit/http-request-action@v1
with:
url: ${{secrets.MIX_GW_RESTART_URL}}
method: "POST"
customHeaders: '{"Content-Type": "application/json"}'
data: '{"namespace": "alomerry", "deployment": "mix-module-admin-deployment"}'
4 changes: 2 additions & 2 deletions golang/gw/core/components/k8s/k8s.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package k8s

import (
"github.com/alomerry/go-tools/static/constant"
"github.com/alomerry/go-tools/static/cons"
"github.com/alomerry/go-tools/static/env"
"k8s.io/client-go/kubernetes"
v12 "k8s.io/client-go/kubernetes/typed/apps/v1"
Expand All @@ -24,7 +24,7 @@ func initClient() {
err error
)
switch env.GetEnv() {
case constant.EnvLocal:
case cons.EnvLocal:
config, err = clientcmd.BuildConfigFromFlags("", env.GetKubeConfig())
if err != nil {
panic(err.Error())
Expand Down
36 changes: 3 additions & 33 deletions golang/gw/core/db/mysql.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,12 @@ package db

import (
"github.com/alomerry/go-tools/static/env"
m "gorm.io/driver/mysql"
"gorm.io/gorm"
"time"
)

var (
mysql *gorm.DB
debug = true
sql "github.com/alomerry/go-tools/utils/db/mysql"
)

func init() {
var (
dsn = env.GetWithLocalMysqlAdminDSN()
err error
)

mysql, err = gorm.Open(m.Open(dsn), &gorm.Config{
// PrepareStmt: false, // https://gorm.io/zh_CN/docs/performance.html#缓存预编译语句
sql.Instance(func() string {
return env.GetWithLocalMysqlAdminDSN()
})
if err != nil {
panic(err)
}

mysql = mysql.Set("gorm:table_options", "ENGINE=InnoDB CHARSET=utf8 auto_increment=1")
sqlDB, err := mysql.DB()
if err != nil {
panic(err)
}
sqlDB.SetMaxOpenConns(100)
sqlDB.SetMaxIdleConns(20)
sqlDB.SetConnMaxLifetime(time.Hour)
}

func MySQL() *gorm.DB {
if debug {
return mysql.Debug().Session(&gorm.Session{})
}
return mysql.Session(&gorm.Session{})
}
56 changes: 56 additions & 0 deletions golang/gw/core/utils/algo/ticker_queue.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
package algo

import (
"sync"
"time"
)

type TickQueue[T comparable] struct {
idx map[T]int
lock sync.RWMutex
ticker *time.Ticker
cnt int
f func(T)
}

func NewTickQueue[T comparable](duration time.Duration, f func(T)) *TickQueue[T] {
return &TickQueue[T]{
idx: map[T]int{},
lock: sync.RWMutex{},
ticker: time.NewTicker(duration),
f: f,
}
}

func (t *TickQueue[T]) Enqueue(id T) {
t.lock.Lock()
defer t.lock.Unlock()
t.cnt++
_, exists := t.idx[id]
if exists {
t.idx[id]++
return
}
t.idx[id] = 1
}

func (t *TickQueue[T]) Run() {
for {
<-t.ticker.C

t.lock.Lock()

if t.cnt == 0 {
t.lock.Unlock()
break
}
for k, v := range t.idx {
if v > 0 {
go t.f(k)
t.idx[k] = 0
}
}
t.lock.Unlock()
}
}

9 changes: 9 additions & 0 deletions golang/gw/docker/jobs/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM phusion/baseimage:jammy-1.0.2
# 安装 // mysqldump -u root -h alomerry.com -P 13306 -p waline_blog > waline_blog.sql

WORKDIR /app/gw

RUN apt-get update; \
apt-get install mysql-client; \
echo 'exec /app/gw/gw' > /etc/service/gw/run;
COPY gw /app/gw/
File renamed without changes.
30 changes: 24 additions & 6 deletions golang/gw/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ go 1.22.1

require (
github.com/alomerry/copier v0.0.8
github.com/alomerry/go-tools v0.0.4
github.com/alomerry/go-tools v0.0.9
github.com/duke-git/lancet/v2 v2.3.0
github.com/elastic/go-elasticsearch/v8 v8.12.1
github.com/elastic/go-elasticsearch/v8 v8.13.1
github.com/gin-gonic/gin v1.9.1
github.com/golang-jwt/jwt/v5 v5.2.1
github.com/google/uuid v1.6.0
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1
github.com/panjf2000/ants/v2 v2.9.0
github.com/panjf2000/ants/v2 v2.9.1
github.com/redis/go-redis/v9 v9.5.1
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.5
Expand All @@ -20,21 +20,38 @@ require (
google.golang.org/grpc v1.62.1
google.golang.org/protobuf v1.33.0
gopkg.in/tylerb/graceful.v1 v1.2.15
gorm.io/driver/mysql v1.5.6
gorm.io/gorm v1.25.7
gorm.io/gorm v1.25.10
k8s.io/api v0.29.3
k8s.io/apimachinery v0.29.3
k8s.io/client-go v0.29.3
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
)

require (
github.com/aws/aws-sdk-go-v2 v1.26.1 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect
github.com/aws/aws-sdk-go-v2/config v1.27.11 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.11 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.5 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.7 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.5 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.20.5 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.28.6 // indirect
github.com/aws/smithy-go v1.20.2 // indirect
github.com/bytedance/sonic v1.9.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/elastic/elastic-transport-go/v8 v8.4.0 // indirect
github.com/elastic/elastic-transport-go/v8 v8.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/frankban/quicktest v1.14.6 // indirect
Expand Down Expand Up @@ -113,6 +130,7 @@ require (
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gorm.io/driver/mysql v1.5.6 // indirect
k8s.io/klog/v2 v2.110.1 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
Expand Down
55 changes: 46 additions & 9 deletions golang/gw/go.sum
Original file line number Diff line number Diff line change
@@ -1,7 +1,43 @@
github.com/alomerry/copier v0.0.8 h1:xaFZA6nmYtnB0xvTHfrN513rqcuPV40ZJqdmZ3klLe0=
github.com/alomerry/copier v0.0.8/go.mod h1:OHbuXnQxWp04u33z6goMFAmcJL5dNyz3LYTfcW0Zdiw=
github.com/alomerry/go-tools v0.0.4 h1:1H0ZhjiDiNOGy/llCfdAjZ5KCdGFsrH9J8iM71rKQ2Q=
github.com/alomerry/go-tools v0.0.4/go.mod h1:Vb9LTM13Vi69uCFShCzuIRUGlfhD0QmedKGNAdVChPY=
github.com/alomerry/go-tools v0.0.9 h1:AZqB04DzNCDGqlswjBD8LBagCcUr9pYezwlh30WCphE=
github.com/alomerry/go-tools v0.0.9/go.mod h1:bnL4jnb4CCXzjiQ3FDqhT5h7xWBcM1ca3lhgIf//Gsk=
github.com/aws/aws-sdk-go-v2 v1.26.1 h1:5554eUqIYVWpU0YmeeYZ0wU64H2VLBs8TlhRB2L+EkA=
github.com/aws/aws-sdk-go-v2 v1.26.1/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 h1:x6xsQXGSmW6frevwDA+vi/wqhp1ct18mVXYN08/93to=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2/go.mod h1:lPprDr1e6cJdyYeGXnRaJoP4Md+cDBvi2eOj00BlGmg=
github.com/aws/aws-sdk-go-v2/config v1.27.11 h1:f47rANd2LQEYHda2ddSCKYId18/8BhSRM4BULGmfgNA=
github.com/aws/aws-sdk-go-v2/config v1.27.11/go.mod h1:SMsV78RIOYdve1vf36z8LmnszlRWkwMQtomCAI0/mIE=
github.com/aws/aws-sdk-go-v2/credentials v1.17.11 h1:YuIB1dJNf1Re822rriUOTxopaHHvIq0l/pX3fwO+Tzs=
github.com/aws/aws-sdk-go-v2/credentials v1.17.11/go.mod h1:AQtFPsDH9bI2O+71anW6EKL+NcD7LG3dpKGMV4SShgo=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1 h1:FVJ0r5XTHSmIHJV6KuDmdYhEpvlHpiSd38RQWhut5J4=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1/go.mod h1:zusuAeqezXzAB24LGuzuekqMAEgWkVYukBec3kr3jUg=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5 h1:aw39xVGeRWlWx9EzGVnhOR4yOjQDHPQ6o6NmBlscyQg=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5/go.mod h1:FSaRudD0dXiMPK2UjknVwwTYyZMRsHv3TtkabsZih5I=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5 h1:PG1F3OD1szkuQPzDw3CIQsRIrtTlUC3lP84taWzHlq0=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5/go.mod h1:jU1li6RFryMz+so64PpKtudI+QzbKoIEivqdf6LNpOc=
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU=
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY=
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.5 h1:81KE7vaZzrl7yHBYHVEzYB8sypz11NMOZ40YlWvPxsU=
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.5/go.mod h1:LIt2rg7Mcgn09Ygbdh/RdIm0rQ+3BNkbP1gyVMFtRK0=
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 h1:Ji0DY1xUsUr3I8cHps0G+XM3WWU16lP6yG8qu1GAZAs=
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2/go.mod h1:5CsjAbs3NlGQyZNFACh+zztPDI7fU6eW9QsxjfnuBKg=
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.7 h1:ZMeFZ5yk+Ek+jNr1+uwCd2tG89t6oTS5yVWpa6yy2es=
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.7/go.mod h1:mxV05U+4JiHqIpGqqYXOHLPKUC6bDXC44bsUhNjOEwY=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7 h1:ogRAwT1/gxJBcSWDMZlgyFUM962F51A5CRhDLbxLdmo=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7/go.mod h1:YCsIZhXfRPLFFCl5xxY+1T9RKzOKjCut+28JSX2DnAk=
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.5 h1:f9RyWNtS8oH7cZlbn+/JNPpjUk5+5fLd5lM9M0i49Ys=
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.5/go.mod h1:h5CoMZV2VF297/VLhRhO1WF+XYWOzXo+4HsObA4HjBQ=
github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1 h1:6cnno47Me9bRykw9AEv9zkXE+5or7jz8TsskTTccbgc=
github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1/go.mod h1:qmdkIIAC+GCLASF7R2whgNrJADz0QZPX+Seiw/i4S3o=
github.com/aws/aws-sdk-go-v2/service/sso v1.20.5 h1:vN8hEbpRnL7+Hopy9dzmRle1xmDc7o8tmY0klsr175w=
github.com/aws/aws-sdk-go-v2/service/sso v1.20.5/go.mod h1:qGzynb/msuZIE8I75DVRCUXw3o3ZyBmUvMwQ2t/BrGM=
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4 h1:Jux+gDDyi1Lruk+KHF91tK2KCuY61kzoCpvtvJJBtOE=
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4/go.mod h1:mUYPBhaF2lGiukDEjJX2BLRRKTmoUSitGDUgM4tRxak=
github.com/aws/aws-sdk-go-v2/service/sts v1.28.6 h1:cwIxeBttqPN3qkaAjcEcsh8NYr8n2HZPkcKgPAi1phU=
github.com/aws/aws-sdk-go-v2/service/sts v1.28.6/go.mod h1:FZf1/nKNEkHdGGJP/cI2MoIMquumuRK6ol3QQJNDxmw=
github.com/aws/smithy-go v1.20.2 h1:tbp628ireGtzcHDDmLT/6ADHidqnwgF57XOXZe6tp4Q=
github.com/aws/smithy-go v1.20.2/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E=
github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
Expand All @@ -24,10 +60,10 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/r
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
github.com/duke-git/lancet/v2 v2.3.0 h1:Ztie0qOnC4QgGYYqmpmQxbxkPcm54kqFXj1bwhiV8zg=
github.com/duke-git/lancet/v2 v2.3.0/go.mod h1:zGa2R4xswg6EG9I6WnyubDbFO/+A/RROxIbXcwryTsc=
github.com/elastic/elastic-transport-go/v8 v8.4.0 h1:EKYiH8CHd33BmMna2Bos1rDNMM89+hdgcymI+KzJCGE=
github.com/elastic/elastic-transport-go/v8 v8.4.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
github.com/elastic/go-elasticsearch/v8 v8.12.1 h1:QcuFK5LaZS0pSIj/eAEsxmJWmMo7tUs1aVBbzdIgtnE=
github.com/elastic/go-elasticsearch/v8 v8.12.1/go.mod h1:wSzJYrrKPZQ8qPuqAqc6KMR4HrBfHnZORvyL+FMFqq0=
github.com/elastic/elastic-transport-go/v8 v8.5.0 h1:v5membAl7lvQgBTexPRDBO/RdnlQX+FM9fUVDyXxvH0=
github.com/elastic/elastic-transport-go/v8 v8.5.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
github.com/elastic/go-elasticsearch/v8 v8.13.1 h1:du5F8IzUUyCkzxyHdrO9AtopcG95I/qwi2WK8Kf1xlg=
github.com/elastic/go-elasticsearch/v8 v8.13.1/go.mod h1:DIn7HopJs4oZC/w0WoJR13uMUxtHeq92eI5bqv5CRfI=
github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
Expand Down Expand Up @@ -142,8 +178,8 @@ github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4
github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg=
github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
github.com/panjf2000/ants/v2 v2.9.0 h1:SztCLkVxBRigbg+vt0S5QvF5vxAbxbKt09/YfAJ0tEo=
github.com/panjf2000/ants/v2 v2.9.0/go.mod h1:7ZxyxsqE4vvW0M7LSD8aI3cKwgFhBHbxnlN8mDqHa1I=
github.com/panjf2000/ants/v2 v2.9.1 h1:Q5vh5xohbsZXGcD6hhszzGqB7jSSc2/CRr3QKIga8Kw=
github.com/panjf2000/ants/v2 v2.9.1/go.mod h1:7ZxyxsqE4vvW0M7LSD8aI3cKwgFhBHbxnlN8mDqHa1I=
github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
github.com/peterbourgon/diskv/v3 v3.0.1 h1:x06SQA46+PKIUftmEujdwSEpIx8kR+M9eLYsUxeYveU=
Expand Down Expand Up @@ -314,8 +350,9 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gorm.io/driver/mysql v1.5.6 h1:Ld4mkIickM+EliaQZQx3uOJDJHtrd70MxAUqWqlx3Y8=
gorm.io/driver/mysql v1.5.6/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM=
gorm.io/gorm v1.25.7 h1:VsD6acwRjz2zFxGO50gPO6AkNs7KKnvfzUjHQhZDz/A=
gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
gorm.io/gorm v1.25.10 h1:dQpO+33KalOA+aFYGlK+EfxcI5MbO7EP2yYygwh9h+s=
gorm.io/gorm v1.25.10/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw=
k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80=
k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU=
Expand Down
8 changes: 4 additions & 4 deletions golang/gw/openapi/controller/sgs.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"github.com/alomerry/go-tools/modules/sgs/delay"
"github.com/alomerry/go-tools/modules/sgs/tools"
"github.com/alomerry/go-tools/static/constant"
"github.com/alomerry/go-tools/static/cons"
"github.com/alomerry/go-tools/static/env"
file_util "github.com/alomerry/go-tools/utils/files"
"github.com/alomerry/go-tools/utils/zip"
Expand All @@ -32,9 +32,9 @@ const (
var (
s *SgsController
targetMap = map[string]string{
constant.StepA: constant.StepA,
constant.StepB: constant.StepB,
constant.StepReason: "_未出数据",
cons.StepA: cons.StepA,
cons.StepB: cons.StepB,
cons.StepReason: "_未出数据",
}

SgsWorkspace = "/tmp/sgs"
Expand Down
Loading

0 comments on commit e08ed21

Please sign in to comment.