yanghb
2023-03-29 a58712b490b22375ffce07a6bb345f2086877b3b
init
9个文件已修改
57 ■■■■ 已修改文件
DispatchTravel/guns-admin/docker/Dockerfile 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverTravel/guns-admin/docker/Dockerfile 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverTravel/guns-admin/src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
EurekaTravel/docker/Dockerfile 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/docker/Dockerfile 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/ManagementApplication.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementTravel/guns-admin/src/main/resources/application.yml 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserTravel/guns-admin/docker/Dockerfile 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZuulTravel/docker/Dockerfile 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DispatchTravel/guns-admin/docker/Dockerfile
@@ -2,7 +2,7 @@
ENV LANG C.UTF-8
VOLUME /tmp
ADD dispatch-admin.jar server.jar
ADD dispatch-admin-1.0.0.jar server.jar
RUN bash -c 'touch /server.jar'
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
DriverTravel/guns-admin/docker/Dockerfile
@@ -2,7 +2,7 @@
ENV LANG C.UTF-8
VOLUME /tmp
ADD driver-admin.jar server.jar
ADD driver-admin-1.0.0.jar server.jar
RUN bash -c 'touch /server.jar'
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
DriverTravel/guns-admin/src/main/resources/application.yml
@@ -86,7 +86,7 @@
spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://192.168.5.102:3306/jyxtravel-sjdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
    url: jdbc:mysql://127.0.0.1:3306/kuanzhaiyx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowPublicKeyRetrieval=true&&serverTimezone=Asia/Shanghai
    username: root
    password: 123456
    db-name: jyxtravel-sjdb #用来搜集数据库的所有表
EurekaTravel/docker/Dockerfile
@@ -2,7 +2,7 @@
ENV LANG C.UTF-8
VOLUME /tmp
ADD EurekaTravel.jar server.jar
ADD EurekaTravel-0.0.1-SNAPSHOT.war server.jar
RUN bash -c 'touch /server.jar'
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
ManagementTravel/guns-admin/docker/Dockerfile
@@ -2,7 +2,7 @@
ENV LANG C.UTF-8
VOLUME /tmp
ADD management-admin.jar server.jar
ADD management-admin-1.0.0.jar server.jar
RUN bash -c 'touch /server.jar'
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/ManagementApplication.java
@@ -31,7 +31,7 @@
    public static void main(String[] args) {
        SpringApplication.run(ManagementApplication.class, args);
        logger.info("GunsApplication is success!");
        logger.info("GunsApplication is success!");
    }
    @Bean //通过ip地址调用
ManagementTravel/guns-admin/src/main/resources/application.yml
@@ -1,19 +1,9 @@
server:
  port: 5004
guns:
  swagger-open: true              #是否开启swagger (true/false)
  kaptcha-open: false             #是否开启登录时验证码 (true/false)
  spring-session-open: false      #是否开启spring session,如果是多机环境需要开启(true/false)
  session-invalidate-time: 1800     #session失效时间(只在单机环境下生效,多机环境在SpringSessionConfig类中配置) 单位:秒
  session-validation-interval: 900  #多久检测一次失效的session(只在单机环境下生效) 单位:秒
#  file-upload-path: C:\Users\hi\Desktop\ #文件上传目录(不配置的话为java.io.tmpdir目录)
#  picture-server-address: http://192.168.0.43/resources/  #图片服务器地址
  file-upload-path: C:\Users\Administrator\Desktop\apache-tomcat-8.0.33\webapps\ROOT\upload\ #文件上传目录(不配置的话为java.io.tmpdir目录)
  picture-server-address: http://139.9.249.67:8080/upload/  #图片服务器地址
  rest-url: http://139.9.249.67:8080/rest/    #前端接口调用基础路径
  port: 5001
spring:
  application:
    name: management-server
  profiles:
    active: dev
  mvc:
@@ -29,6 +19,18 @@
    multipart:
      max-request-size: 100MB
      max-file-size: 100MB
guns:
  swagger-open: true              #是否开启swagger (true/false)
  kaptcha-open: false             #是否开启登录时验证码 (true/false)
  spring-session-open: false      #是否开启spring session,如果是多机环境需要开启(true/false)
  session-invalidate-time: 1800     #session失效时间(只在单机环境下生效,多机环境在SpringSessionConfig类中配置) 单位:秒
  session-validation-interval: 900  #多久检测一次失效的session(只在单机环境下生效) 单位:秒
  #  file-upload-path: C:\Users\hi\Desktop\ #文件上传目录(不配置的话为java.io.tmpdir目录)
  #  picture-server-address: http://192.168.0.43/resources/  #图片服务器地址
  file-upload-path: C:\Users\Administrator\Desktop\apache-tomcat-8.0.33\webapps\ROOT\upload\ #文件上传目录(不配置的话为java.io.tmpdir目录)
  picture-server-address: http://139.9.249.67:8080/upload/  #图片服务器地址
  rest-url: http://139.9.249.67:8080/rest/    #前端接口调用基础路径
mybatis-plus:
  type-aliases-package: com.stylefeng.guns.modular.system.model
@@ -50,20 +52,22 @@
#交通部推送数据功能开关
pushMinistryOfTransport: false
---
spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://192.168.5.102:3306/jyxtravel-sjdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
    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: jyxtravel-sjdb #用来搜集数据库的所有表
    db-name: kuanzhaiyx #用来搜集数据库的所有表
    filters: wall,mergeStat
#多数据源情况的配置
guns:
  muti-datasource:
    open: false
    url: jdbc:mysql://127.0.0.1:3306/kuanzhaiyx?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
    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: Root2020!
    password: 123456
@@ -74,7 +78,7 @@
spring:
  profiles: prod
  datasource:
    url: jdbc:mysql://127.0.0.1:3306/kuanzhaiyx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowPublicKeyRetrieval=true&&serverTimezone=Asia/Shanghai
    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 #用来搜集数据库的所有表
@@ -83,7 +87,7 @@
guns:
  muti-datasource:
    open: false
    url: jdbc:mysql://127.0.0.1:3306/kuanzhaiyx?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
    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: Root2020!
    password: 123456
@@ -91,3 +95,4 @@
      - dataSourceGuns
      - dataSourceBiz
---
UserTravel/guns-admin/docker/Dockerfile
@@ -2,7 +2,7 @@
ENV LANG C.UTF-8
VOLUME /tmp
ADD user-admin.jar server.jar
ADD user-admin-1.0.0.jar server.jar
RUN bash -c 'touch /server.jar'
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
ZuulTravel/docker/Dockerfile
@@ -2,7 +2,7 @@
ENV LANG C.UTF-8
VOLUME /tmp
ADD ZuulTravel.jar server.jar
ADD ZuulTravel-0.0.1-SNAPSHOT.war server.jar
RUN bash -c 'touch /server.jar'
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime