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

liujie

7 天以前 3a0bef313cbc6cd71bcb234d208805c022827e13

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

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java

@@ -532,7 +532,7 @@
        goodsInfo1.setCustId("CB0000004686");
        goodsInfo1.setCustName("证联消费平台交易客户");
        goodsInfo1.setBusinessType("10408");
        goodsInfo1.setAgreementNo("00000000468618354161754464398681");
        goodsInfo1.setAgreementNo("prod".equals(qianYunTongConfig.getActiveProfile()) ? "00000402485377063581755054680461" : "00000000468618354161754464398681");
        goodsInfo1.setProfitSharing("1");
        goodsInfo.add(goodsInfo1);
        tradePayOffData.setGoodsInfo(goodsInfo);

 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\\Admin\\Desktop\\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");

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/TokenUtil.java

@@ -38,10 +38,11 @@
        headerMap.put("encrp", "1");
        headerMap.put("encrpNo", zhengLianConfig.getEncrpNo());
        headerMap.put("timestamp", sdf.format(new Date()));
		
        log.info("【证联获取token】请求头报文："+JSON.toJSONString(headerMap));
        
        tokenRequest.setAppId(zhengLianConfig.getAppid());
        String reqBO = JSON.toJSONString(tokenRequest);
        log.info("【证联获取token】请求体报文："+reqBO);
        // 生成对称加密秘钥
        String key = ZhengLianUtil.generateKey(16);
        // 加密数据
