From 919a21e4e6bd4d82df526f86f4c0a92b2e7743ea Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 20 七月 2023 15:35:20 +0800
Subject: [PATCH] 更新最新代码
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java | 2
ManagementIGOTravel/guns-admin/src/main/resources/application.yml | 28 +++---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TReassignMapper.xml | 26 +++---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml | 6
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/yesDriver.js | 6
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectPrivateCarDriver.js | 4
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml | 10 +-
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCrossCityMapper.xml | 4
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TFeedbackMapper.xml | 2
ZuulIGOTravel/src/main/java/com/sinata/zuul/util/NettyStartListener.java | 10 +-
ManagementIGOTravel/guns-admin/src/main/webapp/static/netCarInfo.js | 2
ZuulIGOTravel/src/main/resources/application.yml | 4 -
EurekaIGOTravel/pom.xml | 2
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TComplaintMapper.xml | 2
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml | 6
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectSmallDriver.js | 4
ManagementIGOTravel/guns-admin/src/main/webapp/static/home.js | 4
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectCrossDriver.js | 4
ZuulIGOTravel/pom.xml | 2
ZuulIGOTravel/src/main/resources/redis.properties | 8 +-
ManagementIGOTravel/guns-admin/pom.xml | 20 -----
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityHistoryMapper.xml | 2
ZuulIGOTravel/src/main/java/com/sinata/zuul/ZuulApplication.java | 9 +-
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml | 12 +-
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml | 2
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LineShiftDriverMapper.xml | 2
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderEvaluateMapper.xml | 2
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/IncomeMapper.xml | 4
28 files changed, 82 insertions(+), 107 deletions(-)
diff --git a/EurekaIGOTravel/pom.xml b/EurekaIGOTravel/pom.xml
index bd79780..0744038 100644
--- a/EurekaIGOTravel/pom.xml
+++ b/EurekaIGOTravel/pom.xml
@@ -14,7 +14,7 @@
<name>eureka</name>
<description>Eureka project for Spring Boot</description>
- <packaging>jar</packaging>
+ <packaging>war</packaging>
<properties>
<java.version>1.8</java.version>
diff --git a/ManagementIGOTravel/guns-admin/pom.xml b/ManagementIGOTravel/guns-admin/pom.xml
index c3298b8..a978ff1 100644
--- a/ManagementIGOTravel/guns-admin/pom.xml
+++ b/ManagementIGOTravel/guns-admin/pom.xml
@@ -16,15 +16,6 @@
<packaging>war</packaging>
<dependencies>
- <!--<dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
- </dependency>-->
-
<dependency>
<groupId>com.stylefeng</groupId>
<artifactId>guns-core</artifactId>
@@ -121,17 +112,6 @@
<artifactId>jiguang-common</artifactId>
<version>1.1.1</version>
</dependency>
-
- <!--需要分布式session的话需要放开注释-->
- <!--<dependency>-->
- <!--<groupId>org.springframework.session</groupId>-->
- <!--<artifactId>spring-session-data-redis</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.springframework.boot</groupId>-->
- <!--<artifactId>spring-boot-starter-data-redis</artifactId>-->
- <!--</dependency>-->
-
<dependency>
<groupId>com.github.penggle</groupId>
<artifactId>kaptcha</artifactId>
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityHistoryMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityHistoryMapper.xml
index 9309dd8..869d267 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityHistoryMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityHistoryMapper.xml
@@ -20,7 +20,7 @@
</sql>
<select id="getList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
SELECT
- d.`name`,d.phone,h.insertTime,h.money
+ CONCAT(d.firstName, ' ', d.lastName) as `name`,d.phone,h.insertTime,h.money
FROM
t_driver_activity_history h
LEFT JOIN t_driver d ON h.driverId = d.id
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/IncomeMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/IncomeMapper.xml
index 5fdaebc..d61617b 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/IncomeMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/IncomeMapper.xml
@@ -79,7 +79,7 @@
</select>
<select id="getList2" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
select
- b.`name`,
+ CONCAT(b.firstName, ' ', b.lastName) as `name`,
a.duration as timeNumber
from t_driver_online a
left join t_driver b on (a.driverId = b.id)
@@ -88,7 +88,7 @@
<select id="getTotal" resultType="map">
SELECT COUNT(o.driverId) driverNum,SUM(o.timeNumber) timeNumber from (SELECT
w.driverId,
- d. NAME,
+ CONCAT(d.firstName, ' ', d.lastName) as NAME,
o.timeNumber
FROM
t_driver_work w
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LineShiftDriverMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LineShiftDriverMapper.xml
index 7bf58a9..0743187 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LineShiftDriverMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LineShiftDriverMapper.xml
@@ -43,7 +43,7 @@
<select id="queryNotInLineShiftDriver" resultType="map">
select
d.id as id,
- CONCAT(d.`name`, '-', d.phone) as `name`
+ CONCAT(d.firstName, ' ', d.lastName, '-', d.phone) as `name`
from t_driver d
left join t_driver_line dl on (d.id = dl.driverId)
where d.authState = 2 and d.flag != 3 and dl.lineId in
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml
index 7a0b05f..4dd83ec 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml
@@ -55,7 +55,7 @@
<!--根据条件查询车辆列表-->
<select id="getCarList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
- SELECT * FROM (SELECT ds.serverStr,cb.`name` as brandName,cm.`name` as modelName,c1.`name` as companyName,c2.`name` as franchiseeName,cm.seat,dd.`name` as driverName,cc.* from t_car as cc
+ SELECT * FROM (SELECT ds.serverStr,cb.`name` as brandName,cm.`name` as modelName,c1.`name` as companyName,c2.`name` as franchiseeName,cm.seat,CONCAT(dd.firstName, ' ', dd.lastName) as driverName,cc.* from t_car as cc
LEFT JOIN (select * from t_car_brand where state = 1) as cb on cb.id = cc.carBrandId
LEFT JOIN (select * from t_car_model where state = 1) as cm on cm.id = cc.carModelId
LEFT JOIN (select * from t_company where type = 2 and flag != 3) as c1 on c1.id = cc.companyId
@@ -108,7 +108,7 @@
order by o.id desc
</select>
<select id="getCarListAuth" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
- SELECT * FROM (SELECT ds.serverStr,cb.`name` as brandName,cm.`name` as modelName,c1.`name` as companyName,c2.`name` as franchiseeName,cm.seat,dd.`name` as driverName,cc.* from t_car as cc
+ SELECT * FROM (SELECT ds.serverStr,cb.`name` as brandName,cm.`name` as modelName,c1.`name` as companyName,c2.`name` as franchiseeName,cm.seat,CONCAT(dd.firstName, ' ', dd.lastName) as driverName,cc.* from t_car as cc
LEFT JOIN (select * from t_car_brand where state = 1) as cb on cb.id = cc.carBrandId
LEFT JOIN (select * from t_car_model where state = 1) as cm on cm.id = cc.carModelId
LEFT JOIN (select * from t_company where type = 2 and flag != 3) as c1 on c1.id = cc.companyId
@@ -163,7 +163,7 @@
<!--根据条件查询车辆列表不分页-->
<select id="getCarListNoPage" resultType="map">
- SELECT * FROM (SELECT ds.serverStr,cb.`name` as brandName,cm.`name` as modelName,c1.`name` as companyName,c2.`name` as franchiseeName,cm.seat,dd.`name` as driverName,cc.* from t_car as cc
+ SELECT * FROM (SELECT ds.serverStr,cb.`name` as brandName,cm.`name` as modelName,c1.`name` as companyName,c2.`name` as franchiseeName,cm.seat,CONCAT(dd.firstName, ' ', dd.lastName) as driverName,cc.* from t_car as cc
LEFT JOIN (select * from t_car_brand where state = 1) as cb on cb.id = cc.carBrandId
LEFT JOIN (select * from t_car_model where state = 1) as cm on cm.id = cc.carModelId
LEFT JOIN (select * from t_company where type = 2 and flag != 3) as c1 on c1.id = cc.companyId
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TComplaintMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TComplaintMapper.xml
index 2c882fe..efb19f7 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TComplaintMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TComplaintMapper.xml
@@ -22,7 +22,7 @@
<!--根据条件查询投诉列表-->
<select id="getComplaintList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
- SELECT * FROM (SELECT di.companyId,di.franchiseeId,ui.nickName as userName,ui.phone as userPhone,di.`name` as driverName,di.phone as driverPhone,si.`name` as handleUserName,cc.* FROM t_complaint as cc
+ SELECT * FROM (SELECT di.companyId,di.franchiseeId,ui.nickName as userName,ui.phone as userPhone,CONCAT(di.firstName, ' ', di.lastName) as driverName,di.phone as driverPhone,si.`name` as handleUserName,cc.* FROM t_complaint as cc
LEFT JOIN (select * from t_user where flag != 3) as ui on ui.id = cc.userId
LEFT JOIN (select * from t_driver where flag != 3) as di on di.id = cc.driverId
LEFT JOIN sys_user as si on si.id = cc.handleUserId
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
index e11bf26..6bd3837 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
@@ -295,7 +295,7 @@
select
concat('user_',id) as id,
phone as phone,
- IFNULL(name,nickName) as name,
+ IFNULL(CONCAT(firstName, ' ', lastName),nickName) as name,
1 as uType,
insertTime as insertTime
from t_user
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TFeedbackMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TFeedbackMapper.xml
index 820dc3a..391daa2 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TFeedbackMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TFeedbackMapper.xml
@@ -24,7 +24,7 @@
<!--根据条件查询用反馈记录列表-->
<select id="getFeedbackList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
- SELECT * FROM (SELECT dd.`name` as driverName,dd.phone as driverPhone,uu.nickName as userName,uu.phone as userPhone,su.`name` as handleUserName,
+ SELECT * FROM (SELECT CONCAT(dd.firstName, ' ', dd.lastName) as driverName,dd.phone as driverPhone,uu.nickName as userName,uu.phone as userPhone,su.`name` as handleUserName,
fb.* FROM t_feedback as fb
LEFT JOIN t_driver as dd on dd.id = fb.userId
LEFT JOIN t_user as uu on uu.id = fb.userId
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCrossCityMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCrossCityMapper.xml
index 74d2fe5..dfe45c9 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCrossCityMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCrossCityMapper.xml
@@ -73,7 +73,7 @@
<!--根据条件查询跨城出行订单列表-->
<select id="getCrossCityOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
SELECT * FROM (
- SELECT ui.nickName as userName,ui.phone as userPhone,CONCAT(di.`name`,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
+ SELECT ui.nickName as userName,ui.phone as userPhone,CONCAT(di.firstName, ' ', di.lastName,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
sc.`name` as serverCarModel,ll.`name` as lineName,ot.* FROM t_order_cross_city as ot
LEFT JOIN t_user as ui on ui.id = ot.userId
LEFT JOIN t_driver as di on di.id = ot.driverId
@@ -144,7 +144,7 @@
when ot.payType = 2 then '支付宝'
when ot.payType = 3 then '余额' else '' end as payTypeStr,
sc.`name` as serverCarModel,
- CONCAT(di.`name`,'-',di.phone) as driver,
+ CONCAT(di.firstName, ' ', di.lastName,'-',di.phone) as driver,
CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
ll.`name` as lineName,
cc.`name` as companyName,ot.*
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderEvaluateMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderEvaluateMapper.xml
index 982c99b..759ffae 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderEvaluateMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderEvaluateMapper.xml
@@ -21,7 +21,7 @@
<!--根据条件查询评价列表-->
<select id="getOrderEvaluateList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
- SELECT * FROM (SELECT di.companyId,di.franchiseeId,ui.nickName as userName,ui.phone as userPhone,di.`name` as driverName,di.phone as driverPhone,oe.* FROM t_order_evaluate as oe
+ SELECT * FROM (SELECT di.companyId,di.franchiseeId,ui.nickName as userName,ui.phone as userPhone,CONCAT(di.firstName, ' ', di.lastName) as driverName,di.phone as driverPhone,oe.* FROM t_order_evaluate as oe
LEFT JOIN t_user as ui on ui.id = oe.userId
LEFT JOIN t_driver as di on di.id = oe.driverId) as o
<where>
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml
index 815f632..b8562c8 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml
@@ -71,7 +71,7 @@
<!--根据条件查询小件物流订单列表-->
<select id="getLogisticsOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
- SELECT * FROM (SELECT ui.nickName as userName,ui.phone as userPhone,CONCAT(di.`name`,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
+ SELECT * FROM (SELECT ui.nickName as userName,ui.phone as userPhone,CONCAT(di.firstName, " ", di.lastName,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
ot.* FROM t_order_logistics as ot
LEFT JOIN t_user as ui on ui.id = ot.userId
LEFT JOIN t_driver as di on di.id = ot.driverId
@@ -129,11 +129,11 @@
when ot.orderSource = 3 then '小程序下单'
when ot.orderSource = 4 then '司机下单'
when ot.orderSource = 5 then '调度下单' else '' end orderSourceStr,
- case when ot.payType = 1 then '微信'
- when ot.payType = 2 then '支付宝'
- when ot.payType = 3 then '余额' else '' end as payTypeStr,
+ case when ot.payType = 1 then '手机支付'
+ when ot.payType = 2 then '银行卡支付'
+ when ot.payType = 3 then '余额支付' else '现金支付' end as payTypeStr,
ui.nickName as userName,ui.phone as userPhone,
- CONCAT(di.`name`,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
+ CONCAT(di.firstName, " ", di.lastName,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
'市内小件物流' as typeStr,
dd.name as companyName,
ot.* FROM t_order_logistics as ot
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
index 7d1ecd2..e5ed740 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
@@ -77,7 +77,7 @@
<!--根据条件查询专车订单列表-->
<select id="getPrivateCarOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
- SELECT * FROM (SELECT ui.nickName as userName,ui.phone as userPhone,CONCAT(di.`name`,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
+ SELECT * FROM (SELECT ui.nickName as userName,ui.phone as userPhone,CONCAT(di.firstName, " ", di.lastName,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
sc.`name` as serverCarModel,ot.* FROM t_order_private_car as ot
LEFT JOIN t_user as ui on ui.id = ot.userId
LEFT JOIN t_driver as di on di.id = ot.driverId
@@ -144,9 +144,9 @@
when ot.orderSource = 4 then '司机下单'
when ot.orderSource = 5 then '调度下单' else '' end orderSourceStr,
ui.nickName as userName,ui.phone as userPhone,
- case when ot.payType = 1 then '微信'
- when ot.payType = 2 then '支付宝'
- when ot.payType = 3 then '余额' else '' end as payTypeStr,
+ case when ot.payType = 1 then '手机支付'
+ when ot.payType = 2 then '银行卡支付'
+ when ot.payType = 3 then '余额支付' else '现金支付' end as payTypeStr,
case when ot.isFree = 2 then ot.orderMoney
when ot.freeMoney > ot.orderMoney then ot.orderMoney else ot.freeMoney end as freeMoney1,
@@ -155,7 +155,7 @@
case when income1.type = 2 then income1.money else 0 end as companyIncome,
case when income1.type = 3 then income1.money else 0 end as franchiseeIncome,
IFNULL(income2.money,0) as driverIncome,
- CONCAT(di.`name`,'-',di.phone) as driver,
+ CONCAT(di.firstName, " ", di.lastName,'-',di.phone) as driver,
CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
cc.`name` as companyName,ot.*
FROM t_order_private_car as ot
@@ -175,7 +175,7 @@
<!--根据条件查询专车订单列表noPage-->
<select id="getPrivateCarOrderListNoPage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
- SELECT * FROM (SELECT ui.nickName as userName,ui.phone as userPhone,CONCAT(di.`name`,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
+ SELECT * FROM (SELECT ui.nickName as userName,ui.phone as userPhone,CONCAT(di.firstName, " ", di.lastName,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
sc.`name` as serverCarModel,ot.* FROM t_order_private_car as ot
LEFT JOIN t_user as ui on ui.id = ot.userId
LEFT JOIN t_driver as di on di.id = ot.driverId
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml
index 091c83c..a345f76 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml
@@ -64,7 +64,7 @@
<!--根据条件查询出租车订单列表-->
<select id="getTaxiOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
- SELECT * FROM (SELECT ui.nickName as userName,ui.phone as userPhone,CONCAT(di.`name`,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
+ SELECT * FROM (SELECT ui.nickName as userName,ui.phone as userPhone,CONCAT(di.firstName, ' ', di.lastName,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
ot.* FROM t_order_taxi as ot
LEFT JOIN t_user as ui on ui.id = ot.userId
LEFT JOIN t_driver as di on di.id = ot.driverId
@@ -125,7 +125,7 @@
case when ot.payType = 1 then '微信'
when ot.payType = 2 then '支付宝'
when ot.payType = 3 then '余额' else '' end as payTypeStr,
- CONCAT(di.`name`,'-',di.phone) as driver,
+ CONCAT(di.firstName, ' ', di.lastName,'-',di.phone) as driver,
CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
cc.`name` as companyName,ot.*
FROM t_order_taxi as ot
@@ -146,7 +146,7 @@
<where>
(dd.companyId = #{companyId} or dd.franchiseeId = #{companyId}) and dd.authState = 2 and dd.state = 2 and (ds.id is not null ) and (dd.carId is not null)
<if test="name != null and name != ''">
- and dd.name LIKE CONCAT('%',#{name},'%')
+ and CONCAT(dd.firstName, ' ', dd.lastName) LIKE CONCAT('%',#{name},'%')
</if>
<if test="phone != null and phone != ''">
and dd.phone LIKE CONCAT('%',#{phone},'%')
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TReassignMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TReassignMapper.xml
index 3d5137c..c4589cc 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TReassignMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TReassignMapper.xml
@@ -32,12 +32,12 @@
<!--根据条件查询专车改派订单列表-->
<select id="getPrivateCarReassignOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
SELECT * FROM (SELECT rr.id,rr.insertTime,
- dd1.name as originalDriverName,dd1.phone as originalDriverPhone,
- CONCAT(dd1.name,'-',dd1.phone) as originalDriver,rr.reason,opc.orderNum,
+ CONCAT(dd1.firstName, " ", dd1.lastName) as originalDriverName,dd1.phone as originalDriverPhone,
+ CONCAT(dd1.firstName, " ", dd1.lastName,'-',dd1.phone) as originalDriver,rr.reason,opc.orderNum,
CONCAT(uu1.nickName,'-',uu1.phone) as addOrderUser,opc.travelTime,opc.startAddress,opc.endAddress,
CONCAT(cb1.`name`,'-',cc1.carLicensePlate) as originalCar,rr.money,opc.state as orderState,
- dd2.name as nowDriverName,dd2.phone as nowDriverPhone,
- CONCAT(dd2.name,'-',dd2.phone) as nowDriver,CONCAT(cb2.`name`,'-',cc2.carLicensePlate) as nowCar,
+ CONCAT(dd2.firstName, " ", dd2.lastName) as nowDriverName,dd2.phone as nowDriverPhone,
+ CONCAT(dd2.firstName, " ", dd2.lastName,'-',dd2.phone) as nowDriver,CONCAT(cb2.`name`,'-',cc2.carLicensePlate) as nowCar,
opc.companyId,rr.state,rr.orderType FROM t_reassign as rr
LEFT JOIN t_driver as dd1 on dd1.id = rr.originalDriverId
LEFT JOIN t_order_private_car as opc on opc.id = rr.orderId
@@ -92,7 +92,7 @@
<where>
(dd.companyId = #{companyId} or dd.franchiseeId = #{companyId}) and dd.authState = 2 and dd.state = 2 and (ds.id is not null ) and (dd.carId is not null)
<if test="name != null and name != ''">
- and dd.name LIKE CONCAT('%',#{name},'%')
+ and CONCAT(dd.firstName, ' ', dd.lastName) LIKE CONCAT('%',#{name},'%')
</if>
<if test="phone != null and phone != ''">
and dd.phone LIKE CONCAT('%',#{phone},'%')
@@ -111,7 +111,7 @@
<where>
(dd.companyId = #{companyId} or dd.franchiseeId = #{companyId}) and dd.authState = 2 and dd.state = 2 and (ds.id is not null ) and (dd.carId is not null)
<if test="name != null and name != ''">
- and dd.name LIKE CONCAT('%',#{name},'%')
+ and CONCAT(dd.firstName, ' ', dd.lastName) LIKE CONCAT('%',#{name},'%')
</if>
<if test="phone != null and phone != ''">
and dd.phone LIKE CONCAT('%',#{phone},'%')
@@ -125,11 +125,11 @@
<select id="getCrossReassignOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
SELECT * FROM (SELECT rr.id,rr.insertTime,
dd1.name as originalDriverName,dd1.phone as originalDriverPhone,
- CONCAT(dd1.name,'-',dd1.phone) as originalDriver,rr.reason,opc.orderNum,
+ CONCAT(dd1.firstName, ' ', dd1.lastName,'-',dd1.phone) as originalDriver,rr.reason,opc.orderNum,
CONCAT(uu1.nickName,'-',uu1.phone) as addOrderUser,opc.travelTime,opc.startAddress,opc.endAddress,
CONCAT(cb1.`name`,'-',cc1.carLicensePlate) as originalCar,rr.money,opc.state as orderState,
dd2.name as nowDriverName,dd2.phone as nowDriverPhone,
- CONCAT(dd2.name,'-',dd2.phone) as nowDriver,CONCAT(cb2.`name`,'-',cc2.carLicensePlate) as nowCar,
+ CONCAT(dd2.firstName, ' ', dd2.lastName,'-',dd2.phone) as nowDriver,CONCAT(cb2.`name`,'-',cc2.carLicensePlate) as nowCar,
opc.companyId,rr.state,rr.orderType FROM t_reassign as rr
LEFT JOIN t_driver as dd1 on dd1.id = rr.originalDriverId
LEFT JOIN t_order_cross_city as opc on opc.id = rr.orderId
@@ -180,12 +180,12 @@
<!--根据条件查询跨城改派订单列表-->
<select id="getSmallPieceLogisticsList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
SELECT * FROM (SELECT rr.id,rr.insertTime,
- dd1.name as originalDriverName,dd1.phone as originalDriverPhone,
- CONCAT(dd1.name,'-',dd1.phone) as originalDriver,rr.reason,opc.orderNum,
+ CONCAT(dd1.firstName, " ", dd1.lastName) as originalDriverName,dd1.phone as originalDriverPhone,
+ CONCAT(dd1.firstName, " ", dd1.lastName,'-',dd1.phone) as originalDriver,rr.reason,opc.orderNum,
CONCAT(uu1.nickName,'-',uu1.phone) as addOrderUser,opc.travelTime,opc.startAddress,opc.endAddress,
CONCAT(cb1.`name`,'-',cc1.carLicensePlate) as originalCar,rr.money,opc.state as orderState,
- dd2.name as nowDriverName,dd2.phone as nowDriverPhone,
- CONCAT(dd2.name,'-',dd2.phone) as nowDriver,CONCAT(cb2.`name`,'-',cc2.carLicensePlate) as nowCar,
+ CONCAT(dd2.firstName, " ", dd2.lastName) as nowDriverName,dd2.phone as nowDriverPhone,
+ CONCAT(dd2.firstName, " ", dd2.lastName,'-',dd2.phone) as nowDriver,CONCAT(cb2.`name`,'-',cc2.carLicensePlate) as nowCar,
opc.companyId,rr.state,rr.orderType FROM t_reassign as rr
LEFT JOIN t_driver as dd1 on dd1.id = rr.originalDriverId
LEFT JOIN t_order_logistics as opc on opc.id = rr.orderId
@@ -253,7 +253,7 @@
and a.id in (select driverId from t_line_shift_driver where lineShiftId = #{lineShiftId} and DATE_FORMAT(`day`, '%Y-%m-%d') = DATE_FORMAT(#{time}, '%Y-%m-%d') and laveSeat >= #{num})
and a.id != #{driverId}
<if test="name != null and name != ''">
- and a.name LIKE CONCAT('%',#{name},'%')
+ and CONCAT(a.firstName, ' ', a.lastName) LIKE CONCAT('%',#{name},'%')
</if>
<if test="phone != null and phone != ''">
and a.phone LIKE CONCAT('%',#{phone},'%')
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
index b8e2515..3c1bc97 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
@@ -46,7 +46,7 @@
@Scheduled(cron = "0 0 0 * * *")
public void taskDay(){
try {
- locationService.updateFence();//更新线上电子围栏
+// locationService.updateFence();//更新线上电子围栏
}catch (Exception e){
e.printStackTrace();
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/resources/application.yml b/ManagementIGOTravel/guns-admin/src/main/resources/application.yml
index 16887ee..8dfabbb 100644
--- a/ManagementIGOTravel/guns-admin/src/main/resources/application.yml
+++ b/ManagementIGOTravel/guns-admin/src/main/resources/application.yml
@@ -2,7 +2,7 @@
port: 8010
guns:
- swagger-open: true #是否开启swagger (true/false)
+ swagger-open: false #是否开启swagger (true/false)
kaptcha-open: false #是否开启登录时验证码 (true/false)
spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
session-invalidate-time: 1800 #session失效时间(只在单机环境下生效，多机环境在SpringSessionConfig类中配置) 单位：秒
@@ -15,8 +15,8 @@
spring:
profiles:
- active: dev
-# active: produce
+# active: dev
+ active: produce
mvc:
static-path-pattern: /static/**
view:
@@ -43,23 +43,23 @@
---
-#spring:
-# datasource:
-# url: jdbc:mysql://127.0.0.1:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
-# username: root
-# password: HjKbXilb9zajmXbl
-# db-name: guns #用来搜集数据库的所有表
-# filters: wall,mergeStat
-
-################# 测试环境 ###################
spring:
datasource:
url: jdbc:mysql://127.0.0.1:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
username: root
- password: 123456
- db-name: igotravel #用来搜集数据库的所有表
+ password: HjKbXilb9zajmXbl
+ db-name: guns #用来搜集数据库的所有表
filters: wall,mergeStat
+################# 测试环境 ###################
+#spring:
+# datasource:
+# url: jdbc:mysql://127.0.0.1:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+# username: root
+# password: 123456
+# db-name: igotravel #用来搜集数据库的所有表
+# filters: wall,mergeStat
+
#多数据源情况的配置
guns:
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/home.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/home.js
index 03cd9f1..1bbbdc6 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/home.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/home.js
@@ -290,7 +290,7 @@
for(var i in data1){
var driver = data1[i].driver;
var driverId = driver.id;
- d += '<li class="list-group-item" id="' + driverId + '">' + driver.name + '-' + driver.phone + '</li>';
+ d += '<li class="list-group-item" id="' + driverId + '">' + driver.firstName + " " + driver.lastName + '-' + driver.phone + '</li>';
if('' != data1[i].lon){
const image = {
url: "/static/icon_car@2x.png",
@@ -319,7 +319,7 @@
for(var i in data2){
var driver = data2[i].driver;
var driverId = driver.id;
- d += '<li class="list-group-item" id="' + driverId + '">' + driver.name + '-' + driver.phone + '</li>';
+ d += '<li class="list-group-item" id="' + driverId + '">' + driver.firstName + " " + driver.lastName + '-' + driver.phone + '</li>';
if('' != data2[i].lon){
const image = {
url: "/static/car.png",
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/yesDriver.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/yesDriver.js
index 9f8be9e..d625777 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/yesDriver.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/yesDriver.js
@@ -29,8 +29,8 @@
{title: '姓名', field: 'name', visible: true, align: 'center', valign: 'middle',width:'5%',
formatter: function (value, row) {
var btn = "";
- if(row.name != '' && row.name != null) {
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.name + '" onfocus="TUser.tooltip()">' + row.name + '</p>']
+ if(row.lastName != '' && row.lastName != null && row.firstName != '' && row.firstName != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.firstName + ' ' + row.lastName + '" onfocus="TUser.tooltip()">' + row.firstName + ' ' + row.lastName + '</p>']
}
return btn;
}
@@ -286,7 +286,7 @@
var id = selected[0].id;
var companyName = selected[0].companyName;
if(companyName==undefined)companyName="";
- var nickName = selected[0].name;
+ var nickName = selected[0].firstName + ' ' + selected[0].lastName;
var phone = selected[0].phone;
if ("" == id || null == id || undefined == id){
Feng.info("请先选中表格中的某一记录！");
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectCrossDriver.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectCrossDriver.js
index 020b5a4..f94d22f 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectCrossDriver.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectCrossDriver.js
@@ -18,8 +18,8 @@
{title: '姓名', field: 'name', visible: true, align: 'center', valign: 'middle',width:'15%',
formatter: function (value, row) {
var btn = "";
- if(row.name != '' && row.name != null) {
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.name + '" onfocus="TUser.tooltip()">' + row.name + '</p>']
+ if(row.lastName != '' && row.lastName != null && row.firstName != '' && row.firstName != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.firstName + ' ' + row.lastName + '" onfocus="TUser.tooltip()">' + row.firstName + ' ' + row.lastName + '</p>']
}
return btn;
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectPrivateCarDriver.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectPrivateCarDriver.js
index b9e17bb..e5d4041 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectPrivateCarDriver.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectPrivateCarDriver.js
@@ -18,8 +18,8 @@
{title: '姓名', field: 'name', visible: true, align: 'center', valign: 'middle',width:'15%',
formatter: function (value, row) {
var btn = "";
- if(row.name != '' && row.name != null) {
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.name + '" onfocus="TUser.tooltip()">' + row.name + '</p>']
+ if(row.lastName != '' && row.lastName != null && row.firstName != '' && row.firstName != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.firstName + ' ' + row.lastName + '" onfocus="TUser.tooltip()">' + row.firstName + ' ' + row.lastName + '</p>']
}
return btn;
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectSmallDriver.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectSmallDriver.js
index 9d85720..f554d9c 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectSmallDriver.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectSmallDriver.js
@@ -18,8 +18,8 @@
{title: '姓名', field: 'name', visible: true, align: 'center', valign: 'middle',width:'15%',
formatter: function (value, row) {
var btn = "";
- if(row.name != '' && row.name != null) {
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.name + '" onfocus="TUser.tooltip()">' + row.name + '</p>']
+ if(row.lastName != '' && row.lastName != null && row.firstName != '' && row.firstName != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.firstName + ' ' + row.lastName + '" onfocus="TUser.tooltip()">' + row.firstName + ' ' + row.lastName + '</p>']
}
return btn;
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/netCarInfo.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/netCarInfo.js
index 9bf2fff..3ad0d49 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/netCarInfo.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/netCarInfo.js
@@ -47,7 +47,7 @@
if(netcarDriver != ''){
str += '' +
'<tr><td><h4>司机信息：</h4></td><td></td><td></td><td></td></tr>' +
- '<tr><td>司机姓名</td><td>' + netcarDriver.name + '</td><td>司机电话</td><td>' + netcarDriver.phone + '</td></tr>';
+ '<tr><td>司机姓名</td><td>' + netcarDriver.firstName + ' ' + netcarDriver.lastName + '</td><td>司机电话</td><td>' + netcarDriver.phone + '</td></tr>';
}
if(order.length > 0){
for(var i in order){
diff --git a/ZuulIGOTravel/pom.xml b/ZuulIGOTravel/pom.xml
index 969c88d..1a82774 100644
--- a/ZuulIGOTravel/pom.xml
+++ b/ZuulIGOTravel/pom.xml
@@ -14,7 +14,7 @@
<name>zuul</name>
<description>Zuul project for Spring Boot</description>
- <packaging>jar</packaging>
+ <packaging>war</packaging>
<properties>
<java.version>1.8</java.version>
diff --git a/ZuulIGOTravel/src/main/java/com/sinata/zuul/ZuulApplication.java b/ZuulIGOTravel/src/main/java/com/sinata/zuul/ZuulApplication.java
index 5dcc10e..5e1cbdc 100644
--- a/ZuulIGOTravel/src/main/java/com/sinata/zuul/ZuulApplication.java
+++ b/ZuulIGOTravel/src/main/java/com/sinata/zuul/ZuulApplication.java
@@ -39,10 +39,10 @@
public static void main(String[] args) {
SpringApplication.run(ZuulApplication.class, args);
- NettyServer nettyServer = new NettyServer();
- nettyServer.bind();
- NettyServer0 nettyServer0 = new NettyServer0();
- nettyServer0.bind();
+// NettyServer nettyServer = new NettyServer();
+// nettyServer.bind();
+// NettyServer0 nettyServer0 = new NettyServer0();
+// nettyServer0.bind();
}
@@ -111,7 +111,6 @@
//name可以随便写，location前缀要与zuul配置的path一致。zuul开了token验证,要加上token,否则不用加?token=1
resource.add(swaggerResource("user","/user-server/v2/api-docs","1.0"));
resource.add(swaggerResource("driver","/driver-server/v2/api-docs","1.0"));
-// resource.add(swaggerResource("dispatch","/dispatch-server/v2/api-docs","1.0"));
return resource;
}
diff --git a/ZuulIGOTravel/src/main/java/com/sinata/zuul/util/NettyStartListener.java b/ZuulIGOTravel/src/main/java/com/sinata/zuul/util/NettyStartListener.java
index 1d8670a..2f19e93 100644
--- a/ZuulIGOTravel/src/main/java/com/sinata/zuul/util/NettyStartListener.java
+++ b/ZuulIGOTravel/src/main/java/com/sinata/zuul/util/NettyStartListener.java
@@ -19,11 +19,11 @@
Thread thread = new Thread(new Runnable() {
@Override
public void run() {
-// NettyServer nettyServer = new NettyServer();
-// nettyServer.bind();
-//
-// NettyServer0 nettyServer0 = new NettyServer0();
-// nettyServer0.bind();
+ NettyServer nettyServer = new NettyServer();
+ nettyServer.bind();
+
+ NettyServer0 nettyServer0 = new NettyServer0();
+ nettyServer0.bind();
}
});
thread.start();
diff --git a/ZuulIGOTravel/src/main/resources/application.yml b/ZuulIGOTravel/src/main/resources/application.yml
index 8fa1ee3..f99aec0 100644
--- a/ZuulIGOTravel/src/main/resources/application.yml
+++ b/ZuulIGOTravel/src/main/resources/application.yml
@@ -23,10 +23,6 @@
path: /driver/** #配置请求URL的请求规则
url: http://127.0.0.1:8007 #真正的微服务地址，path匹配的请求都转发到这里
serviceid: driver-server #指定Eureka注册中心的服务id
- dispatch-server: #路由调度相关请求
- path: /dispatch/** #配置请求URL的请求规则
- url: http://127.0.0.1:8008 #真正的微服务地址，path匹配的请求都转发到这里
- serviceid: dispatch-server #指定Eureka注册中心的服务id
# 配置zuul超时时间
host:
connect-timeout-millis: 150000
diff --git a/ZuulIGOTravel/src/main/resources/redis.properties b/ZuulIGOTravel/src/main/resources/redis.properties
index a7f88fc..72627aa 100644
--- a/ZuulIGOTravel/src/main/resources/redis.properties
+++ b/ZuulIGOTravel/src/main/resources/redis.properties
@@ -4,11 +4,11 @@
# Redis��������ַ
spring.redis.host=127.0.0.1
# Redis���������Ӷ˿�
-#spring.redis.port=16379
-spring.redis.port=6379
+spring.redis.port=16379
+#spring.redis.port=6379
# Redis�������������루Ĭ��Ϊ�գ�
-#spring.redis.password=mPMHThYzlT8DWgl8HLqwPEyPOiHDPPB5
-spring.redis.password=123456
+spring.redis.password=mPMHThYzlT8DWgl8HLqwPEyPOiHDPPB5
+#spring.redis.password=123456
# ���ӳ������������ʹ�ø�ֵ��ʾû�����ƣ�
spring.redis.jedis.pool.max-active=1024
# ���ӳ���������ȴ�ʱ�䣨ʹ�ø�ֵ��ʾû�����ƣ�
--
Gitblit v1.7.1