From 4cd655ff5f0d14148442f18dc8042ee46b6f8403 Mon Sep 17 00:00:00 2001 From: NY Date: Wed, 12 Feb 2025 23:41:29 +0800 Subject: [PATCH] first --- .drone.yml | 7 +------ api/login/register.go | 3 +-- api/login/sso.go | 1 - compose.yaml | 7 +++++++ config/pay_test.ini | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 compose.yaml diff --git a/.drone.yml b/.drone.yml index 95884ae..16db6b3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -63,12 +63,7 @@ steps: - cd /workspace/prdUploader - docker build -t prduploader:latest . - echo "Running Docker container..." - - | - if docker run -p 11000:11000 prduploader:latest; then - echo "Deployment successful, cleaning up old container and image..." - else - echo "Deployment failed, keeping old container and image." - fi + - docker-compose up -d - rm -rf myapp - echo "Deployment finished" diff --git a/api/login/register.go b/api/login/register.go index 3d72f48..8eb2bb0 100644 --- a/api/login/register.go +++ b/api/login/register.go @@ -14,11 +14,10 @@ import ( ) type SsoRegisterParams struct { - Account string `json:"account"` // 注册账号 Password string `json:"password"` // 密码 Mobile string `json:"mobile"` // 手机号 Email string `json:"email"` // 邮箱(可选) - Invite string `json:"invite"` // 邀请码 + Invite string `json:"invite"` // 邀请码(可选) Captcha string `json:"captcha"` // 验证码 } diff --git a/api/login/sso.go b/api/login/sso.go index 3b59619..a3beee5 100644 --- a/api/login/sso.go +++ b/api/login/sso.go @@ -12,7 +12,6 @@ import ( type SsoLoginParams struct { Mobile string `json:"mobile"` // 登陆手机号 Password string `json:"passWord"` // 密码 - //Captcha string `json:"captcha"` // 验证码 } type SsoLoginResponse struct { diff --git a/compose.yaml b/compose.yaml new file mode 100644 index 0000000..9a54ebb --- /dev/null +++ b/compose.yaml @@ -0,0 +1,7 @@ +version: '3.8' + +services: + prduploader: + image: prduploader:latest + ports: + - "11000:11000" \ No newline at end of file diff --git a/config/pay_test.ini b/config/pay_test.ini index 1be7b7b..fd31757 100644 --- a/config/pay_test.ini +++ b/config/pay_test.ini @@ -33,7 +33,7 @@ Type = redis Host = 47.112.165.44 Port = 6379 PassWord = `afasdf12313%%%^^^^` -Name = default +Name = 8 MaxIdle = 10 ###