@@ -55,31 +56,32 @@
        body.setData(jsonData);
        body.setSign(ZhengLianUtil.sign(jsonData));
        body.setSecret(secrtKey);
        log.info("【证联获取token】请求体密文报文："+JSON.toJSONString(body));
        String result = ZLHttpClientUtil.doPost(zhengLianConfig.getUrl(), headerMap, JSON.toJSONString(body));
        
        System.out.println("应答内容："+ result);
        log.info("【证联获取token】应答内容："+ result);
        MessageBody respBody = JSON.parseObject(result,MessageBody.class);
        // 验签
        boolean checkResult = SM2Util.verify(publicKey, zhengLianConfig.getEncrpNo(), respBody.getSign(), respBody.getData());
        System.out.println("验签结果：" + checkResult);
        log.info("【证联获取token】验签结果：" + checkResult);
        // 获取私钥
        String privateKey = ZhengLianUtil.getPrivateKey();
        // 解密对称秘钥
        String k = SM2Util.decrypt(privateKey, respBody.getSecret());
        System.out.println("对称秘钥：" + k);
        log.info("【证联获取token】对称秘钥：" + k);
        // 解密业务报文
        String backData = SM4Util.sm4EcbDecrypt(k, respBody.getData());
        System.out.println("返回业务报文：" + backData);
        log.info("【证联获取token】返回业务报文：" + backData);
        JSONObject jsonObject = JSON.parseObject(backData);
        String sysRtnCode = jsonObject.getString("sysRtnCode");
        if(!"000000".equals(sysRtnCode)){
            log.error("获取token失败！{}", jsonObject.getString("sysRtnMsg"));
            log.error("【证联获取token】获取token失败！{}", jsonObject.getString("sysRtnMsg"));
            throw new Exception(jsonObject.getString("sysRtnMsg"));
        }
        JSONObject bizData = jsonObject.getJSONObject("bizData");
        String resCode = bizData.getString("resCode");
        if(!"S010000".equals(resCode)){
            log.error("获取token失败！{}", bizData.getString("resMsg"));
            log.error("【证联获取token】获取token失败！{}", bizData.getString("resMsg"));
            throw new Exception(jsonObject.getString("resMsg"));
        }
        JSONObject resData = bizData.getJSONObject("resData");

 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\\Admin\\Desktop\\qyt\\1055490595.cer";
            this.sm2 = "C:\\Users\\Admin\\Desktop\\qyt\\871_111111.sm2";
            this.cer = "C:\\Users\\39373\\Desktop\\黔云通\\UAT-demo-公用\\1055490595.cer";
            this.sm2 = "C:\\Users\\39373\\Desktop\\黔云通\\UAT-demo-公用\\871_111111.sm2";
            this.password = "111111";
        }
        if("test".equals(activeProfile)){

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianUtil.java

@@ -56,12 +56,14 @@
        headerMap.put("encrp", "1");
        headerMap.put("encrpNo", zhengLianConfig.getEncrpNo());
        headerMap.put("timestamp", sdf.format(new Date()));
        log.info("【证联获取用户信息】请求头报文："+JSON.toJSONString(headerMap));
        
        Map<String, Object> map = new HashMap<>();
        map.put("appId", zhengLianConfig.getAppid());
        map.put("appUserId", appUserId);
        map.put("tradeTerminalInfo", tradeTerminalInfo);
        String reqBO = JSON.toJSONString(map);
        log.info("【证联获取用户信息】请求体报文："+reqBO);
        // 生成对称加密秘钥
        String key = ZhengLianUtil.generateKey(16);
        // 加密数据
@@ -75,25 +77,26 @@
        body.setData(jsonData);
        body.setSign(ZhengLianUtil.sign(jsonData));
        body.setSecret(secrtKey);
        log.info("【证联获取用户信息】请求体密文报文："+JSON.toJSONString(body));
        String result = ZLHttpClientUtil.doPost(zhengLianConfig.getUrl(), headerMap, JSON.toJSONString(body));
        
        System.out.println("应答内容："+ result);
        log.info("【证联获取用户信息】应答内容："+ result);
        MessageBody respBody = JSON.parseObject(result,MessageBody.class);
        // 验签
        boolean checkResult = SM2Util.verify(publicKey, zhengLianConfig.getEncrpNo(), respBody.getSign(), respBody.getData());
        System.out.println("验签结果：" + checkResult);
        log.info("【证联获取用户信息】验签结果：" + checkResult);
        // 获取私钥
        String privateKey = ZhengLianUtil.getPrivateKey();
        // 解密对称秘钥
        String k = SM2Util.decrypt(privateKey, respBody.getSecret());
        System.out.println("对称秘钥：" + k);
        log.info("【证联获取用户信息】对称秘钥：" + k);
        // 解密业务报文
        String backData = SM4Util.sm4EcbDecrypt(k, respBody.getData());
        System.out.println("返回业务报文：" + backData);
        log.info("【证联获取用户信息】返回业务报文：" + backData);
        JSONObject jsonObject = JSON.parseObject(backData);
        String sysRtnCode = jsonObject.getString("sysRtnCode");
        if(!"000000".equals(sysRtnCode)){
            log.error("查询用户信息失败！{}", jsonObject.getString("sysRtnMsg"));
            log.error("【证联获取用户信息】查询用户信息失败！{}", jsonObject.getString("sysRtnMsg"));
            throw new Exception(jsonObject.getString("sysRtnMsg"));
        }
        JSONObject bizData = jsonObject.getJSONObject("bizData");
@@ -102,7 +105,7 @@
            return null;
        }
        if(!"S010000".equals(resCode)){
            log.error("查询用户信息失败！{}", bizData.getString("resMsg"));
            log.error("【证联获取用户信息】查询用户信息失败！{}", bizData.getString("resMsg"));
            throw new Exception(jsonObject.getString("resMsg"));
        }
        JSONObject resData = bizData.getJSONObject("resData");

 DriverQYTTravel/guns-admin/src/main/resources/application-dev.yml

@@ -34,8 +34,7 @@
        password: 123456
        database: 0
        timeout: 1000
#        cluster:
#            nodes: 127.0.0.1:6379
        
mybatis-plus:
    typeAliasesPackage: com.stylefeng.guns.modular
    global-config:
@@ -103,7 +102,7 @@
    masterSecret-dispatch: 111 #用于服务器端 API 调用时与 AppKey 配合使用达到鉴权的目的

qyt:
    socket_uri: http://192.168.110.85:6000
    socket_uri: http://192.168.110.111:6000

---


 DriverQYTTravel/guns-admin/src/main/resources/application-test.yml

@@ -111,7 +111,7 @@

---
qyt:
    socket_uri: http://10.88.188.199:6000
    socket_uri: http://10.88.188.138:6000
---

#支付回调地址

 DriverQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java

