ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/config/web/WebConfig.java
@@ -206,7 +206,7 @@ registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.loginUrl", "https://testsso1.teamshub.com/login"); registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.validateUrl", "https://testsso1.teamshub.com/serviceValidate"); registrationBean.addInitParameter("com.oncon.md.loginUrl", "https://testsso1.teamshub.com/sso-session/login"); registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.serverName", "http://192.168.110.111:8010"); registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.serverName", "http://127.0.0.1:8010"); } if("test".equals(activeProfile)){ registrationBean.setFilter(onconMDCasFilter); ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
@@ -305,10 +305,10 @@ } if(null == one){ one = systemPriceCityService.selectOne(new EntityWrapper<SystemPriceCity>().eq("areaCode", systemPriceCity.getAreaCode()) .eq("cityCode", systemPriceCity.getCityCode()).ne("flag", 3)); .eq("cityCode", systemPriceCity.getCityCode()).isNull("provinceCode").ne("flag", 3)); if(null == one){ one = systemPriceCityService.selectOne(new EntityWrapper<SystemPriceCity>().eq("areaCode", systemPriceCity.getAreaCode()) .ne("flag", 3)); .isNull("cityCode").isNull("provinceCode").ne("flag", 3)); if(null != one){ return new ErrorTip(500, "不能重复添加城市"); } ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java
@@ -96,11 +96,11 @@ String onconParam = edu.yale.its.tp.cas.client.Util.getOnconParam(session); onconParam = new String(Base64.decodeBase64(onconParam), "UTF-8"); LoginUser loginUser = JSON.parseObject(onconParam, LoginUser.class); System.err.println("session解析结果：" + JSON.toJSONString(loginUser)); //获取菜单列表 User user = userMapper.getByAccount(loginUser.getImUser()); if (null == user) { logOut(request); System.err.println("用户不存在"); return null; } ShiroUser shiroUser = shiro.shiroUser(user); @@ -132,8 +132,6 @@ */ @RequestMapping(value = "/logout", method = RequestMethod.GET) public String logOut(HttpServletRequest request) { request.getSession().invalidate(); HttpUtil.get("https://passport.teamshub.com/logout?logouturl=https%3A%2F%2Fsso.teamshub.com%2Flogout%3Flogoutat%3Dhttps%253A%252F%252Ftraffic.qytzt.cn%253A443%252F"); return REDIRECT + "/"; }
@@ -1,7 +1,9 @@ package com.stylefeng.guns.modular.system.util; public class PushURL { public static String zull_user_url = "https://test-qncx.sitechcloud.com"; // public static String zull_user_url = "http://192.168.110.85"; // public static String zull_user_url = "https://test-qncx.sitechcloud.com/chuxing"; public static String zull_user_url = "https://traffic.qytzt.cn/chuxing"; public static String order_push_url = zull_user_url + "/driver/base/order/pushOrderState"; public static String driver_auth_url = zull_user_url + "/driver/base/driver/sendsms"; public static String withdraw_auth_url = zull_user_url + "/driver/base/withdrawal/withdrawalAudit"; ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java
@@ -161,7 +161,7 @@ public QianYunTongConfig getQianYunTongConfig() { if("dev".equals(activeProfile)){ this.appkey = "10001104"; this.privateKeyPath = "C:\\Users\\Admin\\Desktop\\qyt\\private_key_test.pem"; this.privateKeyPath = "C:\\Users\\39373\\Desktop\\黔云通\\private_key_test.pem"; this.userName = "xiaofei"; this.status = "1"; this.setApiUrl("https://test-zhongtai.stqcloud.com:10070"); @@ -187,13 +187,13 @@ } if("prod".equals(activeProfile)){ this.setAppkey("10001104"); this.setPrivateKeyPath("/root/server/app/key/private_key.pem"); this.setPrivateKeyPath("/etraffic/server/private_key.pem"); this.setUserName("xiwang"); this.setStatus("1"); this.setApiUrl("http://jjzhongtai.stqcloud.com:10010"); this.setBucketName("qyt20250702"); this.setAppId("wxcc3c9058e2b294db"); this.setEndPoint("http://119.4.112.68:27741/v1"); this.setEndPoint("http://10.30.52.45:27741/v1"); this.setAccount("d8bef0a04db511f0b79d01a3e2b7587e"); this.setAccessKey("TYMFTFD5SIIT15DCCUD7"); this.setSecretKey("AoI1dkH3yoAvXoaQlREO3ed9mwQJFluLTliS9T1z"); ManagementQYTTravel/guns-admin/src/main/resources/application-dev.yml
@@ -56,7 +56,7 @@ spring: data: mongodb: uri: mongodb://127.0.0.1:27017/traveling_track uri: mongodb://192.168.110.80:27017/traveling_track --- ManagementQYTTravel/guns-admin/src/main/resources/application-prod.yml
@@ -29,13 +29,13 @@ max-request-size: 500MB max-file-size: 500MB redis: host: 172.21.35.151 port: 6512 password: SC_cache@20#25 host: 10.31.1.219 port: 6410 password: Qnz_jt@20#25 database: 0 timeout: 1000 cluster: nodes: 172.21.35.151:6512,172.21.35.152:6512,172.21.35.153:6512,172.21.35.151:6513,172.21.35.152:6513,172.21.35.153:6513 nodes: 10.31.1.219:6410,10.31.1.30:6410,10.31.1.97:6410 mybatis-plus: type-aliases-package: com.stylefeng.guns.modular @@ -49,9 +49,9 @@ --- spring: datasource: url: jdbc:mysql://172.21.35.140:8066/traffic_scdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai username: traffic_scusr password: QYT_sc@20#25 url: jdbc:mysql://10.31.9.146:8066/qnjt_ridingdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai username: qnjt_ridingusr password: qnjtriding@Prom2025 db-name: traffic_scdb #用来搜集数据库的所有表 filters: wall,mergeStat @@ -60,7 +60,11 @@ spring: data: mongodb: uri: mongodb://qyt_jtcx:qyt_jtcx2025@172.21.35.195:27017,172.21.35.196:27017/traveling_track host: 10.31.204.66 port: 27009 username: qnjt_ridingmgdb password: qnjtriding@Prom2025 database: qnjt_ridingmgdb --- @@ -81,13 +85,11 @@ alipayPublicKey: 1111 #应用公钥 alipay_public_key: 1111 #支付宝公钥 --- #支付回调地址 #正式环境 callbackPath: https://traffic.qytzt.cn callbackPath: https://traffic.qytzt.cn/chuxing #交通部推送数据功能开关 pushMinistryOfTransport: false MessagePushTravel/pom.xml
@@ -92,4 +92,28 @@ </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>produce</id> <properties> <spring.active>produce</spring.active> </properties> </profile> </profiles> </project> MessagePushTravel/src/main/java/com/sinata/push/util/echo/NettyServerController.java
@@ -5,6 +5,7 @@ import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.sinata.push.config.QYTConfig; import com.sinata.push.util.*; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -34,6 +35,8 @@ public static Hashtable<String,String> table; public static QYTConfig qytConfig; private RedisUtil redisUtil = SpringUtil.getObject(RedisUtil.class); @@ -45,6 +48,11 @@ if(table == null){ table = new Hashtable<>(); } } public static void setQytConfig(QYTConfig qytConfig) { NettyServerController.qytConfig = qytConfig; } public static boolean isdebug = false; @@ -201,7 +209,7 @@ params.put("lat", String.valueOf(lat)); params.put("directionAngle", String.valueOf(computeAzimuth)); params.put("altitude", String.valueOf(altitude)); HttpRequest post = HttpUtil.createPost(URLUtil.zuul + "/driver-server/base/savePosition"); HttpRequest post = HttpUtil.createPost(qytConfig.getChuxingUrl() + "/driver-server/base/savePosition"); post.contentType(MediaType.APPLICATION_FORM_URLENCODED_VALUE); post.form(params); HttpResponse execute = post.execute(); @@ -228,7 +236,7 @@ params.put("lat", String.valueOf(lat)); params.put("directionAngle", String.valueOf(computeAzimuth)); params.put("altitude", String.valueOf(altitude)); HttpRequest post = HttpUtil.createPost(URLUtil.aj_zuul + "/driver-server/base/driver/addDriverPosition"); HttpRequest post = HttpUtil.createPost(qytConfig.getDaijiaurl() + "/driver-server/base/driver/addDriverPosition"); post.contentType(MediaType.APPLICATION_FORM_URLENCODED_VALUE); post.form(params); HttpResponse execute = post.execute(); MessagePushTravel/src/main/resources/application.yml
@@ -2,23 +2,5 @@ port: 6000 spring: profiles: active: dev # active: prod application: name: message #服务名称 servlet: multipart: 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 active: '@spring.active@'
@@ -10,6 +10,7 @@ //import com.stylefeng.guns.modular.system.service.IDriverService; //import com.stylefeng.guns.modular.system.service.IUserInfoService; //import com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil; //import com.stylefeng.guns.modular.system.util.qianyuntong.UserUtil; //import com.stylefeng.guns.modular.system.util.qianyuntong.model.*; //import com.stylefeng.guns.modular.taxi.service.IPaymentRecordService; //import lombok.extern.slf4j.Slf4j; @@ -52,122 +53,7 @@ // // @Test // public void test(){ // OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(228); // Driver driver = driverService.selectById(orderPrivateCar.getDriverId()); // Company company = companyService.selectById(driver.getCompanyId()); // UserInfo userInfo = userInfoService.selectById(orderPrivateCar.getUserId()); // if(null == orderPrivateCar.getIsCreated()){ // //先调中台创建订单 // CreateOrderRequest createOrderRequest = new CreateOrderRequest(); // createOrderRequest.setTreatShopId(driver.getEmpId().toString()); // createOrderRequest.setField1("{\"profitSharing\":\"1\",\"isPromote\":\"" + (orderPrivateCar.getPromotion() == 2 ? 1 : 0) + "\"}"); // createOrderRequest.setCharge(new BigDecimal(orderPrivateCar.getOrderMoney())); // createOrderRequest.setOrderNo("PR" + orderPrivateCar.getId()); // createOrderRequest.setOrderId(orderPrivateCar.getTravelId()); // createOrderRequest.setCustomerId(userInfo.getOnconUUID()); // OrderInfo orderInfo = OrderUtil.tradeOrderCreate(createOrderRequest); // orderPrivateCar.setIsCreated(1); // orderPrivateCar.setTravelId(orderInfo.getOrderId()); // orderPrivateCarService.updateById(orderPrivateCar); // } // //使用备付金进行支付订单 // TradePayOffData tradePayOffData = new TradePayOffData(); // tradePayOffData.setPartnerPayId(orderPrivateCar.getTravelId()); // tradePayOffData.setTotalFee(Double.valueOf(orderPrivateCar.getOrderMoney() * 100).intValue() + ""); // tradePayOffData.setOrderDesc("完成订单"); // PayInfo payInfo = OrderUtil.tradePayOff(tradePayOffData); // String retCode = payInfo.getRetCode(); // if (!"000000".equals(retCode)) { // log.error("备付金支付失败：{}", payInfo.getRetMsg()); // return; // } // PayInfoData data = payInfo.getData(); // String status = data.getStatus(); // if ("3".equals(status)) { // log.error("备付金支付失败：{}", payInfo.getRetMsg()); // return; // } // if("0".equals(status)){ // //查询支付信息 // GetPaymentInfoDataRequest getPaymentInfoDataRequest = new GetPaymentInfoDataRequest(); // getPaymentInfoDataRequest.setPartnerPayId(orderPrivateCar.getTravelId()); // GetPaymentInfo getPaymentInfo = OrderUtil.paymentInfo(getPaymentInfoDataRequest); // status = getPaymentInfo.getStatus(); // } // PayInfoData payInfoData = payInfo.getData(); // PaymentInfo paymentInfo = payInfoData.getPaymentInfos().get(0); // if(!"0".equals(status)){ // //支付成功，通知三方 // PaymentOrderRequest paymentOrderRequest = new PaymentOrderRequest(); // paymentOrderRequest.setPayItemId(paymentInfo.getPayItemId()); // paymentOrderRequest.setPaymentInfo(JSON.toJSONString(payInfoData.getPaymentInfos())); // paymentOrderRequest.setOrderId(orderPrivateCar.getTravelId()); // paymentOrderRequest.setCharge(BigDecimal.valueOf(orderPrivateCar.getOrderMoney())); // paymentOrderRequest.setPayTime(data.getPayTime()); // paymentOrderRequest.setPaymentSerialNumber(payInfoData.getPayId()); // OrderInfo orderInfo1 = OrderUtil.paymentOrder(paymentOrderRequest); // // //中台修改订单状态 // ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest(); // request1.setOrderId(orderPrivateCar.getTravelId()); // request1.setStatus(9); // if (null != orderPrivateCar.getDriverId()) { // request1.setDriverId(driver.getEmpId().toString()); // request1.setSupplierShopId(company.getEnterCode()); // } // if (2 == orderPrivateCar.getPromotion()) { // Driver driver2 = driverService.selectById(orderPrivateCar.getPromotionDriverId()); // request1.setPromoterId(driver2.getEmpId().toString()); // } // OrderUtil.modifyTravelItinerary(request1); // // String payId = payInfo.getData().getPayId(); // //copy原始订单后生成追缴单 // OrderPrivateCar orderPrivateCar1 = new OrderPrivateCar(); // BeanUtils.copyProperties(orderPrivateCar, orderPrivateCar1); // orderPrivateCar1.setId(null); // orderPrivateCar1.setRecoveryOrder(1); // // //修改原始订单为支付状态 // orderPrivateCar.setState(8); // orderPrivateCar.setPayType(5); // orderPrivateCar.setPayMoney(orderPrivateCar.getOrderMoney()); // orderPrivateCarService.updateById(orderPrivateCar); // //保存追缴单 // orderPrivateCarService.insert(orderPrivateCar1); // //添加三方支付记录 // try { // paymentRecordService.saveData(1, orderPrivateCar.getUserId(), 1, orderPrivateCar.getId(), 1, 3, orderPrivateCar.getOrderMoney(), payId, 2); // } catch (Exception e) { // throw new RuntimeException(e); // } // // // Driver driver1 = driverService.selectById(orderPrivateCar1.getDriverId()); // UserInfo userInfo1 = userInfoService.selectById(orderPrivateCar1.getUserId()); // Company company1 = companyService.selectById(driver1.getCompanyId()); // //调三方订单中心创建行程单 // CreateTravelItineraryRequest request = new CreateTravelItineraryRequest(); // request.setOrderNo("PR" + orderPrivateCar1.getId()); // request.setCustomerId(userInfo1.getOnconUUID()); // request.setDriverId(driver1.getEmpId().toString()); // request.setSupplierShopId(company1.getEnterCode()); // request.setServiceType(2); // String travelItinerary = OrderUtil.createTravelItinerary(request); // orderPrivateCar1.setTravelId(travelItinerary); // orderPrivateCar1.setIsCreated(0); // orderPrivateCarService.updateById(orderPrivateCar1); // //修改订单状态为待支付 // ModifyTravelItineraryRequest modifyTravelItineraryRequest = new ModifyTravelItineraryRequest(); // modifyTravelItineraryRequest.setOrderId(orderPrivateCar1.getTravelId()); // modifyTravelItineraryRequest.setStatus(orderPrivateCar1.getState()); // modifyTravelItineraryRequest.setDriverId(driver1.getEmpId().toString()); // modifyTravelItineraryRequest.setSupplierShopId(company1.getEnterCode()); // if (2 == orderPrivateCar1.getPromotion()) { // Driver driver2 = driverService.selectById(orderPrivateCar1.getPromotionDriverId()); // modifyTravelItineraryRequest.setPromoterId(driver2.getEmpId().toString()); // } // OrderUtil.modifyTravelItinerary(modifyTravelItineraryRequest); // } // String onconUUIDByMobile = UserUtil.getOnconUUIDByMobile("15828353127"); // System.err.println(onconUUIDByMobile); // } //} UserQYTTravel/guns-admin/src/test/sql/test.sql
File was deleted
