From 0cca24ee30e6bc0ea80dcb0186c33298bc808108 Mon Sep 17 00:00:00 2001 From: xupei Date: Wed, 9 Oct 2024 15:44:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8E=AF=E5=A2=83=E5=8F=8A?= =?UTF-8?q?=E6=89=93=E5=BC=80=E7=9B=91=E5=90=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ai/da/common/task/AccountTask.java | 8 +- .../com/ai/da/common/task/PaypalTask.java | 2 +- .../com/ai/da/common/task/StripeTask.java | 2 +- .../resources/application-local.properties | 153 ------------------ src/main/resources/application.properties | 4 +- 5 files changed, 8 insertions(+), 161 deletions(-) delete mode 100644 src/main/resources/application-local.properties diff --git a/src/main/java/com/ai/da/common/task/AccountTask.java b/src/main/java/com/ai/da/common/task/AccountTask.java index 103aa718..53d43f67 100644 --- a/src/main/java/com/ai/da/common/task/AccountTask.java +++ b/src/main/java/com/ai/da/common/task/AccountTask.java @@ -17,21 +17,21 @@ public class AccountTask { private AccountService accountService; /** 每周日晚上刷新 年付用户、月付用户的积分 */ -// @Scheduled(cron = "59 59 23 ? * SUN") + @Scheduled(cron = "59 59 23 ? * SUN") // @Scheduled(cron = "59 59 23 * * ?") public void refreshCreditsMonthly(){ log.info("每周日晚11：59：59刷新付费用户积分为 6000"); accountService.refreshCreditsWeekly(); } -// @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes + @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes public void getPaidUser(){ // 获取code-create 表中 指定日期之后 订单状态为wc-processing的订单 accountService.extendValidityForCC(); } // 每天凌晨0点执行一次 -// @Scheduled(cron = "0 0 0 * * ?") + @Scheduled(cron = "0 0 0 * * ?") public void cancelActivityBenefits(){ // 1、查询当前所有参与了活动且过期的用户 List accountList = accountService.getExpiredUserBySystemUser(4); @@ -44,7 +44,7 @@ public class AccountTask { } // 每天检测正式用户到期情况，每天凌晨0点执行 -// @Scheduled(cron = "0 0 0 * * ?") + @Scheduled(cron = "0 0 0 * * ?") public void paidUserToVisitor(){ // 1、查询当前已过期正式用户或试用用户 List accountList = accountService.getExpiredUserBySystemUser(1); diff --git a/src/main/java/com/ai/da/common/task/PaypalTask.java b/src/main/java/com/ai/da/common/task/PaypalTask.java index fa069971..865eaaa4 100644 --- a/src/main/java/com/ai/da/common/task/PaypalTask.java +++ b/src/main/java/com/ai/da/common/task/PaypalTask.java @@ -23,7 +23,7 @@ public class PaypalTask { @Resource private PayPalCheckoutService payPalCheckoutService; -// @Scheduled(cron = "0/30 * * * * ?") + @Scheduled(cron = "0/30 * * * * ?") public void orderConfirm() throws SerializeException { // log.info("PayPal orderConfirm 被执行......"); diff --git a/src/main/java/com/ai/da/common/task/StripeTask.java b/src/main/java/com/ai/da/common/task/StripeTask.java index d4a6fbaf..45d98997 100644 --- a/src/main/java/com/ai/da/common/task/StripeTask.java +++ b/src/main/java/com/ai/da/common/task/StripeTask.java @@ -22,7 +22,7 @@ public class StripeTask { @Resource private StripeService stripeService; -// @Scheduled(cron = "0/30 * * * * ?") + @Scheduled(cron = "0/30 * * * * ?") public void orderConfirm() throws SerializeException { // 查看超过30分钟以上仍未支付的订单 置为超时订单 diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties deleted file mode 100644 index e13b776d..00000000 --- a/src/main/resources/application-local.properties +++ /dev/null @@ -1,153 +0,0 @@ -server.port=5567 - -spring.datasource.primary.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.primary.jdbcUrl=jdbc:mysql://localhost:3306/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true -#spring.datasource.primary.driver-class-name=com.p6spy.engine.spy.P6SpyDriver -#spring.datasource.primary.jdbcUrl=jdbc:p6spy:mysql://localhost:3306/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true -spring.datasource.primary.username=root -spring.datasource.primary.password=root -#spring.datasource.primary.jdbcUrl=jdbc:p6spy:mysql://18.167.251.121:33008/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true -#spring.datasource.primary.username=aida_con -#spring.datasource.primary.password=123456 -spring.datasource.hikari.max-lifetime=120000 - -#spring.datasource.primary.driver-class-name=com.mysql.cj.jdbc.Driver -#spring.datasource.primary.jdbcUrl=jdbc:mysql://18.167.251.121:3306/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true -#spring.datasource.primary.username=root -#spring.datasource.primary.password=QWa998345 - -#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.username=aida_con -#spring.datasource.primary.password=123456 - -spring.datasource.secondary.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.secondary.jdbcUrl=jdbc:mysql://18.167.251.121:33008/attribute_retrieval_new_style?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true -spring.datasource.secondary.username=aida_con -spring.datasource.secondary.password=123456 - -#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.jdbcUrl=jdbc:mysql://localhost:3306/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true -#spring.datasource.username=aida_con -#spring.datasource.username=root -#spring.datasource.password=123456 -#spring.datasource.password=root -#spring.datasource.password=QWa998345 - -#security -spring.security.jwtSecret=JWTSECRET -spring.security.jwtTokenHeader=Authorization -spring.security.jwtTokenPrefix=Bearer- -## 24Сʱ -spring.security.jwtExpiration=8640000000 -#spring security权限设置 认证了token还要认证权限 不然报错Full authentication is required to access this resource -spring.security.ignorePaths=/,/favicon.ico,/doc.html,/webjars/**,/swagger-resources,/v2/api-docs,\ - /api/account/**,/api/element/**,/api/python/**,/api/design/**,/api/history/**,/api/library/**,/api/third/party/**,/api/generate/**,/api/workspace/**,/api/classification/**,\ - /api/product/**,/api/ali-pay/**,/api/order-info/**,/api/paypal/**,/api/credits/**,/api/inquiry/**,/api/tasks/**,/api/python/prepareForSR,/api/alipay-hk/**,/api/portfolio/**,\ - /api/message/**,/notification/**,/api/tags/** -spring.security.authApi=/auth/login - - -rsa.private_key=MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A== - -#mybatis -mybatis-plus.global-config.banner=false -mybatis-plus.mapper-locations=classpath:mapper/*Mapper.xml -#mybatis-plus.configuration.log-impl= org.apache.ibatis.logging.stdout.StdOutImpl -mybatis-plus.global-config.db-config.logic-delete-field=isDeleted -mybatis-plus.global-config.db-config.logic-delete-value=1 -mybatis-plus.global-config.db-config.logic-not-delete-value=0 -mybatis-plus.global-config.db-config.performance-interceptor.format=true -mybatis-plus.global-config.db-config.performance-interceptor.max-time=1000 - -spring.mvc.pathmatch.matching-strategy=ant_path_matcher - -file.mac.path=~/file/ -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 = 10MB -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 -#access.python.ip=http://18.167.251.121:9991/ -access.python.port=9994 -access.python.generate_sr_port=9996 -#access.python.sr=http://18.167.251.121:9995 -access.python.address=http://18.167.251.121:9996 - -minio.endpoint=https://www.minio.aida.com.hk:12024 -minio.accessKey=admin -minio.secretKey=Aidlab123123! -minio.bucketName.clothing=aida-clothing -minio.bucketName.mannequins=aida-mannequins -minio.bucketName.results=aida-results -minio.bucketName.sysImage=aida-sys-image -minio.bucketName.users=aida-users -minio.bucketName.collectionElement=aida-collection-element -minio.bucketName.gradient=aida-gradient -minio.bucketName.slogan=aida-slogan -minio.bucketName.modifiedSketch=aida-modified-sketch -redirect_url=http://18.167.251.121:7788 - -#spring.rabbitmq.host=127.0.0.1 -#spring.rabbitmq.port=5672 -#spring.rabbitmq.username=guest -#spring.rabbitmq.password=guest -#spring.rabbitmq.virtual-host=/ - -spring.rabbitmq.host=18.167.251.121 -spring.rabbitmq.port=5672 -spring.rabbitmq.username=rabbit -spring.rabbitmq.password=123456 -spring.rabbitmq.virtual-host=/ - -#spring.redis.host=172.31.11.32 -spring.redis.host=127.0.0.1 -spring.redis.port=6379 -spring.redis.database=1 -#spring.redis.password=Aidlab -spring.redis.lettuce.pool.max-active=8 -spring.redis.lettuce.pool.max-idle=8 -spring.redis.lettuce.pool.min-idle=0 -spring.redis.lettuce.pool.max-wait=5 - -redis.key.orderForGenerate=OrderForGenerate -redis.key.generateCancelSet=GenerateCancelSet -redis.key.generateExceptionMap=Generate:Exception -redis.key.resultMap=ResultMap -redis.key.orderForSR=OrderForSR -redis.key.SRCancelSet=SRCancelSet -redis.key.SRExceptionMap=SRExceptionMap -redis.key.taskList=TaskList -redis.key.credits.pre-deduction=Credits:PreDeduction -redis.key.generateResult=Generate:Result -redis.key.toProductImageResultKey=ToProductImage:Result -redis.key.relightResultKey=Relight:Result -redis.key.newPosted=LastViewNewPostedTime -redis.key.maximumUserId=CodeCreate:MaximumUserId - -aws.s3.accessKeyId=AKIAVD3OJIMF6UJFLSHZ -aws.s3.secretKey=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 -aws.s3.regionName=ap-east-1 - -# 客服 customer service -cs.max-customer-per-service: 2 -cs.welcome: Welcome! Any questions? -cs.auto-reply-after-work: Sorry, we are all off, you can leave your questions and we will respond to you. -cs.unified-service-name: Great Company -cs.always-display-unified-service-name: true -cs.service-down: Sorry, the service network is abnormal and disconnected - -# RabbitMQ Exchange and Queue configurations -rabbitmq.queues.generate=generate-queue-local -rabbitmq.queues.sr=SR-queue-local -rabbitmq.queues.srResult=SuperResolution-local -rabbitmq.queues.generateResult=GenerateImage-local -rabbitmq.queues.toProductImageResult=ToProductImage-local -rabbitmq.queues.relightResult=Relight-local -rabbitmq.exchange.generate=generate-exchange diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 33c9ec51..8550475d 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,7 +2,7 @@ #spring.profiles.active=test #����application-prod�ļ�(��������) -#spring.profiles.active=prod +spring.profiles.active=prod #����application-dev�ļ�(��������) -spring.profiles.active=local +#spring.profiles.active=dev