puzhibing
2023-04-04 02597c4bd9ad2a41c9c4c479ee1a5eb662c7b475
提交修改后的版本
4个文件已修改
109 ■■■■■ 已修改文件
ManagementZYTravel/guns-admin/pom.xml 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementZYTravel/guns-admin/src/main/resources/application.yml 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementZYTravel/pom.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementZYTravel/guns-admin/pom.xml
@@ -13,7 +13,7 @@
        <version>1.0.0</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <packaging>jar</packaging>
    <packaging>war</packaging>
    <dependencies>
        <!--<dependency>
@@ -217,33 +217,33 @@
    <build>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <configuration>
                    <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>-->
                <!--<groupId>org.springframework.boot</groupId>-->
                <!--<artifactId>spring-boot-maven-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;-->
                    <!--<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>
                <configuration>
                    <!-- 设置成false,否则检查web.xml是否存在。因为springboot是没有web.xml的 -->
                    <failOnMissingWebXml>false</failOnMissingWebXml>
                    <!--打包后的项目名-->
                    <!--<warName>ROOT</warName>-->
                    <!--<webResources>-->
                        <!--<resource>-->
                            <!--&lt;!&ndash;把本地lib里面的jar复制到lib&ndash;&gt;-->
@@ -254,18 +254,11 @@
                            <!--</includes>-->
                        <!--</resource>-->
                    <!--</webResources>-->
                <!--</configuration>-->
            <!--</plugin>-->
        <!--</plugins>-->
                </configuration>
            </plugin>
        </plugins>
        <resources>
            <resource>
                <directory>lib</directory>
                <targetPath>/BOOT-INF/lib/</targetPath>
                <includes>
                    <include>**/*.jar</include>
                </includes>
            </resource>
            <resource>
                <directory>src/main/webapp</directory>
            </resource>
ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java
@@ -1,30 +1,12 @@
package com.stylefeng.guns.modular.system.util;
public class PushURL {
    public static String order_push_url =  "http://116.63.168.184:8081/driver/base/order/pushOrderState";
    public static String driver_auth_url =  "http://116.63.168.184:8081/driver/base/driver/sendsms";
    public static String withdraw_auth_url =  "http://116.63.168.184:8081/driver/base/withdrawal/withdrawalAudit";
    public static String cancel_order_url =  "http://116.63.168.184:8081/user/base/order/sendOrderState";
    public static String freeze_user_url =  "http://116.63.168.184:8081/user/base/user/freeze";
    public static String zull_user_url = "http://116.63.168.184:8081";
    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";
    public static String cancel_order_url =  zull_user_url + "/user/base/order/sendOrderState";
    public static String freeze_user_url =  zull_user_url + "/user/base/user/freeze";
    public static String ministry_of_transport_data = "http://120.77.11.218:8868/ministryOfTransport";
    public static String ministry_of_transport_ftp = "http://120.77.11.218:8868/ftp";
//    public static String order_push_url =  "http://express.feimadache.com:80/driver/base/order/pushOrderState";
//    public static String driver_auth_url =  "http://express.feimadache.com:80/driver/base/driver/sendsms";
//    public static String withdraw_auth_url =  "http://express.feimadache.com:80/driver/base/withdrawal/withdrawalAudit";
//    public static String cancel_order_url =  "http://express.feimadache.com:80/user/base/order/sendOrderState";
//    public static String freeze_user_url =  "http://express.feimadache.com:80/user/base/user/freeze";
//    public static String zull_user_url = "http://express.feimadache.com:80";
//    public static String ministry_of_transport_data = "http://express.feimadache.com:8868/ministryOfTransport";
//    public static String ministry_of_transport_ftp = "http://express.feimadache.com:8868/ftp";
    /*public static String order_push_url =  "http://localhost:80/driver/base/order/pushOrderState";
    public static String driver_auth_url =  "http://localhost:80/driver/base/driver/sendsms";
    public static String withdraw_auth_url =  "http://localhost:80/driver/base/withdrawal/withdrawalAudit";
    public static String cancel_order_url =  "http://localhost:80/user/base/order/sendOrderState";
    public static String freeze_user_url =  "http://localhost:80/user/base/user/freeze";
    public static String zull_user_url = "http://localhost:80";
    public static String ministry_of_transport_data = "http://localhost:8868/ministryOfTransport";
    public static String ministry_of_transport_ftp = "http://localhost:8868/ftp";*/
}
ManagementZYTravel/guns-admin/src/main/resources/application.yml
@@ -55,21 +55,12 @@
---
#spring:
#  profiles: local
#  datasource:
#    url: jdbc:mysql://Rm-wz9rpe0t74ys3b1h8go.mysql.rds.aliyuncs.com:3306/oktravel?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
#    username: root
#    password: Root2020!
#    db-name: oktravel #用来搜集数据库的所有表
#    filters: wall,mergeStat
################# 测试环境 ###################
spring:
  datasource:
    url: jdbc:mysql://127.0.0.1:3306/zytravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: 123456
    password: 0KiwEhl6EnIFWNqB7d1FJLWKy9urjvMS
#    password: 123456
    db-name: guns #用来搜集数据库的所有表
    filters: wall,mergeStat
@@ -89,7 +80,7 @@
---
#filePath: /usr/local/server/orderPostionFile/ #存储订单轨迹文件路径
filePath: C:/orderPostionFile/  #存储订单轨迹文件路径
filePath: D:/web/orderPostionFile/  #存储订单轨迹文件路径
#交通部推送数据功能开关
ManagementZYTravel/pom.xml
@@ -11,7 +11,6 @@
    <modules>
        <module>guns-admin</module>
        <module>guns-core</module>
        <module>guns-rest</module>
        <module>guns-generator</module>
    </modules>