From cb7099264ea5c2f94af8f4901f7df91c014f1fac Mon Sep 17 00:00:00 2001 From: xupei Date: Fri, 10 Jan 2025 16:54:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E9=82=AE=E7=AE=B1=E6=97=B6?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=A1=AB=E5=86=99=E5=9B=BD=E5=AE=B6=E5=92=8C?= =?UTF-8?q?=E8=81=8C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ai/da/common/task/PaymentTask.java | 2 +- .../com/ai/da/common/utils/RequestInfoUtil.java | 2 +- .../com/ai/da/controller/AccountController.java | 4 ++-- .../java/com/ai/da/service/AccountService.java | 4 ++-- .../ai/da/service/impl/AccountServiceImpl.java | 16 +++++++++------- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/ai/da/common/task/PaymentTask.java b/src/main/java/com/ai/da/common/task/PaymentTask.java index a7fe8ffb..40450055 100644 --- a/src/main/java/com/ai/da/common/task/PaymentTask.java +++ b/src/main/java/com/ai/da/common/task/PaymentTask.java @@ -102,7 +102,7 @@ public class PaymentTask { } -// @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes + @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes public void updateAffiliateInfoWithPayment(){ affiliateService.updateAffiliateInfoWithPayment(); } diff --git a/src/main/java/com/ai/da/common/utils/RequestInfoUtil.java b/src/main/java/com/ai/da/common/utils/RequestInfoUtil.java index afa6497a..d041362f 100644 --- a/src/main/java/com/ai/da/common/utils/RequestInfoUtil.java +++ b/src/main/java/com/ai/da/common/utils/RequestInfoUtil.java @@ -56,7 +56,7 @@ public class RequestInfoUtil { /** * 免费 API 服务可能有请求频率限制，如果你需要处理大量 IP 地址，可能需要考虑使用付费服务或购买 IP 地理位置数据库。此外，始终要遵守 API 提供商的使用条款和隐私政策 - * @param ip + * @param ip https://ip-api.com/docs/api:json 使用的接口api * @return * { * "query": "24.48.0.1", diff --git a/src/main/java/com/ai/da/controller/AccountController.java b/src/main/java/com/ai/da/controller/AccountController.java index 7a4f4d84..51b1c3f6 100644 --- a/src/main/java/com/ai/da/controller/AccountController.java +++ b/src/main/java/com/ai/da/controller/AccountController.java @@ -326,8 +326,8 @@ public class AccountController { @GetMapping("/bindEmail") @ApiOperation(value = "绑定邮箱") - public Response bindEmail(@RequestParam("email") String email) { - return Response.success(accountService.bindEmail(email)); + public Response bindEmail(@RequestParam("email") String email, @RequestParam("country") String country, @RequestParam("occupation") String occupation) { + return Response.success(accountService.bindEmail(email, country, occupation)); } @GetMapping("/unbindWeChat") diff --git a/src/main/java/com/ai/da/service/AccountService.java b/src/main/java/com/ai/da/service/AccountService.java index 770143f0..2e579451 100644 --- a/src/main/java/com/ai/da/service/AccountService.java +++ b/src/main/java/com/ai/da/service/AccountService.java @@ -3,7 +3,6 @@ package com.ai.da.service; import com.ai.da.common.response.PageBaseResponse; import com.ai.da.mapper.primary.entity.Account; import com.ai.da.mapper.primary.entity.AccountExtend; -import com.ai.da.mapper.primary.entity.GoogleUser; import com.ai.da.mapper.primary.entity.TrialOrder; import com.ai.da.model.dto.*; import com.ai.da.model.vo.AccountLoginVO; @@ -49,7 +48,8 @@ public interface AccountService extends IService { * @return */ Boolean bindEmail(AccountBindEmailDTO accountBindEmailDTO); - Boolean bindEmail(String email); + + Boolean bindEmail(String email, String country, String occupation); /** * 忘记密码 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 9197b95e..118edb37 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -1263,12 +1263,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"); @@ -2586,10 +2586,12 @@ public class AccountServiceImpl extends ServiceImpl impl } @Override - public Boolean bindEmail(String email) { + public Boolean bindEmail(String email, String country, String occupation) { AuthPrincipalVo userHolder = UserContext.getUserHolder(); Account account = accountMapper.selectById(userHolder.getId()); account.setUserEmail(email); + account.setCountry(country); + account.setOccupation(occupation); accountMapper.updateById(account); return Boolean.TRUE; }