From 179b79812a53419ff5e416ecc04386055202547a Mon Sep 17 00:00:00 2001 From: xupei Date: Sun, 31 Aug 2025 22:02:28 +0800 Subject: [PATCH] =?UTF-8?q?release=203.1=20dev=E4=B8=8Eprod=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConvenientInquiryController.java | 3 ++- .../ai/da/model/dto/GenerateModifyDTO.java | 3 --- .../da/service/impl/AccountServiceImpl.java | 19 ++++++++++--------- .../da/service/impl/AffiliateServiceImpl.java | 3 ++- src/main/resources/application-dev.properties | 3 ++- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/ai/da/controller/ConvenientInquiryController.java b/src/main/java/com/ai/da/controller/ConvenientInquiryController.java index 007b75fb..12038698 100644 --- a/src/main/java/com/ai/da/controller/ConvenientInquiryController.java +++ b/src/main/java/com/ai/da/controller/ConvenientInquiryController.java @@ -16,6 +16,7 @@ import com.ai.da.model.vo.QueryUserConditionsVO; import com.ai.da.service.AccountService; import com.ai.da.service.ConvenientInquiryService; import com.baomidou.mybatisplus.core.metadata.IPage; +import io.netty.util.internal.StringUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -80,7 +81,7 @@ public class ConvenientInquiryController { if (!StringUtil.isNullOrEmpty(email)){ email = email.trim(); } - List designStatistic = designMapper.getDesignStatistic(startTime, endTime, ids, email); + List designStatistic = designMapper.getDesignStatistic(startTime, endTime, ids, email,"prsn", null); return Response.success(designStatistic); } else { return Response.fail("Sorry, you don't have permission"); diff --git a/src/main/java/com/ai/da/model/dto/GenerateModifyDTO.java b/src/main/java/com/ai/da/model/dto/GenerateModifyDTO.java index 63dae8d4..38ddf43a 100644 --- a/src/main/java/com/ai/da/model/dto/GenerateModifyDTO.java +++ b/src/main/java/com/ai/da/model/dto/GenerateModifyDTO.java @@ -23,9 +23,6 @@ public class GenerateModifyDTO { @ApiModelProperty(value = "sketch所属分类", required = true) private String category; - @ApiModelProperty(value = "originalId的来源 Library || Generate(默认为空)", required = true) - private String originalIdSource; - @NotNull(message = "id cannot be empty") @ApiModelProperty(value = "原图id", required = true) private Long originalId; 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 6c9e9746..df8aff88 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -1173,13 +1173,14 @@ public class AccountServiceImpl extends ServiceImpl impl @Override public Boolean designWorksRegister(AccountDesignWorksRegisterDTO accountDesignWorksRegisterDTO) { - log.info("注册账号。邮箱：{}", accountDesignWorksRegisterDTO.getUserEmail() ); + String userEmail = accountDesignWorksRegisterDTO.getUserEmail(); + log.info("注册账号。邮箱：{}", userEmail); QueryWrapper qwA = new QueryWrapper<>(); - qwA.eq("BINARY user_email", accountDesignWorksRegisterDTO.getUserEmail()); + qwA.eq("BINARY user_email", userEmail); List accountList = accountMapper.selectList(qwA); QueryWrapper qwT = new QueryWrapper<>(); - qwT.eq("BINARY email", accountDesignWorksRegisterDTO.getUserEmail()); + qwT.eq("BINARY email", userEmail); List trialOrders = trialOrderMapper.selectList(qwT); if (CollectionUtil.isNotEmpty(accountList) || CollectionUtil.isNotEmpty(trialOrders)) { throw new BusinessException("The email has already been registered"); @@ -1261,12 +1262,12 @@ public class AccountServiceImpl extends ServiceImpl impl static { HikariConfig config = new HikariConfig(); - config.setJdbcUrl("jdbc:mysql://code-create.com.hk:3306/db1nfvsgmjp3b8"); - config.setUsername("uafqtz4gsvfrw"); - config.setPassword("aida123456."); -// config.setJdbcUrl("jdbc:mysql://localhost:3306/code-create-local?serverTimezone=UTC"); -// config.setUsername("root"); -// config.setPassword("root"); +// config.setJdbcUrl("jdbc:mysql://code-create.com.hk:3306/db1nfvsgmjp3b8"); +// config.setUsername("uafqtz4gsvfrw"); +// config.setPassword("aida123456."); + config.setJdbcUrl("jdbc:mysql://localhost:3306/code-create-local?serverTimezone=UTC"); + config.setUsername("root"); + config.setPassword("root"); config.addDataSourceProperty("cachePrepStmts", "true"); config.addDataSourceProperty("prepStmtCacheSize", "250"); config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048"); diff --git a/src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java b/src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java index 1b837b4f..39136bdf 100644 --- a/src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java @@ -401,6 +401,7 @@ public class AffiliateServiceImpl extends ServiceImpl> getAllAffiliateUsername(){ diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 0efb206c..a769658b 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,7 +1,8 @@ server.port=5567 spring.datasource.primary.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.primary.jdbcUrl=jdbc:mysql://18.167.251.121:33008/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true +#spring.datasource.primary.jdbcUrl=jdbc:mysql://18.167.251.121:33008/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true +spring.datasource.primary.jdbcUrl=jdbc:mysql://18.167.251.121:33008/test_aida_3.1?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true spring.datasource.primary.username=aida_con spring.datasource.primary.password=123456