From 83415cfdd58de2ce95b874cc1be9bc5112b8baa2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 19 八月 2025 19:46:22 +0800
Subject: [PATCH] 修改bug
---
management/guns-admin/src/main/resources/application-test.yml | 65 +++++++--------
management/guns-admin/src/main/resources/logback-spring.xml | 14 +--
driver/guns-admin/src/main/resources/logback-spring.xml | 2
management/guns-admin/pom.xml | 12 +-
management/pom.xml | 4
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TActivityController.java | 9 ++
zuul/pom.xml | 23 +++++
user/guns-admin/src/main/resources/logback-spring.xml | 2
eureka/pom.xml | 25 ++++++
eureka/src/main/resources/application.yml | 25 -----
management/guns-admin/src/main/resources/application-prod.yml | 0
zuul/src/main/resources/application.yml | 44 ----------
12 files changed, 104 insertions(+), 121 deletions(-)
diff --git a/driver/guns-admin/src/main/resources/logback-spring.xml b/driver/guns-admin/src/main/resources/logback-spring.xml
index 5409de7..cdfd759 100644
--- a/driver/guns-admin/src/main/resources/logback-spring.xml
+++ b/driver/guns-admin/src/main/resources/logback-spring.xml
@@ -7,7 +7,7 @@
<contextName>logback</contextName>
<!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
- <property name="log.path" value="/etraffic/server/logs/daijia/driver"/>
+ <property name="log.path" value="/etraffic/server/daijia/logs/driver"/>
<!--0. 日志格式和颜色渲染 -->
<!-- 彩色日志依赖的渲染类 -->
diff --git a/eureka/pom.xml b/eureka/pom.xml
index e43fd5a..f74ec59 100644
--- a/eureka/pom.xml
+++ b/eureka/pom.xml
@@ -9,7 +9,7 @@
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.sinata</groupId>
- <artifactId>eureka</artifactId>
+ <artifactId>dj-eureka</artifactId>
<version>1.0.0</version>
<name>eureka</name>
<description>Eureka project for Spring Boot</description>
@@ -79,4 +79,27 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>dev</id>
+ <properties>
+ <spring.active>dev</spring.active>
+ </properties>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ <profile>
+ <id>test</id>
+ <properties>
+ <spring.active>test</spring.active>
+ </properties>
+ </profile>
+ <profile>
+ <id>prod</id>
+ <properties>
+ <spring.active>prod</spring.active>
+ </properties>
+ </profile>
+ </profiles>
</project>
diff --git a/eureka/src/main/resources/application.yml b/eureka/src/main/resources/application.yml
index 35e0dd0..65a512b 100644
--- a/eureka/src/main/resources/application.yml
+++ b/eureka/src/main/resources/application.yml
@@ -1,24 +1,3 @@
-server:
- port: 8000 #服务端口号
-
spring:
- application:
- name: eureka-center #服务名称
- security:
- basic:
- enable: true #开启基于HTTP basic的认证
- user: #配置用户的账号信息
- name: sinata
- password: sinata
-
-eureka:
- instance:
- hostname: 192.168.110.106 #注册中心地址
- client:
- service-url: #客户端调用地址
- defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/
- register-with-eureka: false #是否将自己注册到Eureka服务中,因为该应用本身就是注册中心，不需要再注册自己（集群的时候为true）
- fetch-registry: false #是否从Eureka中获取注册信息,因为自己为注册中心,不会在该应用中的检索服务信息
- server:
- enable-self-preservation: false #禁用自我保护模式，服务不可用时及时从注册中心剔除
- eviction-interval-timer-in-ms: 4000
+ profiles:
+ active: "@spring.active@"
\ No newline at end of file
diff --git a/management/guns-admin/pom.xml b/management/guns-admin/pom.xml
index 54f7d4c..2353746 100644
--- a/management/guns-admin/pom.xml
+++ b/management/guns-admin/pom.xml
@@ -2,17 +2,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
-
- <artifactId>guns-admin</artifactId>
- <name>guns-admin</name>
- <description>guns 的spring boot版本</description>
- <parent>
+ <parent>
<groupId>com.stylefeng</groupId>
<artifactId>guns-parent</artifactId>
<version>1.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
+
+ <artifactId>admin</artifactId>
+ <name>guns-admin</name>
+ <version>1.0.0</version>
+ <description>guns 的spring boot版本</description>
<packaging>jar</packaging>
<dependencies>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TActivityController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TActivityController.java
index f5aa9d1..acf8ca2 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TActivityController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TActivityController.java
@@ -104,7 +104,14 @@
Integer objectId = ShiroKit.getUser().getObjectId();
Integer roleType = ShiroKit.getUser().getRoleType();
if(roleType == 1){
- List<TBranchOfficeArea> branchOfficeAreaList = branchOfficeAreaService.selectList(new EntityWrapper<TBranchOfficeArea>());
+ List<TBranchOffice> branchOffices = branchOfficeService.selectList(new EntityWrapper<TBranchOffice>().eq("status", 1));
+ List<Integer> collect = new ArrayList<>();
+ if(branchOffices.size() == 0){
+ collect.add(-1);
+ }else{
+ collect = branchOffices.stream().map(TBranchOffice::getId).collect(Collectors.toList());
+ }
+ List<TBranchOfficeArea> branchOfficeAreaList = branchOfficeAreaService.selectList(new EntityWrapper<TBranchOfficeArea>().in("branchOfficeId", collect));
if(CollectionUtils.isEmpty(branchOfficeAreaList)){
model.addAttribute("provinceList",new ArrayList<>());
}
diff --git a/management/guns-admin/src/main/resources/application-produce.yml b/management/guns-admin/src/main/resources/application-prod.yml
similarity index 100%
rename from management/guns-admin/src/main/resources/application-produce.yml
rename to management/guns-admin/src/main/resources/application-prod.yml
diff --git a/management/guns-admin/src/main/resources/application-test.yml b/management/guns-admin/src/main/resources/application-test.yml
index ee3b728..b69a3a9 100644
--- a/management/guns-admin/src/main/resources/application-test.yml
+++ b/management/guns-admin/src/main/resources/application-test.yml
@@ -15,8 +15,7 @@
spring:
profiles:
- active: dev
-# active: produce
+ active: test
mvc:
static-path-pattern: /static/**
view:
@@ -31,9 +30,15 @@
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:
type-aliases-package: com.stylefeng.guns.modular.system.model
global-config:
@@ -44,52 +49,44 @@
log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl #输出Sql，如需打印Sql注释该配置
wx:
conf:
- appId: wx8a9af3889395d0e1
- secret: 95a34f114973298cce4297a20bb59bc3
+ appId: wx1f52be0fdb1d2875
+ secret: 8210ae106f3a501d77b410070a0aa2c2
gaode:
map:
- key: e0370a9a4d10739045fb0b8f4742a67e #高德key
+ key: ea7326a77175aba0e9435859b17bca36 #高德key
---
spring:
datasource:
-# url: jdbc:mysql://192.168.110.64:3306/ok_driving?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=GMT%2B8
-# username: root
-# password: root
- url: jdbc:mysql://121.31.232.206:3306/ok_driving?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
- username: root
- password: Xiwang2024!
- db-name: super_save_driving #用来搜集数据库的所有表
+ 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
+
+---
+
+spring:
data:
mongodb:
- uri: mongodb://121.31.232.206:27017/test
+ host: 10.88.204.206
+ port: 27009
+ username: qn_riding_adm
+ password: QN_riding@Prom2025
+ database: qn_ridingdb
-#多数据源情况的配置
-guns:
- muti-datasource:
- open: false
- url: jdbc:mysql://120.24.34.190:3306/mask?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
- username: root
- password: Root2020!
- dataSourceNames:
- - dataSourceGuns
- - dataSourceBiz
-
+qyt:
+ socket_uri: http://10.88.188.138:6000
---
filePath: /usr/local/server/app/orderPostionFile/ #存储订单轨迹文件路径
-#filePath: C:/orderPostionFile/ #存储订单轨迹文件路径
---
#支付回调地址
-#正式环境
-callbackPath: https://chaoshengdaijia.com:8443
-#测试环境
-#callbackPath: http://121.37.15.157:8010
+callbackPath: https://test-qncx.sitechcloud.com/daijia
---
@@ -105,7 +102,7 @@
# 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: 1111
# mall_book_public_key mallbook测试环境公钥 不需要替换
- mall_book_public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq6OLZKgUHH5wOk9xSBgN7yC17r3PQwMlY9/IorqrOlaIqrU0eAVZ5+dWrJD/3bdu7Ctq8n8trTm/IUYs7wtMg5SKwyX4/N+KQc2N7LL4yCq4vNl41q9sYgrtA0QnZoucIZcq1mwyu7RTDC8Wp7LGddnlkJsmL8masgMxA6cc9NwIDAQAB
+ mall_book_public_key: 1111
diff --git a/management/guns-admin/src/main/resources/logback-spring.xml b/management/guns-admin/src/main/resources/logback-spring.xml
index 2102198..f9c2425 100644
--- a/management/guns-admin/src/main/resources/logback-spring.xml
+++ b/management/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/management"/>
- <!--<property name="log.path" value="d:/logs/driver"/>-->
+ <property name="log.path" value="/etraffic/server/daijia/logs/admin"/>
<!--0. 日志格式和颜色渲染 -->
<!-- 彩色日志依赖的渲染类 -->
@@ -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">
+ <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/management/pom.xml b/management/pom.xml
index 64ce8c4..6f93755 100644
--- a/management/pom.xml
+++ b/management/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>
diff --git a/user/guns-admin/src/main/resources/logback-spring.xml b/user/guns-admin/src/main/resources/logback-spring.xml
index b343b8b..04834c0 100644
--- a/user/guns-admin/src/main/resources/logback-spring.xml
+++ b/user/guns-admin/src/main/resources/logback-spring.xml
@@ -7,7 +7,7 @@
<contextName>logback</contextName>
<!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
- <property name="log.path" value="/etraffic/server/logs/daijia/user"/>
+ <property name="log.path" value="/etraffic/server/daijia/logs/user"/>
<!--0. 日志格式和颜色渲染 -->
<!-- 彩色日志依赖的渲染类 -->
diff --git a/zuul/pom.xml b/zuul/pom.xml
index 0f982a9..c0ced14 100644
--- a/zuul/pom.xml
+++ b/zuul/pom.xml
@@ -88,4 +88,27 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>dev</id>
+ <properties>
+ <spring.active>dev</spring.active>
+ </properties>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ <profile>
+ <id>test</id>
+ <properties>
+ <spring.active>test</spring.active>
+ </properties>
+ </profile>
+ <profile>
+ <id>prod</id>
+ <properties>
+ <spring.active>prod</spring.active>
+ </properties>
+ </profile>
+ </profiles>
</project>
diff --git a/zuul/src/main/resources/application.yml b/zuul/src/main/resources/application.yml
index f107d09..65a512b 100644
--- a/zuul/src/main/resources/application.yml
+++ b/zuul/src/main/resources/application.yml
@@ -1,43 +1,3 @@
-server:
- port: 3002
-
spring:
- application:
- name: zuul-gateway #服务名称
- servlet:
- multipart:
- max-request-size: 500MB
- max-file-size: 500MB
- redis:
- host: 192.168.110.80
- port: 6379
- password: 123456
-
-eureka:
- client:
- service-url: #注册中心地址
- defaultZone: http://sinata:sinata@127.0.0.1:8000/eureka #启用身份验证的方式连接
- register-with-eureka: true #在注册中心进行注册
- fetch-registry: true #从Eureka中获取注册信息。
-
-zuul:
-# prefix: /api #添加URL前缀
- sensitive-headers: #将默认过滤掉的敏感数据清除，不进行过滤（"Cookie", "Set-Cookie", "Authorization"）
- routes:
- user-server: #接口调用路由服务，名字任意取。（用户端服务）
- path: /user/** #配置请求URL的请求规则
- url: http://127.0.0.1:8006 #真正的微服务地址，path匹配的请求都转发到这里
- serviceid: user-server #指定Eureka注册中心的服务id
- driver-server: #路由司机相关请求
- path: /driver/** #配置请求URL的请求规则
- url: http://127.0.0.1:8007 #真正的微服务地址，path匹配的请求都转发到这里
- serviceid: driver-server #指定Eureka注册中心的服务id
- # 配置zuul超时时间
- host:
- connect-timeout-millis: 150000
- socket-timeout-millis: 15000
-
-# 配置ribbon超时时间
-ribbon:
- ReadTimeout: 10000
- ConnectTimeout: 10000
\ No newline at end of file
+ profiles:
+ active: "@spring.active@"
\ No newline at end of file
--
Gitblit v1.7.1