yanghb
2023-03-29 fa431d88304932da056b6913c666da3c94ddacc3
init
8个文件已修改
182 ■■■■ 已修改文件
DispatchTravel/guns-core/pom.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DispatchTravel/guns-generator/pom.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DispatchTravel/pom.xml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/DriverApplication.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverTravel/guns-admin/src/main/resources/application.yml 96 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverTravel/pom.xml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/pom.xml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserTravel/pom.xml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DispatchTravel/guns-core/pom.xml
@@ -13,7 +13,7 @@
    <artifactId>dispatch-core</artifactId>
    <packaging>jar</packaging>
    <name>guns-core</name>
    <name>dispatch-core</name>
    <url>http://maven.apache.org</url>
    <dependencies>
DispatchTravel/guns-generator/pom.xml
@@ -14,7 +14,7 @@
    <artifactId>dispatch-generator</artifactId>
    <packaging>jar</packaging>
    <name>guns-generator</name>
    <name>dispatch-generator</name>
    <description>代码生成器</description>
    <dependencies>
DispatchTravel/pom.xml
@@ -222,28 +222,13 @@
    <profiles>
        <profile>
            <id>local</id>
            <properties>
                <spring.active>local</spring.active>
            </properties>
            <activation>
                <activeByDefault>true</activeByDefault>
            </activation>
        </profile>
        <profile>
            <id>dev</id>
            <properties>
                <spring.active>dev</spring.active>
            </properties>
        </profile>
        <profile>
            <id>test</id>
            <properties>
                <spring.active>test</spring.active>
            </properties>
        </profile>
        <profile>
            <id>produce</id>
            <id>prod</id>
            <properties>
                <spring.active>produce</spring.active>
            </properties>
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/DriverApplication.java
@@ -39,12 +39,16 @@
    private final static Logger logger = LoggerFactory.getLogger(DriverApplication.class);
    public static void main(String[] args) {
        TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai"));
        SpringApplication.run(DriverApplication.class, args);
        logger.info("GunsApplication is success!");
        try {
            TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai"));
            SpringApplication.run(DriverApplication.class, args);
            logger.info("GunsApplication is success!");
        GDFalconUtil gdFalconUtil = new GDFalconUtil();
        gdFalconUtil.init();//初始化猎鹰服务
            GDFalconUtil gdFalconUtil = new GDFalconUtil();
            gdFalconUtil.init();//初始化猎鹰服务
        }catch (Exception e){
            e.printStackTrace();
        }
    }
DriverTravel/guns-admin/src/main/resources/application.yml
@@ -1,14 +1,5 @@
server:
  port: 5002
guns:
  swagger-open: true              #是否开启swagger (true/false)
  kaptcha-open: false             #是否开启登录时验证码 (true/false)
#  file-upload-path: d:/tmp       #文件上传目录(不配置的话为java.io.tmpdir目录)
  spring-session-open: false      #是否开启spring session,如果是多机环境需要开启(true/false)
  session-invalidate-time: 1800     #session失效时间(只在单机环境下生效,多机环境在SpringSessionConfig类中配置) 单位:秒
  session-validation-interval: 900  #多久检测一次失效的session(只在单机环境下生效) 单位:秒
spring:
  application:
    name: driver-server
@@ -27,6 +18,14 @@
    multipart:
      max-request-size: 100MB
      max-file-size: 100MB
guns:
  swagger-open: true              #是否开启swagger (true/false)
  kaptcha-open: false             #是否开启登录时验证码 (true/false)
#  file-upload-path: d:/tmp       #文件上传目录(不配置的话为java.io.tmpdir目录)
  spring-session-open: false      #是否开启spring session,如果是多机环境需要开启(true/false)
  session-invalidate-time: 1800     #session失效时间(只在单机环境下生效,多机环境在SpringSessionConfig类中配置) 单位:秒
  session-validation-interval: 900  #多久检测一次失效的session(只在单机环境下生效) 单位:秒
mybatis-plus:
  typeAliasesPackage: com.stylefeng.guns.modular
@@ -37,8 +36,6 @@
    configuration.map-underscore-to-camel-case: true #是否开启自动驼峰命名规则(camel case)映射
    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl #输出Sql,如需打印Sql注释该配置
eureka:
  client:
    service-url: #注册中心地址
@@ -46,46 +43,6 @@
    register-with-eureka: true #在注册中心进行注册
    fetch-registry: true #从Eureka中获取注册信息。
---
#spring:
#  datasource:
#    url: jdbc:mysql://Rm-wz9rpe0t74ys3b1h8go.mysql.rds.aliyuncs.com:3306/oktravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
#    username: root
#    password: Root2020!
#    db-name: guns #用来搜集数据库的所有表
#    filters: wall,mergeStat
spring:
  datasource:
    url: jdbc:mysql://192.168.0.80:3306/jyxtravel-sjdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: 123456
    db-name: kuanzhaiyx #用来搜集数据库的所有表
    filters: wall,mergeStat
