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

liujie

6 天以前 729a5a0592cac7750e8b476c5fcb25bfc3ff8d25

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

@@ -29,7 +29,7 @@
                max-request-size: 100MB
                max-file-size: 100MB
    redis:
        host: 127.0.0.1
        host: 192.168.110.80
        port: 6379
        password: 123456
        database: 0
@@ -78,6 +78,7 @@
    appletsAppSecret: 5610fc6126255ca5f7bd9fa4330338b6 #
    mchId: 111 #微信支付分配的商户号
    key: 111 #key为商户平台设置的密钥key：
    url: https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={0}&secret={1}

---