@@ -1,47 +1,47 @@
//package com.stylefeng.guns;
//
//import com.stylefeng.guns.modular.system.model.Driver;
//import com.stylefeng.guns.modular.system.service.IDriverService;
//import com.stylefeng.guns.modular.system.util.zhenglian.ZhengLianUtil;
//import com.stylefeng.guns.modular.system.util.zhenglian.model.TokenRequest;
//import com.stylefeng.guns.modular.system.util.zhenglian.model.TradeTerminalInfo;
//import com.stylefeng.guns.modular.system.util.zhenglian.model.ZLUserInfo;
//import org.junit.Test;
//import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.boot.test.context.SpringBootTest;
//import org.springframework.data.mongodb.core.MongoTemplate;
//import org.springframework.test.context.junit4.SpringRunner;
//
//@RunWith(SpringRunner.class)
//@SpringBootTest
//public class GunsApplicationTest {
//
//    @Autowired
//    private MongoTemplate mongoTemplate;
//    @Autowired
//    private IDriverService driverService;
//
//
//    @Test
//    public void test() {
//
//        Driver driver = driverService.selectById(14);
//        TokenRequest tokenRequest = new TokenRequest();
//        tokenRequest.setAppUserId(driver.getEmpId().toString());
//        tokenRequest.setUserName(driver.getName());
//        tokenRequest.setCertNo(driver.getIdCard());
//        tokenRequest.setPhone(driver.getPhone());
//        TradeTerminalInfo tradeTerminalInfo = new TradeTerminalInfo();
//        tradeTerminalInfo.setIp("127.0.0.1");
//        tradeTerminalInfo.setTerminal("1");
//        tradeTerminalInfo.setMac("");
//        ZLUserInfo userInfo = null;
//        try {
//            userInfo = ZhengLianUtil.getUserInfo("14", tradeTerminalInfo);
//        } catch (Exception e) {
//            throw new RuntimeException(e);
//        }
//        System.err.println(userInfo);
//    }
//}
package com.stylefeng.guns;

import com.stylefeng.guns.modular.system.model.Driver;
import com.stylefeng.guns.modular.system.service.IDriverService;
import com.stylefeng.guns.modular.system.util.zhenglian.TokenUtil;
import com.stylefeng.guns.modular.system.util.zhenglian.model.TokenRequest;
import com.stylefeng.guns.modular.system.util.zhenglian.model.TradeTerminalInfo;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.test.context.junit4.SpringRunner;

@RunWith(SpringRunner.class)
@SpringBootTest
public class GunsApplicationTest {

    @Autowired
    private MongoTemplate mongoTemplate;
    @Autowired
    private IDriverService driverService;


    @Test
    public void test() {

        Driver driver = driverService.selectById(14);
        TokenRequest tokenRequest = new TokenRequest();
        tokenRequest.setAppUserId(driver.getEmpId().toString());
        tokenRequest.setUserName(driver.getName());
        tokenRequest.setCertNo(driver.getIdCard());
        tokenRequest.setPhone(driver.getPhone());
        TradeTerminalInfo tradeTerminalInfo = new TradeTerminalInfo();
        tradeTerminalInfo.setIp("127.0.0.1");
        tradeTerminalInfo.setTerminal("1");
        tradeTerminalInfo.setMac("111-111-111-111");
        tokenRequest.setTradeTerminalInfo(tradeTerminalInfo);
        tokenRequest.setType("04");
        try {
            String token = TokenUtil.getToken(tokenRequest);
            System.err.println(token);
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
    }
}

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java

@@ -383,10 +383,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 && !systemPriceCity.getId().equals(one.getId())){
                    return new ErrorTip(500, "不能重复添加城市");
                }

 ManagementQYTTravel/guns-admin/src/main/resources/application-dev.yml

@@ -29,7 +29,7 @@
      max-request-size: 500MB
      max-file-size: 500MB
  redis:
    host: 192.168.110.80
    host: 127.0.0.1
    port: 6379
    password: 123456


 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tInvoice/tInvoice.js

@@ -75,13 +75,13 @@
            formatter: function (value, row) {
                var btn = "";
                if('' != row.remark && typeof row.remark != "undefined"){
                    btn + "备注说明：" + row.remark + "\n"
                    btn += "备注说明：" + row.remark + "\n"
                }
                if('' != row.address && typeof row.address != "undefined"){
                    btn + "地址和电话：" + row.address + "\n"
                    btn += "地址和电话：" + row.address + "\n"
                }
                if('' != row.bank && typeof row.bank != "undefined"){
                    btn + "开户行和账号：" + row.bank + "\n"
                    btn += "开户行和账号：" + row.bank + "\n"
                }
                return btn;
            }

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java

