BUGFIX:设置上传文件大小，正式用户转试用用户

src/main/java/com/ai/da/service/impl/AccountServiceImpl.java

@@ -476,8 +476,15 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
                 .eq(Account::getUserName, accountTrialDTO.getUserName());
         List<Account> accountList = accountMapper.selectList(qw);
         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);
+//                account.setIsTrial(1);
+//                accountMapper.updateById(account);
+//            }
+        }
         // 接收到数据后要形成一条使用订单信息
         TrialOrder trialOrder = CopyUtil.copyObject(accountTrialDTO, TrialOrder.class);
         trialOrder.setCreateTime(LocalDateTime.now());
@@ -491,6 +498,14 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
             trialOrder.setUpdateTime(LocalDateTime.now());
             trialOrderMapper.updateById(trialOrder);
             Account account = new Account();
+            if (CollectionUtil.isNotEmpty(accountList)) {
+                account = CopyUtil.copyObject(accountList.get(0), Account.class);
+                account.setIsTrial(1);
+                account.setIsBeginner(1);
+                account.setValidStartTime(System.currentTimeMillis());
+                account.setValidEndTime(Instant.now().plus(3, ChronoUnit.DAYS).toEpochMilli());
+                accountMapper.updateById(account);
+            }else {
                 account.setUserName(trialOrder.getUserName());
                 account.setUserPassword("Third-000000");
                 account.setUserEmail(trialOrder.getEmail());
@@ -501,6 +516,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
                 account.setIsTrial(1);
                 account.setIsBeginner(1);
                 accountMapper.insert(account);
+            }
             // 发送邮件提醒用户试用用户已创建
             SendEmailUtil.sendCustomEmail("1023316923@qq.com", null, trialOrder,2);
             SendEmailUtil.sendCustomEmail(account.getUserEmail(), null, trialOrder, 3);
@@ -522,7 +538,22 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
             trialOrder.setStatus(1);
             trialOrder.setUpdateTime(LocalDateTime.now());
             trialOrderMapper.updateById(trialOrder);
+
+            QueryWrapper<Account> qw = new QueryWrapper<>();
+            qw.lambda().eq(Account::getUserEmail, trialOrder.getEmail())
+                    .or()
+                    .eq(Account::getUserName, trialOrder.getUserName());
+            List<Account> accountList = accountMapper.selectList(qw);
+
             Account account = new Account();
+            if (CollectionUtil.isNotEmpty(accountList)) {
+                account = CopyUtil.copyObject(accountList.get(0), Account.class);
+                account.setIsTrial(1);
+                account.setIsBeginner(1);
+                account.setValidStartTime(System.currentTimeMillis());
+                account.setValidEndTime(Instant.now().plus(3, ChronoUnit.DAYS).toEpochMilli());
+                accountMapper.updateById(account);
+            }else {
                 account.setUserName(trialOrder.getUserName());
                 account.setUserPassword("Third-000000");
                 account.setUserEmail(trialOrder.getEmail());
@@ -533,6 +564,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
                 account.setIsTrial(1);
                 account.setIsBeginner(1);
                 accountMapper.insert(account);
+            }
             // 发送邮件提醒用户试用用户已创建
             SendEmailUtil.sendCustomEmail("1023316923@qq.com", null, trialOrder,2);
             SendEmailUtil.sendCustomEmail(account.getUserEmail(), null, trialOrder, 3);

src/main/resources/application-prod.properties

@@ -36,8 +36,8 @@ file.linux.path=/workspace/home/aida/file/
 #linux服务器域名(预览和下载用)
 file.linuxDomain=https://www.aida.com.hk/download/
 file.windows.path=D:\\upload\\
-spring.servlet.multipart.max-file-size = 5MB
+spring.servlet.multipart.max-file-size = 10MB
-spring.servlet.multipart.max-request-size= 5MB
+spring.servlet.multipart.max-request-size= 10MB
 #访问python服务的ip(对应环境)
 #access.python.ip=http://43.198.80.117
 access.python.ip=http://18.167.251.121