liujie
2025-08-05 5367f2172a955113068d6c97cde0b78c6c85fdf8
改派
8个文件已修改
29 ■■■■ 已修改文件
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/qianyuntong/QianYunTongProperties.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverQYTTravel/guns-admin/src/main/resources/application-dev.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MessagePushTravel/src/main/java/com/sinata/push/util/URLUtil.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserQYTTravel/guns-admin/src/main/resources/application.yml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java
@@ -71,7 +71,7 @@
    public QianYunTongConfig getQianYunTongConfig() {
        if("dev".equals(activeProfile)){
            this.appkey = "10001104";
            this.privateKeyPath = "C:\\Users\\Administrator\\Desktop\\private_key_test.pem";
            this.privateKeyPath = "C:\\Users\\Admin\\Desktop\\private_key_test.pem";
            this.userName = "xiaofei";
            this.status = "1";
            this.setApiUrl("https://test-zhongtai.stqcloud.com:10070");
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java
@@ -16,7 +16,7 @@
    /**
     * 私钥地址
     */
    String privateKeyPath = "C:\\Users\\Administrator\\Desktop\\private_key_test.pem";
    String privateKeyPath = "C:\\Users\\Admin\\Desktop\\qyt\\private_key_test.pem";
//    String privateKeyPath = "C:\\Users\\39373\\Desktop\\黔云通\\private_key_test.pem";
    /**
     * 私钥地址
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java
@@ -58,8 +58,8 @@
            this.merchNo = "B00000871";
            this.encrpNo = "1055490595";
            this.signNo = "1066348524";
            this.cer = "C:\\Users\\Administrator\\Desktop\\1055490595.cer";
            this.sm2 = "C:\\Users\\Administrator\\Desktop\\871_111111.sm2";
            this.cer = "C:\\Users\\Admin\\Desktop\\qyt\\1055490595.cer";
            this.sm2 = "C:\\Users\\Admin\\Desktop\\qyt\\871_111111.sm2";
            this.password = "111111";
        }
        if("test".equals(activeProfile)){
DriverQYTTravel/guns-admin/src/main/resources/application-dev.yml
@@ -49,7 +49,7 @@
eureka:
    client:
        service-url: #注册中心地址
            defaultZone: http://sinata:sinata@127.0.0.1:8000/eureka #启用身份验证的方式连接
            defaultZone: http://sinata:sinata@192.168.110.111:8000/eureka #启用身份验证的方式连接
        register-with-eureka: true #在注册中心进行注册
        fetch-registry: true #从Eureka中获取注册信息。
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java
@@ -29,6 +29,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
/**
 * 控制器
@@ -300,6 +301,12 @@
        tDriverPromotionActivity.setProvinceCode(province);
        tDriverPromotionActivity.setCityCode(city);
        tDriverPromotionActivity.setDistrictCode(area);
        List<TRegion> code = tRegionService.selectList(new EntityWrapper<TRegion>().in("code", Arrays.asList(province, city, area)));
        tDriverPromotionActivity.setProvince(code.stream().filter(e->e.getCode().equals( province)).collect(Collectors.toList()).get(0).getName());
        tDriverPromotionActivity.setCity(code.stream().filter(e->e.getCode().equals( city)).collect(Collectors.toList()).get(0).getName());
        tDriverPromotionActivity.setDistrict(code.stream().filter(e->e.getCode().equals(area)).collect(Collectors.toList()).get(0).getName());
        String s = time.split(" - ")[0] + " 00:00:00";
        String s1 = time.split(" - ")[1] + " 23:59:59";
        tDriverPromotionActivity.setStartTime(simpleDateFormat.parse(s));
@@ -356,6 +363,11 @@
        tDriverPromotionActivity.setProvinceCode(province);
        tDriverPromotionActivity.setCityCode(city);
        tDriverPromotionActivity.setDistrictCode(area);
        List<TRegion> code = tRegionService.selectList(new EntityWrapper<TRegion>().in("code", Arrays.asList(province, city, area)));
        tDriverPromotionActivity.setProvince(code.stream().filter(e->e.getCode().equals( province)).collect(Collectors.toList()).get(0).getName());
        tDriverPromotionActivity.setCity(code.stream().filter(e->e.getCode().equals( city)).collect(Collectors.toList()).get(0).getName());
        tDriverPromotionActivity.setDistrict(code.stream().filter(e->e.getCode().equals(area)).collect(Collectors.toList()).get(0).getName());
        String s = time.split(" - ")[0] + " 00:00:00";
        String s1 = time.split(" - ")[1] + " 23:59:59";
        tDriverPromotionActivity.setStartTime(simpleDateFormat.parse(s));
MessagePushTravel/src/main/java/com/sinata/push/util/URLUtil.java
@@ -8,5 +8,5 @@
    /**
     * 业务网关接口地址
     */
    String zuul = "http://172.21.35.45:8010";
    String zuul = "http://192.168.110.111:5000";
}
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java
@@ -17,7 +17,7 @@
     * 私钥地址
     */
//    String privateKeyPath = "C:\\Users\\39373\\Desktop\\黔云通\\private_key_test.pem";
    String privateKeyPath = "C:\\Users\\Administrator\\Desktop\\private_key_test.pem";
    String privateKeyPath = "C:\\Users\\Admin\\Desktop\\qyt\\private_key_test.pem";
    /**
     * 私钥地址
     */
UserQYTTravel/guns-admin/src/main/resources/application.yml
@@ -33,6 +33,7 @@
    host: 192.168.110.80
    port: 6379
    password: 123456
    database: 0
  #  redis:
  #    host: 172.21.35.151
  #    port: 6512
@@ -52,7 +53,7 @@
eureka:
  client:
    service-url: #注册中心地址
      defaultZone: http://sinata:sinata@127.0.0.1:8000/eureka #启用身份验证的方式连接
      defaultZone: http://sinata:sinata@192.168.110.111:8000/eureka #启用身份验证的方式连接
    register-with-eureka: true #在注册中心进行注册
    fetch-registry: true #从Eureka中获取注册信息。