@@ -180,7 +180,11 @@
    @Autowired
    private TAbnormalPayOrderMapper abnormalPayOrderMapper;


    @Resource
    private CarMapper carMapper;
	
    @Resource
    private CarModelMapper carModelMapper;

    @Autowired
    private TDriverPromotionActivityService driverPromotionActivityService;
@@ -1982,17 +1986,30 @@
                    }
                }).start();
            }
            Driver driver = driverService.selectById(orderCrossCity.getDriverId());
            
            //修改司机座位
            LineShiftDriver lineShiftDriver = lineShiftDriverMapper.selectById(orderCrossCity.getLineShiftDriverId());
            lineShiftDriver.setLaveSeat(lineShiftDriver.getLaveSeat() + orderCrossCity.getPeopleNumber());
            lineShiftDriver.setLaveSeatNumber(lineShiftDriver.getLaveSeatNumber() + (orderCrossCity.getTravelMode() == 1 ? "," : "") + orderCrossCity.getSeatNumber());
            lineShiftDriverMapper.updateById(lineShiftDriver);
            if(1 == orderCrossCity.getTravelMode()){
                LineShiftDriver lineShiftDriver = lineShiftDriverMapper.selectById(orderCrossCity.getLineShiftDriverId());
                lineShiftDriver.setLaveSeat(lineShiftDriver.getLaveSeat() + orderCrossCity.getPeopleNumber());
                lineShiftDriver.setLaveSeatNumber(lineShiftDriver.getLaveSeatNumber() + (orderCrossCity.getTravelMode() == 1 ? "," : "") + orderCrossCity.getSeatNumber());
                lineShiftDriverMapper.updateById(lineShiftDriver);
            }else{
                Car car = carMapper.selectById(driver.getCarId());
                CarModel carModel = carModelMapper.selectById(car.getCarModelId());
                LineShiftDriver lineShiftDriver = lineShiftDriverMapper.selectById(orderCrossCity.getLineShiftDriverId());
                lineShiftDriver.setLaveSeat(carModel.getSeat() - 1);
                String seatNumber = "";
                for(int i = 1; i < carModel.getSeat(); i++){
                    seatNumber += i + ",";
                }
                lineShiftDriver.setLaveSeatNumber(seatNumber.substring(0, seatNumber.length() - 1));
                lineShiftDriverMapper.updateById(lineShiftDriver);
            }
            
            //修改司机为空闲
            List<OrderCrossCity> orderCrossCities = orderCrossCityMapper.queryByDriverId(orderCrossCity.getDriverId(), 2, 3, 4, 5, 11);
            if (orderCrossCities.size() == 0) {
                Driver driver = driverService.selectById(orderCrossCity.getDriverId());
                driver.setState(2);
                driverService.updateById(driver);
            }

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml

@@ -611,7 +611,7 @@
            id as orderId,
            rideType as rideType,
            DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as orderTime,
            DATE_FORMAT(travelTime, '%m月?d日 %H:%i') as time,
            DATE_FORMAT(travelTime, '%m月%d日 %H:%i') as time,
        startAddress as startAddress,
        endAddress as endAddress,
        driverId as driverId,

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CarModelMapper.java

New file
@@ -0,0 +1,14 @@
package com.stylefeng.guns.modular.system.dao;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.stylefeng.guns.modular.system.model.CarModel;
import org.apache.ibatis.annotations.Param;

import java.util.List;
import java.util.Map;

public interface CarModelMapper extends BaseMapper<CarModel> {


    List<Map<String, Object>> query(@Param("brandId") Integer brandId) throws Exception;
}

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarModelMapper.xml

New file
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.stylefeng.guns.modular.system.dao.CarModelMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.CarModel">
        <id column="id" property="id"/>
        <result column="name" property="name"/>
        <result column="remark" property="remark"/>
        <result column="insertTime" property="insertTime"/>
        <result column="state" property="state"/>
        <result column="seat" property="seat"/>
        <result column="brandId" property="brandId"/>
    </resultMap>


    <select id="query" resultType="map">
        select
        id as id,
        name as name
        from t_car_model where state = 1 and brandId = #{brandId}
    </select>