#spring:
#  datasource:
#    url: jdbc:mysql://192.168.0.80:3306/jyxtravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
#    username: root
#    password: 123456
#    db-name: jyxtravel #用来搜集数据库的所有表
#    filters: wall,mergeStat
#多数据源情况的配置
guns:
  muti-datasource:
    open: false
    url: jdbc:mysql://127.0.0.1:3306/kuanzhaiyx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: 123456
    dataSourceNames:
      - dataSourceGuns
      - dataSourceBiz
---
wx:
  grantType: authorization_code #填authorization_code
@@ -96,7 +53,6 @@
  mchId: 1523106371 #微信支付分配的商户号
  key: s4TQO0NqPaRc0YfGptejNjlOpFlt4y2K #key为商户平台设置的密钥key:
---
alipay:
  appid: 2021003104609427  #应用程序唯一标识
@@ -104,13 +60,9 @@
  alipayPublicKey: 1 #应用公钥
  alipay_public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuyq8uN/rRYlpzYYPVLOPCc243/+uYTv3dHqYoUuC5wDteS/leFGX6UnyLyAuTepBJ5Hpvv2mwZ4QLUkBNObOIEdz7bj9B9kjV+/fqYBZYgNUL2kqAOdeH/gDyog1D05Jmk26dzFwsdERmBABHeizovAFGxRdkFig4jGO+mnNpdhYq1RHlPK/XSLz7tVg7UzKMQBhbuiXzbGdYpPFcmVL1Cx8q123uhceChV/JBV+D2BGfEVN6usvTwsDAI4j6ATLO7fbOBga5XxqMTKAuvi7YYeq4SxKuDi6FVc64fx/sll4NEqRYZ8Td0bSFrnlVnParBe8LRaD+IFw1iP8ejphUQIDAQAB #支付宝公钥
---
juhe: #聚合数据
  appKey: 01ba594fee41fc7214ca77ef51c783c9 #
---
jiguang:
  appKey-driver: c673a73acba4d06849913fd2 #极光推送应用唯一标识
@@ -118,13 +70,8 @@
  appKey-dispatch: 7eecaa0ce660780f4b364684 #极光推送应用唯一标识
  masterSecret-dispatch: fca87938cb39a72360ea3293 #用于服务器端 API 调用时与 AppKey 配合使用达到鉴权的目的
---
#filePath: /usr/local/server/orderPostionFile/ #存储订单轨迹文件路径
filePath: C:/orderPostionFile/  #存储订单轨迹文件路径
#支付回调地址
#正式环境
@@ -132,6 +79,29 @@
#正式测试环境
callbackPath: http://39.96.82.2:80/driver
---
#交通部推送数据功能开关
pushMinistryOfTransport: false
pushMinistryOfTransport: false
---
spring:
  config:
    activate:
      on-profile: dev
  datasource:
    url: jdbc:mysql://127.0.0.1:3306/kuanzhaiyx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: 123456
    db-name: kuanzhaiyx #用来搜集数据库的所有表
    filters: wall,mergeStat
---
spring:
  config:
    activate:
      on-profile: prod
  datasource:
    url: jdbc:mysql://192.168.0.80:3306/jyxtravel-sjdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: 123456
    db-name: kuanzhaiyx #用来搜集数据库的所有表
    filters: wall,mergeStat
---
DriverTravel/pom.xml
@@ -222,28 +222,13 @@
    <profiles>
        <profile>
            <id>local</id>
            <properties>
                <spring.active>local</spring.active>
            </properties>
            <activation>
                <activeByDefault>true</activeByDefault>
            </activation>
        </profile>
        <profile>
            <id>dev</id>
            <properties>
                <spring.active>dev</spring.active>
            </properties>
        </profile>
        <profile>
            <id>test</id>
            <properties>
                <spring.active>test</spring.active>
            </properties>
        </profile>
        <profile>
            <id>produce</id>
            <id>prod</id>
            <properties>
                <spring.active>produce</spring.active>
            </properties>
ManagementTravel/pom.xml
@@ -222,28 +222,13 @@
    <profiles>
        <profile>
            <id>local</id>
            <properties>
                <spring.active>local</spring.active>
            </properties>
            <activation>
                <activeByDefault>true</activeByDefault>
            </activation>
        </profile>
        <profile>
            <id>dev</id>
            <properties>
                <spring.active>dev</spring.active>
            </properties>
        </profile>
        <profile>
            <id>test</id>
            <properties>
                <spring.active>test</spring.active>
            </properties>
        </profile>
        <profile>
            <id>produce</id>
            <id>prod</id>
            <properties>
                <spring.active>produce</spring.active>
            </properties>
UserTravel/pom.xml
@@ -222,28 +222,13 @@
    <profiles>
        <profile>
            <id>local</id>
            <properties>
                <spring.active>local</spring.active>
            </properties>
            <activation>
                <activeByDefault>true</activeByDefault>
            </activation>
        </profile>
        <profile>
            <id>dev</id>
            <properties>
                <spring.active>dev</spring.active>
            </properties>
        </profile>
        <profile>
            <id>test</id>
            <properties>
                <spring.active>test</spring.active>
            </properties>
        </profile>
        <profile>
            <id>produce</id>
            <id>prod</id>
            <properties>
                <spring.active>produce</spring.active>
            </properties>