java/QianYunTong.git

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

liujie

5 天以前 729a5a0592cac7750e8b476c5fcb25bfc3ff8d25

refs
用户	liujie <1793218484@qq.com>
	星期日, 七月 27, 2025 09:06 +0800
提交者	liujie <1793218484@qq.com>
	星期日, 七月 27, 2025 09:06 +0800
提交	729a5a0592cac7750e8b476c5fcb25bfc3ff8d25
目录	e7f8bc0fa5bd42ac513497d243e3f1db814d99b5 目录 \| zip \| gz
parent	50c6237e3728fe870b5b0ff4af59063bb0bc04cd 查看 \| 对比 03b781dab3b98398fbf9ce8863fc32a7b1d873db 查看 \| 对比

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

# Conflicts:
#	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/SM4Util.java

74个文件已修改

5个文件已删除

10个文件已添加

	DriverQYTTravel/guns-admin/lib/cas-client-oncon-3.0.5.jar	对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/lib/cas-client-oncon-core-1.2.2.jar	对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/pom.xml	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java	29 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java	24 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/newlyAdded/NewlyAddedController.java	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java	36 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java	33 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OpenCityMapper.java	25 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/PhoneMapper.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/PushOrderMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysIntegralMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysReformistMapper.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OpenCityMapper.xml	61 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/PhoneMapper.xml	24 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/PushOrderMapper.xml	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SysIntegralMapper.xml	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SysReformistMapper.xml	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OpenCity.java	115 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Phone.java	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/PushOrder.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysIntegral.java	111 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysReformist.java	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysTimeoutMoney.java	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TbShowModular.java	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOpenCityService.java	33 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IPushOrderService.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java	85 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityServiceImpl.java	99 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java	83 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java	40 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PushOrderServiceImpl.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java	18 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/SM4Util.java	22 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java	28 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/resources/application-dev.yml	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/resources/application.yml	118 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/resources/application-dev.yml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	MessagePushTravel/src/main/resources/application.yml	21 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/lib/cas-client-oncon-3.0.5.jar	对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/lib/cas-client-oncon-core-1.2.2.jar	对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/pom.xml	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java	51 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/call/server/impl/OrderCallServiceImpl.java	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java	5136 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/newlyAdded/NewlyAddedController.java	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java	46 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java	5291 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CancleOrderMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/PushOrderMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysIntegralMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SystemPriceCityMapper.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SystemPriceMapper.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CancleOrderMapper.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/PushOrderMapper.xml	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SysIntegralMapper.xml	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SystemPriceCityMapper.xml	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SystemPriceMapper.xml	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CancleOrder.java	195 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Phone.java	167 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/PushOrder.java	223 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysIntegral.java	111 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemPrice.java	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SystemPriceCity.java	42 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TbShowModular.java	154 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TbSpellOrderRule.java	123 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICancleOrderService.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOpenCityService.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IPushOrderService.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISystemPriceCityService.java	22 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CancleOrderServiceImpl.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityServiceImpl.java	13 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java	46 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PushOrderServiceImpl.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java	230 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemPriceCityServiceImpl.java	36 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java	125 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/GoodsInfoRequest.java	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/ServerCarModelWarpper.java	104 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java	4357 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/resources/application-dev.yml	116 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/resources/application.yml	43 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史