Commit 74925d01 authored by 贾浩@五瓣科技's avatar 贾浩@五瓣科技

fix internal error

parent a9fa37a9
...@@ -4,6 +4,7 @@ import ( ...@@ -4,6 +4,7 @@ import (
dbModel "sdk_api/model/db" dbModel "sdk_api/model/db"
"gorm.io/gorm" "gorm.io/gorm"
"gorm.io/gorm/clause"
) )
func (d *Dao) CreateUser(user *dbModel.User) (err error) { func (d *Dao) CreateUser(user *dbModel.User) (err error) {
...@@ -35,7 +36,7 @@ func (d *Dao) GetUserByUid(uid string) (user *dbModel.User, err error) { ...@@ -35,7 +36,7 @@ func (d *Dao) GetUserByUid(uid string) (user *dbModel.User, err error) {
} }
func (d *Dao) CreateEmptyUser(user *dbModel.User) (err error) { func (d *Dao) CreateEmptyUser(user *dbModel.User) (err error) {
return d.db.Create(user).Error return d.db.Clauses(clause.OnConflict{DoNothing: true}).Create(user).Error
} }
func (d *Dao) SetKeystore(uid, address, keystore string) (err error) { func (d *Dao) SetKeystore(uid, address, keystore string) (err error) {
......
...@@ -7,22 +7,28 @@ services: ...@@ -7,22 +7,28 @@ services:
sdk-db: sdk-db:
image: mysql:8 image: mysql:8
container_name: sdk-db container_name: sdk-db
ports:
- "13307:3306"
volumes: volumes:
- ./data/sdk-api/db:/var/lib/mysql - ./data/sdk-api/db:/var/lib/mysql
- ./conf/sdk-api/db/conf.d:/etc/mysql/conf.d - ./conf/sdk-api/db/conf.d:/etc/mysql/conf.d
environment: environment:
MYSQL_ROOT_PASSWORD: "XN2UARuys3zy4Oux" MYSQL_ROOT_PASSWORD: "XN2UARuys3zy4Oux"
MYSQL_DATABASE: "sdk" MYSQL_DATABASE: "sdk"
healthcheck:
test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-uroot", "--password=$$(cat $$MYSQL_ROOT_PASSWORD)"]
interval: 10s
timeout: 5s
retries: 5
start_period: 1s
sdk-api: sdk-api:
image: caduceus/ai-sdk-api:v0.0.1 image: caduceus/ai-sdk-api:v0.0.2
container_name: sdk-api container_name: sdk-api
ports: ports:
- "16666:8080" - "16666:8080"
depends_on: depends_on:
- sdk-db sdk-db:
condition: service_healthy
volumes: volumes:
- ./conf/sdk-api/config.toml:/config.toml - ./conf/sdk-api/config.toml:/config.toml
command: command:
...@@ -38,7 +44,8 @@ services: ...@@ -38,7 +44,8 @@ services:
ports: ports:
- "16667:8080" - "16667:8080"
depends_on: depends_on:
- sdk-db sdk-db:
condition: service_healthy
volumes: volumes:
- ./conf/sdk-kv-api/config.toml:/config.toml - ./conf/sdk-kv-api/config.toml:/config.toml
command: command:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment