Pu Zhibing
8 天以前 ab33b49ff5bc2fbccfe7929d1419ba00e53178a7
修改配置
4个文件已修改
95 ■■■■ 已修改文件
ManagementOKTravel/guns-admin/pom.xml 73 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementOKTravel/guns-admin/src/main/resources/application.yml 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZuulOKTravel/src/main/java/com/sinata/zuul/util/applets/WebSocketHandler.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementOKTravel/guns-admin/pom.xml
@@ -4,8 +4,9 @@
    <modelVersion>4.0.0</modelVersion>
   
    <artifactId>guns-admin</artifactId>
    <artifactId>management</artifactId>
    <name>guns-admin</name>
    <version>1.0.0</version>
    <description>guns 的spring boot版本</description>
     <parent>
        <groupId>com.stylefeng</groupId>
@@ -13,7 +14,7 @@
        <version>1.0.0</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <packaging>war</packaging>
    <packaging>jar</packaging>
    <dependencies>
        <!--<dependency>
@@ -249,47 +250,47 @@
    <build>
        <!--<plugins>-->
            <!--<plugin>-->
                <!--<groupId>org.springframework.boot</groupId>-->
                <!--<artifactId>spring-boot-maven-plugin</artifactId>-->
                <!--<configuration>-->
                    <!--<fork>true</fork>&lt;!&ndash; 如果没有该项配置,肯呢个devtools不会起作用,即应用不会restart &ndash;&gt;-->
                <!--</configuration>-->
            <!--</plugin>-->
            <!--<plugin>-->
                <!--<groupId>org.apache.maven.plugins</groupId>-->
                <!--<artifactId>maven-surefire-plugin</artifactId>-->
                <!--<configuration>-->
                     <!--<skip>true</skip>-->
                <!--</configuration>-->
            <!--</plugin>-->
        <!--</plugins>-->
        <!--打包war包引入本地jar的打包方式-->
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-war-plugin</artifactId>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <configuration>
                    <!-- 设置成false,否则检查web.xml是否存在。因为springboot是没有web.xml的 -->
                    <failOnMissingWebXml>false</failOnMissingWebXml>
                    <!--打包后的项目名-->
                    <!--<warName>example</warName>-->
                    <webResources>
                        <resource>
                            <!--把本地lib里面的jar复制到lib-->
                            <directory>${project.basedir}/lib</directory>
                            <targetPath>WEB-INF/lib/</targetPath>
                            <includes>
                                <include>**/*.jar</include>
                            </includes>
                        </resource>
                    </webResources>
                    <fork>true</fork><!-- 如果没有该项配置,肯呢个devtools不会起作用,即应用不会restart -->
                </configuration>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-surefire-plugin</artifactId>
                <configuration>
                     <skip>true</skip>
                </configuration>
            </plugin>
        </plugins>
        <!--打包war包引入本地jar的打包方式-->
<!--        <plugins>-->
<!--            <plugin>-->
<!--                <groupId>org.apache.maven.plugins</groupId>-->
<!--                <artifactId>maven-war-plugin</artifactId>-->
<!--                <configuration>-->
<!--                    &lt;!&ndash; 设置成false,否则检查web.xml是否存在。因为springboot是没有web.xml的 &ndash;&gt;-->
<!--                    <failOnMissingWebXml>false</failOnMissingWebXml>-->
<!--                    &lt;!&ndash;打包后的项目名&ndash;&gt;-->
<!--                    &lt;!&ndash;<warName>example</warName>&ndash;&gt;-->
<!--                    <webResources>-->
<!--                        <resource>-->
<!--                            &lt;!&ndash;把本地lib里面的jar复制到lib&ndash;&gt;-->
<!--                            <directory>${project.basedir}/lib</directory>-->
<!--                            <targetPath>WEB-INF/lib/</targetPath>-->
<!--                            <includes>-->
<!--                                <include>**/*.jar</include>-->
<!--                            </includes>-->
<!--                        </resource>-->
<!--                    </webResources>-->
<!--                </configuration>-->
<!--            </plugin>-->
<!--        </plugins>-->
        <resources>
            <resource>
                <directory>lib</directory>
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java
@@ -2,7 +2,7 @@
public class PushURL {
//    public static String zull_user_url = "https://okyueche.com:443";
    public static String zull_user_url = "https://www.kuaiyuncx.com:81";
    public static String zull_user_url = "http://127.0.0.1:81";
    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";
ManagementOKTravel/guns-admin/src/main/resources/application.yml
@@ -2,7 +2,7 @@
  port: 8010
guns:
  swagger-open: true              #是否开启swagger (true/false)
  swagger-open: false              #是否开启swagger (true/false)
  kaptcha-open: false             #是否开启登录时验证码 (true/false)
  spring-session-open: false      #是否开启spring session,如果是多机环境需要开启(true/false)
  session-invalidate-time: 1800     #session失效时间(只在单机环境下生效,多机环境在SpringSessionConfig类中配置) 单位:秒
@@ -55,22 +55,12 @@
---
#spring:
#  profiles: local
#  datasource:
#    url: jdbc:mysql://127.0.0.1:3306/oktravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
#    username: oktravel
#    password: Si8bnm5KPGSZkF3F
#    db-name: guns #用来搜集数据库的所有表
#    filters: wall,mergeStat
spring:
  profiles: local
  datasource:
    url: jdbc:mysql://127.0.0.1:3306/kytravel?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
    username: root
    password: 123456
    password: Si8bnm5KPGSZkF3F
    db-name: oktravel #用来搜集数据库的所有表
    filters: wall,mergeStat
@@ -108,14 +98,14 @@
  alipay_public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArKJKjjRljNoYwA0M69KtVALvIyc2w/M6i51cuPgUSsq8jhBfsIX6Jd35mwW0q1wC4H+V937iEaIAM9jerN6CnJPo0AcO3U53EKDb/ewx4HmiXGLcbc5dxiBa4gdCgD2hsA0Kk4qXQoH2yHFMR2tjY2QMwDtOfPHsgEQcLHnr7Do6dKxyE3+QKSVGEs05IhkOEXfc2xON4KwZrJJtW4CEMgTOnxVEwup1DlwurDwx4bgBWiGffFVbBRtZ287+/N5S1ij3vz1OSGtNm8UmPSWC4U/3JgaiPcHXLBgGvTN99SGTPmYm/njwftqFvq1u1mrAWkBm6jR7H69pqF4z22SaCwIDAQAB #支付宝公钥
---
filePath: /usr/local/server/orderPostionFile/ #存储订单轨迹文件路径
filePath: /root/server/app/orderPostionFile/ #存储订单轨迹文件路径
#filePath: C:/orderPostionFile/  #存储订单轨迹文件路径
#支付回调地址
#正式环境
callbackPath: https://www.kuaiyuncx.com:81
callbackPath: https://kuaiyuncx.com
---
#交通部推送数据功能开关
ZuulOKTravel/src/main/java/com/sinata/zuul/util/applets/WebSocketHandler.java
@@ -23,7 +23,7 @@
    //用于websocket握手的处理类
    private WebSocketServerHandshaker handshaker;
    private static final String WEB_SOCKET_URL = "wss://localhost:9090/websocket";
    private static final String WEB_SOCKET_URL = "wss://localhost:8888/websocket";