diff --git a/Dockerfile b/Dockerfile index e14c3c8..d87027c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,4 @@ +# 打包前端 FROM node:18-alpine as build-stage WORKDIR front @@ -10,6 +11,7 @@ RUN npm config set registry https://registry.npmmirror.com RUN pnpm install RUN pnpm build +# 前后端集成打包 FROM golang:alpine as build RUN apk add upx diff --git a/repository/client.go b/repository/client.go index daf1215..034ef25 100644 --- a/repository/client.go +++ b/repository/client.go @@ -3,6 +3,7 @@ package repository import ( "encoding/json" "errors" + "fmt" "gitee.ltd/lxh/logger/log" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" "gorm.io/gorm" @@ -194,7 +195,7 @@ func (r clientRepo) GetById(id string) (data entity.Client, err error) { // @return data // @return err func (r clientRepo) GetByPublicKey(publicKey string) (data entity.Client, err error) { - err = r.Model(&entity.Client{}).Where("json_extract(keys, '.publicKey') = ?", publicKey).Preload("Server").First(&data).Error + err = r.Model(&entity.Client{}).Where(fmt.Sprintf("json_extract(keys, '$.publicKey') = '%s'", publicKey)).Preload("Server").First(&data).Error return }