From 78851285202a040f8ddf998c067cd462874c1cb9 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 19 十月 2023 14:55:27 +0800
Subject: [PATCH] 配置修改
---
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml | 2 +-
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 4 ++--
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AESUtil.java | 11 ++++++-----
DriverTravel/guns-admin/src/main/resources/application.yml | 2 +-
UserTravel/guns-admin/src/main/resources/application.yml | 2 +-
UserTravel/guns-admin/src/main/resources/redis.properties | 2 +-
DispatchTravel/guns-admin/src/main/resources/application.yml | 2 +-
ZuulTravel/src/main/java/com/sinata/zuul/config/RedisConfig.java | 2 +-
8 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/DispatchTravel/guns-admin/src/main/resources/application.yml b/DispatchTravel/guns-admin/src/main/resources/application.yml
index 3676fac..deb22a4 100644
--- a/DispatchTravel/guns-admin/src/main/resources/application.yml
+++ b/DispatchTravel/guns-admin/src/main/resources/application.yml
@@ -68,7 +68,7 @@
#正式环境
#callbackPath: https://okyueche.com:443/dispatch
#正式测试环境
-callbackPath: http://140.210.205.34:5000/dispatch
+callbackPath: https://tianma.65xj.com/dispatch
#交通部推送数据功能开关
diff --git a/DriverTravel/guns-admin/src/main/resources/application.yml b/DriverTravel/guns-admin/src/main/resources/application.yml
index 63623b0..4455d17 100644
--- a/DriverTravel/guns-admin/src/main/resources/application.yml
+++ b/DriverTravel/guns-admin/src/main/resources/application.yml
@@ -71,7 +71,7 @@
#正式环境
#callbackPath: https://okyueche.com:443/driver
#正式测试环境
-callbackPath: http://140.210.205.34:5000/driver
+callbackPath: https://tianma.65xj.com/driver
#交通部推送数据功能开关
pushMinistryOfTransport: false
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
index e0997e5..4aebe94 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
@@ -266,7 +266,7 @@
a.headImgUrl as avatar,
a.phone as phone,
c.carLicensePlate as carCode,
- CONCAT(F.`name`, d.`name`, '.', c.carColor) as carName,
+ CONCAT(f.`name`, d.`name`, '.', c.carColor) as carName,
(select sum(fraction) / count(id) from t_order_evaluate where driverId = a.id) as score,
(
(select count(id) from t_order_private_car where state in (7, 8, 9) and driverId = a.id) +
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AESUtil.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AESUtil.java
index 7dae0dc..c1537c4 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AESUtil.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AESUtil.java
@@ -10,6 +10,7 @@
import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.StandardCharsets;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.security.spec.InvalidKeySpecException;
@@ -88,11 +89,11 @@
public static void main(String[] ages){
-// String encrypt = AESUtil.encrypt("19167181339");
+// String encrypt = AESUtil.encrypt("18398968484");
// System.err.println(encrypt);
- String encrypt = AESUtil.encrypt("VM0S5boDnJqBFZUxn4X6Vw==");
- System.err.println(encrypt);
-// String travel = AESUtil.decrypt("wRhQ5gEAAAEQAAAAAAAAAA==");
-// System.err.println(travel);
+// String encrypt = AESUtil.encrypt("7tQOnSXCstqyFQRvSSMdwQ==");
+// System.err.println(encrypt);
+ String travel = AESUtil.decrypt("7tQOnSXCstqyFQRvSSMdwQ==");
+ System.err.println(travel);
}
}
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index ac91de1..a8625c6 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -195,7 +195,7 @@
* 1.下了即时单就不能下预约单和即时单
* 2.下了预约单和再下一张即时单不能再下预约单
*/
- List<OrderTaxi> list = orderTaxiMapper.queryByState_(uid, 1, 1, 1, 2, 3, 4, 5, 6, 11);
+ List<OrderTaxi> list = orderTaxiMapper.queryByState_(uid, 1, 1, 1, 2, 3, 4, 5, 6,7, 11);
if(list.size() > 0){
return ResultUtil.error("有未完成的订单");
}
@@ -204,7 +204,7 @@
return ResultUtil.error("有未完成的订单");
}
- list = orderTaxiMapper.queryByState_(uid, 2, 1, 1, 2, 3, 4, 5, 6, 11);
+ list = orderTaxiMapper.queryByState_(uid, 2, 1, 1, 2, 3, 4, 5, 6,7, 11);
if(list.size() > 0 && orderTaxi.getOrderType() == 2){
return ResultUtil.error("有未完成的订单");
}
diff --git a/UserTravel/guns-admin/src/main/resources/application.yml b/UserTravel/guns-admin/src/main/resources/application.yml
index 1536714..7ac3224 100644
--- a/UserTravel/guns-admin/src/main/resources/application.yml
+++ b/UserTravel/guns-admin/src/main/resources/application.yml
@@ -70,7 +70,7 @@
#正式环境
#callbackPath: https://okyueche.com:443/user
#测试环境
-callbackPath: http://140.210.205.34:5000/user
+callbackPath: https://tianma.65xj.com/user
#交通部推送数据功能开关
pushMinistryOfTransport: false
diff --git a/UserTravel/guns-admin/src/main/resources/redis.properties b/UserTravel/guns-admin/src/main/resources/redis.properties
index e51fb4a..bcc26af 100644
--- a/UserTravel/guns-admin/src/main/resources/redis.properties
+++ b/UserTravel/guns-admin/src/main/resources/redis.properties
@@ -4,7 +4,7 @@
# Redis��������ַ
spring.redis.host=127.0.0.1
# Redis���������Ӷ˿�
-#spring.redis.port=16379
+#spring.redis.port=6379
spring.redis.port=10064
# Redis�������������루Ĭ��Ϊ�գ�
spring.redis.password=TianMa_2023!
diff --git a/ZuulTravel/src/main/java/com/sinata/zuul/config/RedisConfig.java b/ZuulTravel/src/main/java/com/sinata/zuul/config/RedisConfig.java
index 8d1d581..895ffce 100644
--- a/ZuulTravel/src/main/java/com/sinata/zuul/config/RedisConfig.java
+++ b/ZuulTravel/src/main/java/com/sinata/zuul/config/RedisConfig.java
@@ -48,7 +48,7 @@
jedisPoolConfig.setBlockWhenExhausted(blockWhenExhausted);
// 是否启用pool的jmx管理功能, 默认true
jedisPoolConfig.setJmxEnabled(true);
- JedisPool jedisPool = new JedisPool(jedisPoolConfig, host, port, timeout);
+ JedisPool jedisPool = new JedisPool(jedisPoolConfig, host, port, timeout, password);
return jedisPool;
}
}
--
Gitblit v1.7.1