</mapper>

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CarModel.java

New file
@@ -0,0 +1,120 @@
package com.stylefeng.guns.modular.system.model;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;

import java.util.Date;

/**
 * 车辆型号
 */
@TableName("t_car_model")
public class CarModel {
    /**
     * 主键
     */
    @TableId(value = "id", type = IdType.AUTO)
    @TableField("id")
    private Integer id;
    /**
     * 名称
     */
    @TableField("name")
    private String name;
    /**
     * 备注
     */
    @TableField("remark")
    private String remark;
    /**
     * 添加时间
     */
    @TableField("insertTime")
    private Date insertTime;
    /**
     * 状态（1=正常，2=删除）
     */
    @TableField("state")
    private Integer state;
    /**
     * 座位数
     */
    @TableField("seat")
    private Integer seat;
    /**
     * 车辆品牌id
     */
    @TableField("brandId")
    private Integer brandId;

    public Integer getId() {
        return id;
    }

    public void setId(Integer id) {
        this.id = id;
    }

    public String getName() {
        return name;
    }

    public void setName(String name) {
        this.name = name;
    }

    public String getRemark() {
        return remark;
    }

    public void setRemark(String remark) {
        this.remark = remark;
    }

    public Date getInsertTime() {
        return insertTime;
    }

    public void setInsertTime(Date insertTime) {
        this.insertTime = insertTime;
    }

    public Integer getState() {
        return state;
    }

    public void setState(Integer state) {
        this.state = state;
    }

    public Integer getSeat() {
        return seat;
    }

    public void setSeat(Integer seat) {
        this.seat = seat;
    }

    public Integer getBrandId() {
        return brandId;
    }

    public void setBrandId(Integer brandId) {
        this.brandId = brandId;
    }

    @Override
    public String toString() {
        return "CarModel{" +
                "id=" + id +
                ", name='" + name + '\'' +
                ", remark='" + remark + '\'' +
                ", insertTime=" + insertTime +
                ", state=" + state +
                ", seat=" + seat +
                ", brandId=" + brandId +
                '}';
    }
}

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java

@@ -533,7 +533,7 @@
        goodsInfo1.setCustId("CB0000004686");
        goodsInfo1.setCustName("证联消费平台交易客户");
        goodsInfo1.setBusinessType("10408");
        goodsInfo1.setAgreementNo("00000000468618354161754464398681");
        goodsInfo1.setAgreementNo("prod".equals(qianYunTongConfig.getActiveProfile()) ? "00000402485377063581755054680461" : "00000000468618354161754464398681");
        goodsInfo1.setProfitSharing("1");
        goodsInfo.add(goodsInfo1);
        tradePayOffData.setGoodsInfo(goodsInfo);

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java

@@ -160,7 +160,7 @@
    public QianYunTongConfig getQianYunTongConfig() {
        if("dev".equals(activeProfile)){
            this.appkey = "10001104";
            this.privateKeyPath = "C:\\Users\\Admin\\Desktop\\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");

 UserQYTTravel/guns-admin/src/main/resources/application-dev.yml

@@ -33,14 +33,6 @@
    port: 6379
    password: 123456
    database: 0
  #  redis:
  #    host: 172.21.35.151
  #    port: 6512
  #    password: SC_cache@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

mybatis-plus:
  typeAliasesPackage: com.stylefeng.guns.modular
@@ -52,7 +44,7 @@
eureka:
  client:
    service-url: #注册中心地址
      defaultZone: http://sinata:sinata@192.168.110.85:8000/eureka #启用身份验证的方式连接
      defaultZone: http://sinata:sinata@192.168.110.15:8000/eureka #启用身份验证的方式连接
    register-with-eureka: true #在注册中心进行注册
    fetch-registry: true #从Eureka中获取注册信息。

@@ -115,7 +107,7 @@
  appKey: 111 #

qyt:
  socket_uri: http://192.168.110.85:6000
  socket_uri: http://192.168.110.111:6000

---


 UserQYTTravel/guns-admin/src/main/resources/application-test.yml

@@ -106,7 +106,7 @@
  appKey: 111 #

qyt:
  socket_uri: http://10.88.188.199:6000
  socket_uri: http://10.88.188.138:6000
---

#支付回调地址