From 3a2253f1cef221587519da66c32e0708e7b0c2d9 Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Sun, 28 Jan 2024 11:08:53 +0800 Subject: [PATCH 01/10] =?UTF-8?q?TASK:=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-prod.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 59ce6439..6a2b9d4d 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -2,9 +2,9 @@ server.port=5567 #datasource spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://18.167.251.121:33008/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true -spring.datasource.username=aida_con -spring.datasource.password=123456 +spring.datasource.url=jdbc:mysql://18.167.251.121:3306/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true +spring.datasource.username=root +spring.datasource.password=QWa998345 #spring.datasource.password=QWa998345 #security From ae6692523b52f67133a580bc3316403192d4ccbc Mon Sep 17 00:00:00 2001 From: zchengrong <124802516+zchengrong@users.noreply.github.com> Date: Sun, 28 Jan 2024 11:16:59 +0800 Subject: [PATCH 02/10] Update docker-compose.yml --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a37c5319..a8d0345f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,10 @@ version: "3" services: aida_back: - container_name: stable-version-aida-back + container_name: produce-version-aida-back build: . # volumes: # # 数据挂载 # - /workspace/home/aida/file/:/workspace/home/aida/file/ ports: - - "10086:5567" \ No newline at end of file + - "10010:5567" From abcad626f6c439c82440f469d9bcb2ae81f28ff7 Mon Sep 17 00:00:00 2001 From: zchengrong <124802516+zchengrong@users.noreply.github.com> Date: Sun, 28 Jan 2024 11:19:03 +0800 Subject: [PATCH 03/10] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index a8d0345f..fbc671ff 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: "3" services: aida_back: - container_name: produce-version-aida-back + container_name: prod-version-aida-back build: . # volumes: # # 数据挂载 From e539a931f9e85e6856c606f66c9dcdcadf1fb8a2 Mon Sep 17 00:00:00 2001 From: zchengrong <124802516+zchengrong@users.noreply.github.com> Date: Sun, 28 Jan 2024 12:18:47 +0800 Subject: [PATCH 04/10] Update docker-compose.yml --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index fbc671ff..69600a52 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,8 +3,8 @@ services: aida_back: container_name: prod-version-aida-back build: . -# volumes: -# # 数据挂载 -# - /workspace/home/aida/file/:/workspace/home/aida/file/ + volumes: + # 数据挂载 + - ./logs/:/logs/ ports: - "10010:5567" From 4f68fbcff14d25abebf0113a192a2ebcdd1f068e Mon Sep 17 00:00:00 2001 From: zchengrong <124802516+zchengrong@users.noreply.github.com> Date: Sun, 28 Jan 2024 12:19:36 +0800 Subject: [PATCH 05/10] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 69600a52..0b6683cf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,6 +5,6 @@ services: build: . volumes: # 数据挂载 - - ./logs/:/logs/ + - ./logs:/logs ports: - "10010:5567" From c74c7376cc7a6e971cd93bb0cbd7c5c884712314 Mon Sep 17 00:00:00 2001 From: zchengrong <124802516+zchengrong@users.noreply.github.com> Date: Sun, 28 Jan 2024 12:25:02 +0800 Subject: [PATCH 06/10] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0b6683cf..3f890499 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,6 +5,6 @@ services: build: . volumes: # 数据挂载 - - ./logs:/logs + - ./logs:/log ports: - "10010:5567" From 12190f88c878f65ede3c9f4f43ee62507c4be8c0 Mon Sep 17 00:00:00 2001 From: zchengrong <124802516+zchengrong@users.noreply.github.com> Date: Sun, 28 Jan 2024 12:26:47 +0800 Subject: [PATCH 07/10] Update docker-compose.yml --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3f890499..3438ccfc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,8 +3,8 @@ services: aida_back: container_name: prod-version-aida-back build: . - volumes: + # volumes: # 数据挂载 - - ./logs:/log + # - ./logs:/log ports: - "10010:5567" From 41919c44c9759dc35286b12d8a0428c212ab406a Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Mon, 29 Jan 2024 09:50:48 +0800 Subject: [PATCH 08/10] =?UTF-8?q?BUGFIX:=E8=AF=95=E7=94=A8=E7=94=A8?= =?UTF-8?q?=E6=88=B7;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ai/da/service/impl/AccountServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index 30295880..7715cf12 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -478,12 +478,12 @@ public class AccountServiceImpl extends ServiceImpl impl if (CollectionUtil.isNotEmpty(accountList)) { if (accountList.get(0).getIsTrial() == 1) { throw new BusinessException("The username or email has already been registered", ResultEnum.PROMPT.getCode()); + }else { + Account account = accountList.get(0); + if (account.getValidEndTime() > System.currentTimeMillis()) { + throw new BusinessException("The username or email has already been registered", ResultEnum.PROMPT.getCode()); + } } -// else { -// Account account = accountList.get(0); -// account.setIsTrial(1); -// accountMapper.updateById(account); -// } } // 接收到数据后要形成一条使用订单信息 TrialOrder trialOrder = CopyUtil.copyObject(accountTrialDTO, TrialOrder.class); From 17e7ebc8fe8f7fc2cdbbabc2041b042b55595893 Mon Sep 17 00:00:00 2001 From: zchengrong <124802516+zchengrong@users.noreply.github.com> Date: Mon, 29 Jan 2024 10:02:45 +0800 Subject: [PATCH 09/10] Update docker-compose.yml --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3438ccfc..5b64e5f0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,8 +3,8 @@ services: aida_back: container_name: prod-version-aida-back build: . - # volumes: - # 数据挂载 - # - ./logs:/log + volumes: + # 日志目录映射 + - ./log:/log ports: - "10010:5567" From ee2a8ac3cec65c4e328f2188c87c350e0f4127a1 Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Mon, 29 Jan 2024 10:06:48 +0800 Subject: [PATCH 10/10] =?UTF-8?q?BUGFIX:=E8=AF=95=E7=94=A8=E7=94=A8?= =?UTF-8?q?=E6=88=B7;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/service/impl/AccountServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index 7715cf12..a386cdc3 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -480,7 +480,7 @@ public class AccountServiceImpl extends ServiceImpl impl throw new BusinessException("The username or email has already been registered", ResultEnum.PROMPT.getCode()); }else { Account account = accountList.get(0); - if (account.getValidEndTime() > System.currentTimeMillis()) { + if (null == account.getValidEndTime() || account.getValidEndTime() > System.currentTimeMillis()) { throw new BusinessException("The username or email has already been registered", ResultEnum.PROMPT.getCode()); } }