From 20662f11dc1888e1e737e41e938cb4cc320a44cc Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 19 Dec 2024 11:40:20 +0800
Subject: [PATCH] refactor(config): 重构配置文件并添加新配置
---
src/main/resources/application-chain.yml | 92 ++++++++++++++++++++++++++++++
src/main/java/cc/mrbird/febs/mall/dto/ApiGetRunDateDto.java | 2
src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java | 2
src/main/java/cc/mrbird/febs/mall/vo/ApiChartVo.java | 4
src/main/resources/application-dev.yml | 17 ++++-
src/main/resources/application-prod.yml | 25 +++++--
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 2
7 files changed, 128 insertions(+), 16 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/ApiGetRunDateDto.java b/src/main/java/cc/mrbird/febs/mall/dto/ApiGetRunDateDto.java
index be2dce8..4b7607c 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/ApiGetRunDateDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/ApiGetRunDateDto.java
@@ -11,7 +11,7 @@
public class ApiGetRunDateDto {
@NotBlank(message = "参数不能为空")
- @ApiModelProperty(value = "日期的年月日")
+ @ApiModelProperty(value = "日期的年月日 2014-12-01")
private String dateStr;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 3801332..60be509 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -1610,7 +1610,7 @@
sortedList.forEach(entry -> {
ApiChartVo apiChartVo = new ApiChartVo();
MallMember mallMember = this.baseMapper.selectById(entry.getKey());
- apiChartVo.setPhone(mallMember.getPhone());
+ apiChartVo.setName(mallMember.getName());
apiChartVo.setAvatar(mallMember.getAvatar());
apiChartVo.setScore(entry.getValue());
apiChartVos.add(apiChartVo);
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/ApiChartVo.java b/src/main/java/cc/mrbird/febs/mall/vo/ApiChartVo.java
index 1a99ce0..f6ecbad 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/ApiChartVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/ApiChartVo.java
@@ -10,8 +10,8 @@
@ApiModel(value = "ApiChartVo", description = "信息返回类")
public class ApiChartVo {
- @ApiModelProperty(value = "手机号")
- private String phone;
+ @ApiModelProperty(value = "昵称")
+ private String name;
@ApiModelProperty(value = "头像")
private String avatar;
diff --git a/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java b/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java
index 2bc0e14..9ee6f75 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java
@@ -6,6 +6,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Component;
/**
@@ -14,6 +15,7 @@
**/
@Slf4j
@Component
+@ConditionalOnProperty(prefix = "consumer", name = "open", havingValue = "true")
public class AgentConsumer {
@Autowired
private IAgentService agentService;
diff --git a/src/main/resources/application-chain.yml b/src/main/resources/application-chain.yml
new file mode 100644
index 0000000..c77b519
--- /dev/null
+++ b/src/main/resources/application-chain.yml
@@ -0,0 +1,92 @@
+spring:
+ datasource:
+ dynamic:
+ # 是否开启 SQL日志输出，生产环境建议关闭，有性能损耗
+ p6spy: false
+ hikari:
+ connection-timeout: 30000
+ max-lifetime: 1800000
+ max-pool-size: 15
+ min-idle: 5
+ connection-test-query: select 1
+ pool-name: FebsHikariCP
+ # 配置默认数据源
+ primary: base
+ datasource:
+ # 数据源-1，名称为 base
+ base:
+ username: db_e2
+ password: db_e20806123!@#
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://127.0.0.1:3306/db_e2?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+
+ redis:
+ # Redis数据库索引（默认为 0）
+ database: 15
+ # Redis服务器地址
+ host: 127.0.0.1
+ # Redis服务器连接端口
+ port: 6379
+ # Redis 密码
+ password: 1234!@#$!QAZ
+ lettuce:
+ pool:
+ # 连接池中的最小空闲连接
+ min-idle: 8
+ # 连接池中的最大空闲连接
+ max-idle: 500
+ # 连接池最大连接数（使用负值表示没有限制）
+ max-active: 2000
+ # 连接池最大阻塞等待时间（使用负值表示没有限制）
+ max-wait: 10000
+ # 连接超时时间（毫秒）
+ timeout: 5000
+ rabbitmq:
+ host: 127.0.0.1
+ port: 5672
+ username: xc_rabbit
+ password: xuncong123
+ publisher-confirm-type: correlated
+
+pay:
+ ali:
+ appId: 2016120704000539
+ # 支付宝公钥
+ publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAobfti31eIy4U59JUrL+eMosuY97jk444eFyMeoxkG1ljJ3GytPV7YlLL6TVgvON6eR0eFvWKK4MoTEW0TkpxgmuurkpTSXDB0bNiuYJQyiju4Bikt83dQo64YKYDSwBNA9hFPHFM1mhWpJM/3mYjbbLT9AoL8q+n1fBxFtcAMmxXBqZiECT8qzuTV3VfTufXsNhY9LJXcDkAr98GZDEbH+Zhr5die2Rzpvj9o8aSs6J0IU+PJpU+SPZEjpITAPtLauKEV2MFGUaxnli1PgJexW8OW9smCDZPhIce6vYYwn0wQKtnFla0zWPe2r85egggE0y9SJs5zQX5F3OlJzLS/wIDAQAB
+ # 支付宝私钥
+ privateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCht+2LfV4jLhTn0lSsv54yiy5j3uOTjjh4XIx6jGQbWWMncbK09XtiUsvpNWC843p5HR4W9YorgyhMRbROSnGCa66uSlNJcMHRs2K5glDKKO7gGKS3zd1CjrhgpgNLAE0D2EU8cUzWaFakkz/eZiNtstP0Cgvyr6fV8HEW1wAybFcGpmIQJPyrO5NXdV9O59ew2Fj0sldwOQCv3wZkMRsf5mGvl2J7ZHOm+P2jxpKzonQhT48mlT5I9kSOkhMA+0tq4oRXYwUZRrGeWLU+Al7Fbw5b2yYINk+Ehx7q9hjCfTBAq2cWVrTNY97avzl6CCATTL1ImznNBfkXc6UnMtL/AgMBAAECggEAXLwJBr0sV0YcjNcK4Ui8YcV4I6Lzo3ChpzuC/t80pI48kqjbTnOafkZ2UdPfFlHnsD3nPEkvI0aBvEMYYvDDaINxVtaeLfXv3t1cFn7I7zRLzsuy4Qe3AmyvBBUOvFp+z16cTU23Pxfz30nlDRZK6KPscPu14EOkHcVUREGkBkU6Gqft38Vd21ClRmh76oWsYCGzJkx547blVMAWJw+fGgHerrdwaSOlvD8Tj20dnCU7ifvUNQiWsdn6wOdUz24o4oB8kSBmZbOYCviljvqeHo2SZlIuneiXwz9TanOvlIaGkVeHnJvNd3S6FRXTmcTZQpW9RtDBZF0o1Oh+W44Q6QKBgQDbVwsD3GdFFlYWUMvtTGUcHqtzrvWDln6Lh0vtEmQIA28aDBre2URRYm+AhqfsjiAz1WwVVVeBjbSk7ZJv0kWWvJiA8/2XyZhHdDidWvhndQJD5HLK9IqPNDd6WA9cW/SQs2ehtqUVM55IzsYZK2Tbnb9UYuIHTHiMExL/jOGq0wKBgQC8v2rPC02+qVJyx82Gq6CD57EuirKTA1ZUFQIBRbfccqMoYaJogREUjlUNN5mZAuQ6yLqOHi79v6G/7NegP4WavIRJ/W9jqjLXP1AJ/jeo9IGu96HCsV2+M/5DRD/zrZakQMJPZYrgZOqjtL1qLcKdpuXumT0VAyy41yoU0jvDpQKBgQCvyABR5c71dUMkuzfTQ0g80u+A1JR6Ep/z3kghBH4aVfYyH8VhFypDNuo5TLFDSVvRbpciObTZZOGC08ppx1Bxz09A+Ukg3jUl/qRop0EwWHuqQWkl8fkhby2O5Qfacu97D+xbk26VoTqXCu+DuF0qDDALxvtx8f0h9R9iolswdQKBgE5+sLWwNsHe+vnfHBswjw2sMmRvq/o1vhYzsmTDEMauKipmCDu7yVWqJ7bac5dNu4qy5dqqtNI0etktbzMml7KVSdLXghaJtqELpIazYYRzQud39p7YUmsChnCFFq+JdoeSovyP9ySA84/nX4qjwzb7LM6AjgWKD3RDjy2fjNk9AoGBANEJdXJhwon+cMfPT9XfCVee0Cr//91WzfGYnVpevRuYp/q29rcZ0mZiXPfvge0vogZEFHIzsQfjtW84W4H81aSbFj9lncIzRl4O8yFGsr1Y9wkewmQqylM+A/I4eu9UcpK/hJX5G07EnCuZCabj12CGnA3uA9Icgg28jbg2BCR6
+ # 回调地址
+ noticeUrl: http://120.27.238.55:8801/api/pay/aliCallBack
+ domain: https://openapi.alipay.com/gateway.do
+
+xcx:
+ wechar_login_url: https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
+ xcx_appid: wxad2fdb2fcad10fb2
+ xcx_secret: 9bb58d655bff419feec3a6d948ca8b8d
+ debug: false
+ wecharPaynotifyUrl: http://api.blnka.cn/api/xcxPay/wxpayCallback
+ wecharRechargePaynotifyUrl: http://api.blnka.cn/api/xcxPay/rechargeCallBack
+ certLocalPath: /home/blnkaCert/apiclient_cert.p12
+ wecharpayMchid: 1658958205
+ wecharpaySecret: daL341aN5orDt13puXadsAf2rpuXdq4r
+ wecharpaySecretV3: daL341aN5orDt13puXadsAf2rpuX12v3
+ gaodeKey: 95ede7157929f5f6b6c758971be924b1
+ serviceName: yiyuanshucai
+
+static:
+ resource:
+ url: https://res.runstep.cc/
+ path: /home/javaweb/webresource/runstep/
+
+system:
+ job: false
+ runStep: false
+
+chain:
+ bsc: true
+ trc: true
+
+# rabbitMq 消费者
+# true：启动消费者 false：关闭消费者
+consumer:
+ open: false
\ No newline at end of file
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 7356a45..888ed08 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -75,9 +75,18 @@
static:
resource:
- url: https://res.mye2u.com/
- path: /home/javaweb/resource/
+ url: https://res.runstep.cc/
+ path: /home/javaweb/webresource/runstep/
system:
- job: true
- runStep: true
\ No newline at end of file
+ job: false
+ runStep: false
+
+chain:
+ bsc: false
+ trc: false
+
+# rabbitMq 消费者
+# true：启动消费者 false：关闭消费者
+consumer:
+ open: false
\ No newline at end of file
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 712ce34..9f3b963 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -22,13 +22,13 @@
redis:
# Redis数据库索引（默认为 0）
- database: 1
+ database: 15
# Redis服务器地址
host: 127.0.0.1
# Redis服务器连接端口
port: 6379
# Redis 密码
- password: lianghua1!qaz2@WSX
+ password: 1234!@#$!QAZ
lettuce:
pool:
# 连接池中的最小空闲连接
@@ -44,8 +44,8 @@
rabbitmq:
host: 127.0.0.1
port: 5672
- username: e20210816
- password: e20210816
+ username: xc_rabbit
+ password: xuncong123
publisher-confirm-type: correlated
pay:
@@ -75,9 +75,18 @@
static:
resource:
- url: https://res.mye2u.com/
- path: /home/javaweb/resource/
+ url: https://res.runstep.cc/
+ path: /home/javaweb/webresource/runstep/
system:
- job: true
- runStep: true
\ No newline at end of file
+ job: false
+ runStep: true
+
+chain:
+ bsc: false
+ trc: false
+
+# rabbitMq 消费者
+# true：启动消费者 false：关闭消费者
+consumer:
+ open: true
\ No newline at end of file
--
Gitblit v1.9.1