From a472d61262e6efc27eecc195d6b92fea36c17354 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 17 Jul 2023 11:16:09 +0800
Subject: [PATCH] chore: 提交测试
---
screen-job/src/main/resources/application-qa.yml | 17 +++++++++--------
screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java | 5 +++++
screen-manage/src/main/resources/application-qa.yml | 14 +++++++-------
3 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java b/screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java
index 5032f23..f75ad1d 100644
--- a/screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java
+++ b/screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java
@@ -30,6 +30,11 @@
@Autowired
private CityAqiYearlyService cityAqiYearlyService;
+ @XxlJob("insertHistoryAqisss")
+ public ReturnT insertHistoryAqisss() {
+ System.out.println("���������job");
+ return ReturnT.SUCCESS;
+ }
//���������aqi������������������
@XxlJob("insertHistoryAqi")
public ReturnT insertHistoryAqi() {
diff --git a/screen-job/src/main/resources/application-qa.yml b/screen-job/src/main/resources/application-qa.yml
index d1dde95..d52585e 100644
--- a/screen-job/src/main/resources/application-qa.yml
+++ b/screen-job/src/main/resources/application-qa.yml
@@ -18,9 +18,9 @@
application:
name: screen-job
redis:
- host: r-bp1xdlb9wfc6zt0msppd.redis.rds.aliyuncs.com
+ host: r-bp1hez4g7rkqjswpaypd1.redis.rds.aliyuncs.com
port: 6379
- password: moral_qx_12345
+ password: moral_123456
timeout: 30000
jedis:
pool:
@@ -35,9 +35,9 @@
max-wait: 30000
min-idle: 32
tokenRedis:
- host: r-bp1xdlb9wfc6zt0msppd.redis.rds.aliyuncs.com
+ host: r-bp1hez4g7rkqjswpaypd1.redis.rds.aliyuncs.com
port: 6379
- password: moral_qx_12345
+ password: moral_123456
timeout: 30000
database: 14
pool:
@@ -55,9 +55,9 @@
filters: stat
type: com.alibaba.druid.pool.DruidDataSource
max-wait: 60000
- url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk8o2.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
- username: moral_qx
- password: moral_qx_12345
+ url: jdbc:mysql://121.199.44.85:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ username: root
+ password: moral_123456
test-on-borrow: false
sql-script-encoding: utf-8
pool-prepared-statements: true
@@ -86,7 +86,7 @@
job:
admin:
# ���������������������������������������������������������������������������������������������������������������������������������"���������������������"���"������������������"
- addresses: http://127.0.0.1:8090/xxl-job-admin
+ addresses: http://120.26.43.34:8090/xxl-job-admin
#���������������TOKEN������TOKEN���������������
accessToken:
@@ -100,6 +100,7 @@
appname: xxl-job-executor-sample-springboot
ip:
port: 9999
+
#���������������������������������������������������������������������������������������
logpath: /data/applogs/xxl-job/jobhandler
#������������������������������������������������������������������������������������������������������3���������������������-1���������������
diff --git a/screen-manage/src/main/resources/application-qa.yml b/screen-manage/src/main/resources/application-qa.yml
index 1d3f861..7e3808b 100644
--- a/screen-manage/src/main/resources/application-qa.yml
+++ b/screen-manage/src/main/resources/application-qa.yml
@@ -18,9 +18,9 @@
application:
name: screen-manage
redis:
- host: r-bp1xdlb9wfc6zt0msppd.redis.rds.aliyuncs.com
+ host: r-bp1hez4g7rkqjswpaypd1.redis.rds.aliyuncs.com
port: 6379
- password: moral_qx_12345
+ password: moral_123456
timeout: 30000
jedis:
pool:
@@ -35,9 +35,9 @@
max-wait: 30000
min-idle: 32
tokenRedis:
- host: r-bp1xdlb9wfc6zt0msppd.redis.rds.aliyuncs.com
+ host: r-bp1hez4g7rkqjswpaypd1.redis.rds.aliyuncs.com
port: 6379
- password: moral_qx_12345
+ password: moral_123456
timeout: 30000
database: 14
pool:
@@ -55,9 +55,9 @@
filters: stat
type: com.alibaba.druid.pool.DruidDataSource
max-wait: 60000
- url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk8o2.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
- username: moral_qx
- password: moral_qx_12345
+ url: jdbc:mysql://121.199.44.85:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ username: root
+ password: moral_123456
test-on-borrow: false
sql-script-encoding: utf-8
pool-prepared-statements: true
--
Gitblit v1.8.0