From 95e469fa6e977a7bd91d955f75998455577fe571 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 19 八月 2025 19:29:57 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QYTDriving
---
driver/guns-admin/src/main/resources/logback-spring.xml | 18 +++------
driver/guns-admin/src/main/resources/application-dev.yml | 7 ++-
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PushUtil.java | 6 ++-
driver/guns-admin/src/main/resources/application-prod.yml | 3 +
driver/guns-admin/src/main/resources/application-test.yml | 47 ++++++++++++++---------
driver/pom.xml | 4 +-
6 files changed, 49 insertions(+), 36 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PushUtil.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PushUtil.java
index 7359816..ef12185 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PushUtil.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PushUtil.java
@@ -10,6 +10,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
@@ -27,8 +28,9 @@
public class PushUtil {
Logger logger = LoggerFactory.getLogger("ServiceLog");
-
- private final String socket_uri = "http://192.168.110.85:6000";
+
+ @Value("${qyt.socket_uri}")
+ private String socket_uri;
diff --git a/driver/guns-admin/src/main/resources/application-dev.yml b/driver/guns-admin/src/main/resources/application-dev.yml
index ee3f4d9..398e7b0 100644
--- a/driver/guns-admin/src/main/resources/application-dev.yml
+++ b/driver/guns-admin/src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
server:
- port: 8007
+ port: 7007
guns:
swagger-open: true #是否开启swagger (true/false)
@@ -42,7 +42,7 @@
eureka:
client:
service-url: #注册中心地址
- defaultZone: http://sinata:sinata@192.168.110.106:8001/eureka #启用身份验证的方式连接
+ defaultZone: http://sinata:sinata@127.0.0.1:7000/eureka #启用身份验证的方式连接
register-with-eureka: true #在注册中心进行注册
fetch-registry: true #从Eureka中获取注册信息。
@@ -110,6 +110,9 @@
mongodb:
uri: mongodb://192.168.110.80:27017/test
+
+qyt:
+ socket_uri: http://10.88.188.138:6000
---
rongyun:
diff --git a/driver/guns-admin/src/main/resources/application-produce.yml b/driver/guns-admin/src/main/resources/application-prod.yml
similarity index 98%
rename from driver/guns-admin/src/main/resources/application-produce.yml
rename to driver/guns-admin/src/main/resources/application-prod.yml
index 9af18a6..96ce4e3 100644
--- a/driver/guns-admin/src/main/resources/application-produce.yml
+++ b/driver/guns-admin/src/main/resources/application-prod.yml
@@ -110,6 +110,9 @@
mongodb:
uri: mongodb://192.168.110.80:27017/test
+qyt:
+ socket_uri: http://10.88.188.138:6000
+
---
rongyun:
diff --git a/driver/guns-admin/src/main/resources/application-test.yml b/driver/guns-admin/src/main/resources/application-test.yml
index efe01bf..3d5cb24 100644
--- a/driver/guns-admin/src/main/resources/application-test.yml
+++ b/driver/guns-admin/src/main/resources/application-test.yml
@@ -1,5 +1,5 @@
server:
- port: 8007
+ port: 7007
guns:
swagger-open: true #是否开启swagger (true/false)
@@ -28,9 +28,13 @@
max-request-size: 100MB
max-file-size: 100MB
redis:
- host: 192.168.110.80
- port: 6379
- password: 123456
+ host: 10.88.154.24
+ port: 7560
+ password: Idcs_B_2025rd141
+ database: 0
+ timeout: 1000
+ cluster:
+ nodes: 10.88.154.24:7560,10.88.154.34:7560,10.88.154.59:7560,10.88.154.98:7560,10.88.154.100:7560,10.88.154.109:7560
mybatis-plus:
typeAliasesPackage: com.supersavedriving.driver.modular
@@ -42,7 +46,7 @@
eureka:
client:
service-url: #注册中心地址
- defaultZone: http://sinata:sinata@127.0.0.1:8000/eureka #启用身份验证的方式连接
+ defaultZone: http://sinata:sinata@127.0.0.1:7000/eureka #启用身份验证的方式连接
register-with-eureka: true #在注册中心进行注册
fetch-registry: true #从Eureka中获取注册信息。
@@ -56,10 +60,10 @@
spring:
datasource:
- url: jdbc:mysql://121.31.232.206:3306/qyt_driving?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
- username: root
- password: 123456
- db-name: guns #用来搜集数据库的所有表
+ url: jdbc:mysql://10.86.17.201:5740/dj_qntest_ridingdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+ username: dj_qntest
+ password: dj_qntest123456$#@!
+ db-name: hn_ridingdb #用来搜集数据库的所有表
filters: wall,mergeStat
@@ -93,28 +97,35 @@
---
juhe: #聚合数据
- appKey: 0d3fd83eddaa33e5563f548257648577 #
+ appKey: 111 #
---
filePath: /usr/local/server/app/orderPostionFile/ #存储订单轨迹文件路径
-callbackPath: http://121.31.232.206:3002/driver
+callbackPath: https://test-qncx.sitechcloud.com/daijia/driver-server
---
-
spring:
data:
mongodb:
- uri: mongodb://192.168.110.80:27017/test
+ host: 10.88.204.206
+ port: 27009
+ username: qn_riding_adm
+ password: QN_riding@Prom2025
+ database: qn_ridingdb
+
+
+qyt:
+ socket_uri: http://10.88.188.138:6000
---
rongyun:
- app_key: vnroth0kvgxso
- app_secret: tZsVNJ4kkBfi
+ app_key: 111
+ app_secret: 111
# mallbook 调起接口参数配置
@@ -122,13 +133,13 @@
# pay_url:mallbook接口地址 测试环境： https://uat.mallbook.cn/api 生产环境：https://cloudpay.mallbook.cn/api
pay_url: https://cloudpay.mallbook.cn/api
# merchant_no 业务系统商户平台编号，需替换为mallbook工作人员提供的商户编号
- merchant_no: MBH23056
+ merchant_no: 111
# version 接口版本号
version: 1.0.0
# channel_type 渠道类型 HF：汇付
channel_type: HF
# merchant_private_key 商户平台私钥，需要替换成商户平台自己生成的私钥
- merchant_private_key: MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBALHmyTrxPYcAwABnX+3VW9vxUftm57zBpnbfOT4vizMnKdpfCkIgtdbfdnSCtt637yWM2fxnZfItnhTeQA2lL8f4SXgZt/bVXfmAWi4IxQ+HJy0Qs8nNy2nnjICPBPcpWzHwUxQ/THHqU0a7b9B91J5DFcbQb25BHeRpHwkBw6A/AgMBAAECgYAmcWq2s/7Jt53F+JDAQkTRaHqAyyH0phwkv+QMzhVUfngK2lLLK2pf/nYIg16lDjY9dQx+AJIFHVp1w/kveayzOz3BIqPoznyIVYPolRGZCWPo+2vdp0CIdBh7zahST5g5Gem4cU47wO5hPYs1kXKPG4mUPtaIAMHFxhyLvIagAQJBAOS63AIZrRrldeNCVVNXbpAT52JuWLCgravM9coOh6scmG6UQwxxcott8hneHr9fazk2LHbHMxlG8F+dQPA0+D8CQQDHHJN7Dnske8oJ+1sq4uhQP3HMsmNIgth+ZcaZpiPcxnNKYVGhzAwTVV2ruFJle5ajebo6zfWuqJhtZGRNh1gBAkA/lRoXk1+lfGfa9tOVSVa4wm+t0xLgdqoQefdRZdyc2mQdSSWiTd8Tl0qXmkFd3X6G9uJBWnp/6lJjoektXOwtAkBsZTQsw99qJzIAaSRinpDWTxPG2j6OlR0DAqkxsG7JnAfbsEteh9TzGYAbIgdJVBTX/kbSCJn9ca85rnOkeVABAkAUbDfU3Z702z20NtwAxc1IkrtQ1lKuqSpj9/LuR1/6KRkYQsUWnUiOO9hu5YDWIcflFrnCenF8j8OnvGghltxT
+ merchant_private_key: 111
# mall_book_public_key mallbook测试环境公钥 不需要替换
- mall_book_public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq6OLZKgUHH5wOk9xSBgN7yC17r3PQwMlY9/IorqrOlaIqrU0eAVZ5+dWrJD/3bdu7Ctq8n8trTm/IUYs7wtMg5SKwyX4/N+KQc2N7LL4yCq4vNl41q9sYgrtA0QnZoucIZcq1mwyu7RTDC8Wp7LGddnlkJsmL8masgMxA6cc9NwIDAQAB
+ mall_book_public_key: 111
diff --git a/driver/guns-admin/src/main/resources/logback-spring.xml b/driver/guns-admin/src/main/resources/logback-spring.xml
index ca5b521..5409de7 100644
--- a/driver/guns-admin/src/main/resources/logback-spring.xml
+++ b/driver/guns-admin/src/main/resources/logback-spring.xml
@@ -7,8 +7,7 @@
<contextName>logback</contextName>
<!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
- <property name="log.path" value="/usr/local/server/app/logs/driver"/>
- <!--<property name="log.path" value="d:/logs/user"/>-->
+ <property name="log.path" value="/etraffic/server/logs/daijia/driver"/>
<!--0. 日志格式和颜色渲染 -->
<!-- 彩色日志依赖的渲染类 -->
@@ -44,7 +43,7 @@
<!-- 日志记录器的滚动策略，按日期，按大小记录 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志归档 -->
- <fileNamePattern>${log.path}/${artifactId}/%d{yyyy-MM-dd}/debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+ <fileNamePattern>${log.path}/%d{yyyy-MM-dd}/debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
@@ -154,7 +153,7 @@
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文档保留天数-->
- <maxHistory>200</maxHistory>
+ <maxHistory>15</maxHistory>
</rollingPolicy>
<!-- 此日志文档记录除了DEBUG级别的其它高于DEBUG的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -195,11 +194,10 @@
<appender-ref ref="ERROR_FILE" />
<appender-ref ref="ALL_FILE" />
</root>
- <logger name="ServiceLog" level="debug"/>
- <logger name="com.supersavedriving.driver.modular.system.dao" level="debug"/>
+ <logger name="com.stylefeng.guns.modular.system.dao" level="debug"/>
</springProfile>
- <springProfile name="fat">R
+ <springProfile name="test">
<root level="info">
<appender-ref ref="CONSOLE" />
<appender-ref ref="DEBUG_FILE" />
@@ -208,11 +206,9 @@
<appender-ref ref="ERROR_FILE" />
<appender-ref ref="ALL_FILE" />
</root>
- <logger name="ServiceLog" level="debug"/>
- <logger name="com.supersavedriving.driver.modular.system.dao" level="debug"/>
</springProfile>
- <springProfile name="produce">
+ <springProfile name="prod">
<root level="info">
<!-- 生产环境最好不配置console写文件 -->
<appender-ref ref="DEBUG_FILE" />
@@ -221,8 +217,6 @@
<appender-ref ref="ERROR_FILE" />
<appender-ref ref="ALL_FILE" />
</root>
- <logger name="ServiceLog" level="debug"/>
- <logger name="com.supersavedriving.driver.modular.system.dao" level="debug"/>
</springProfile>
</configuration>
\ No newline at end of file
diff --git a/driver/pom.xml b/driver/pom.xml
index 5784b35..c14767f 100644
--- a/driver/pom.xml
+++ b/driver/pom.xml
@@ -236,9 +236,9 @@
</properties>
</profile>
<profile>
- <id>produce</id>
+ <id>prod</id>
<properties>
- <spring.active>produce</spring.active>
+ <spring.active>prod</spring.active>
</properties>
</profile>
</profiles>
--
Gitblit v1.7.1