aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

release 3.1 dev与prod代码合并冲突处理

Browse Source
This commit is contained in:
xupei
2025-08-31 22:02:28 +08:00
parent 94cf82340a
commit 179b79812a
5 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/ai/da/controller/ConvenientInquiryController.java
View File

@@ -16,6 +16,7 @@ import com.ai.da.model.vo.QueryUserConditionsVO;
import com.ai.da.service.AccountService; import com.ai.da.service.AccountService;
import com.ai.da.service.ConvenientInquiryService; import com.ai.da.service.ConvenientInquiryService;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import io.netty.util.internal.StringUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
@@ -80,7 +81,7 @@ public class ConvenientInquiryController {
if (!StringUtil.isNullOrEmpty(email)){ if (!StringUtil.isNullOrEmpty(email)){
email = email.trim(); email = email.trim();
} }
List<UserDesignStatisticDTO> designStatistic = designMapper.getDesignStatistic(startTime, endTime, ids, email); List<UserDesignStatisticDTO> designStatistic = designMapper.getDesignStatistic(startTime, endTime, ids, email,"prsn", null);
return Response.success(designStatistic); return Response.success(designStatistic);
} else { } else {
return Response.fail("Sorry, you don't have permission"); return Response.fail("Sorry, you don't have permission");

3
src/main/java/com/ai/da/model/dto/GenerateModifyDTO.java
View File

@@ -23,9 +23,6 @@ public class GenerateModifyDTO {
@ApiModelProperty(value = "sketch所属分类", required = true) @ApiModelProperty(value = "sketch所属分类", required = true)
private String category; private String category;
@ApiModelProperty(value = "originalId的来源 Library || Generate(默认为空)", required = true)
private String originalIdSource;
@NotNull(message = "id cannot be empty") @NotNull(message = "id cannot be empty")
@ApiModelProperty(value = "原图id", required = true) @ApiModelProperty(value = "原图id", required = true)
private Long originalId; private Long originalId;

19
src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
View File

@@ -1173,13 +1173,14 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
@Override @Override
public Boolean designWorksRegister(AccountDesignWorksRegisterDTO accountDesignWorksRegisterDTO) { public Boolean designWorksRegister(AccountDesignWorksRegisterDTO accountDesignWorksRegisterDTO) {
log.info("注册账号。邮箱：{}", accountDesignWorksRegisterDTO.getUserEmail() ); String userEmail = accountDesignWorksRegisterDTO.getUserEmail();
log.info("注册账号。邮箱：{}", userEmail);
QueryWrapper<Account> qwA = new QueryWrapper<>(); QueryWrapper<Account> qwA = new QueryWrapper<>();
qwA.eq("BINARY user_email", accountDesignWorksRegisterDTO.getUserEmail()); qwA.eq("BINARY user_email", userEmail);
List<Account> accountList = accountMapper.selectList(qwA); List<Account> accountList = accountMapper.selectList(qwA);
QueryWrapper<TrialOrder> qwT = new QueryWrapper<>(); QueryWrapper<TrialOrder> qwT = new QueryWrapper<>();
qwT.eq("BINARY email", accountDesignWorksRegisterDTO.getUserEmail()); qwT.eq("BINARY email", userEmail);
List<TrialOrder> trialOrders = trialOrderMapper.selectList(qwT); List<TrialOrder> trialOrders = trialOrderMapper.selectList(qwT);
if (CollectionUtil.isNotEmpty(accountList) || CollectionUtil.isNotEmpty(trialOrders)) { if (CollectionUtil.isNotEmpty(accountList) || CollectionUtil.isNotEmpty(trialOrders)) {
throw new BusinessException("The email has already been registered"); throw new BusinessException("The email has already been registered");
@@ -1261,12 +1262,12 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
static { static {
HikariConfig config = new HikariConfig(); HikariConfig config = new HikariConfig();
config.setJdbcUrl("jdbc:mysql://code-create.com.hk:3306/db1nfvsgmjp3b8"); // config.setJdbcUrl("jdbc:mysql://code-create.com.hk:3306/db1nfvsgmjp3b8");
config.setUsername("uafqtz4gsvfrw"); // config.setUsername("uafqtz4gsvfrw");
config.setPassword("aida123456."); // config.setPassword("aida123456.");
// config.setJdbcUrl("jdbc:mysql://localhost:3306/code-create-local?serverTimezone=UTC"); config.setJdbcUrl("jdbc:mysql://localhost:3306/code-create-local?serverTimezone=UTC");
// config.setUsername("root"); config.setUsername("root");
// config.setPassword("root"); config.setPassword("root");
config.addDataSourceProperty("cachePrepStmts", "true"); config.addDataSourceProperty("cachePrepStmts", "true");
config.addDataSourceProperty("prepStmtCacheSize", "250"); config.addDataSourceProperty("prepStmtCacheSize", "250");
config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048"); config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");

3
src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java
View File

@@ -401,6 +401,7 @@ public class AffiliateServiceImpl extends ServiceImpl<AffiliateMapper, Affiliate
return baseMapper.selectOne(queryWrapper); return baseMapper.selectOne(queryWrapper);
} }
/* 合代码重复了
public void calcCouponsCommission(){ public void calcCouponsCommission(){
// id存redis // id存redis
String lastTime = redisUtil.getFromString(RedisUtil.PAYMENT_INFO_LAST_SCAN_TIME); String lastTime = redisUtil.getFromString(RedisUtil.PAYMENT_INFO_LAST_SCAN_TIME);
@@ -441,7 +442,7 @@ public class AffiliateServiceImpl extends ServiceImpl<AffiliateMapper, Affiliate
} }
} }
redisUtil.addToString(RedisUtil.PAYMENT_INFO_LAST_SCAN_TIME, currentTime); redisUtil.addToString(RedisUtil.PAYMENT_INFO_LAST_SCAN_TIME, currentTime);
} }*/
@Override @Override
public List<Map<String, Object>> getAllAffiliateUsername(){ public List<Map<String, Object>> getAllAffiliateUsername(){

3
src/main/resources/application-dev.properties
View File

@@ -1,7 +1,8 @@
server.port=5567 server.port=5567
spring.datasource.primary.driver-class-name=com.mysql.cj.jdbc.Driver 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.username=aida_con
spring.datasource.primary.password=123456 spring.datasource.primary.password=123456