From 8f4bb08368cac17eb57e3c8a3f7cf94e66ce4435 Mon Sep 17 00:00:00 2001 From: yanghb <yanghb> Date: 星期三, 29 三月 2023 10:13:31 +0800 Subject: [PATCH] init --- ZuulTravel/src/main/resources/application.yml | 10 +++++----- UserTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java | 2 ++ DriverTravel/guns-admin/src/main/resources/application.yml | 2 +- EurekaTravel/docker/Dockerfile | 2 +- DriverTravel/guns-admin/docker/Dockerfile | 2 +- UserTravel/guns-admin/src/main/resources/application.yml | 4 ++-- ZuulTravel/src/main/java/com/sinata/zuul/ZuulApplication.java | 2 ++ DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java | 2 ++ DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java | 2 ++ DispatchTravel/guns-admin/src/main/resources/application.yml | 2 +- UserTravel/guns-admin/docker/Dockerfile | 2 +- DispatchTravel/guns-admin/docker/Dockerfile | 2 +- EurekaTravel/src/main/java/com/sinata/eureka/EurekaApplication.java | 3 +++ EurekaTravel/src/main/resources/application.yml | 2 +- 14 files changed, 25 insertions(+), 14 deletions(-) diff --git a/DispatchTravel/guns-admin/docker/Dockerfile b/DispatchTravel/guns-admin/docker/Dockerfile index 63ab28a..984145b 100644 --- a/DispatchTravel/guns-admin/docker/Dockerfile +++ b/DispatchTravel/guns-admin/docker/Dockerfile @@ -7,7 +7,7 @@ RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime RUN echo 'Asia/Shanghai' >/etc/timezone -EXPOSE 8008 +EXPOSE 5003 ENV JAVA_OPTS="-Xmx400m -Xms400m -Djava.security.egd=file:/dev/./urandom" # 配置容器启动后执行的命令 ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /server.jar","--spring.profiles.active=prod"] diff --git a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java index 4b29f76..d01eb0f 100644 --- a/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java +++ b/DispatchTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java @@ -16,6 +16,7 @@ import org.springframework.web.client.RestTemplate; import java.nio.charset.StandardCharsets; +import java.util.TimeZone; /** * SpringBoot方式启动类 @@ -30,6 +31,7 @@ private final static Logger logger = LoggerFactory.getLogger(GunsApplication.class); public static void main(String[] args) { + TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai")); SpringApplication.run(GunsApplication.class, args); logger.info("GunsApplication is success!"); } diff --git a/DispatchTravel/guns-admin/src/main/resources/application.yml b/DispatchTravel/guns-admin/src/main/resources/application.yml index 068cf10..f5d9c62 100644 --- a/DispatchTravel/guns-admin/src/main/resources/application.yml +++ b/DispatchTravel/guns-admin/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 8008 + port: 5003 guns: swagger-open: true #是否开启swagger (true/false) diff --git a/DriverTravel/guns-admin/docker/Dockerfile b/DriverTravel/guns-admin/docker/Dockerfile index 0c7d5c7..d9a072d 100644 --- a/DriverTravel/guns-admin/docker/Dockerfile +++ b/DriverTravel/guns-admin/docker/Dockerfile @@ -7,7 +7,7 @@ RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime RUN echo 'Asia/Shanghai' >/etc/timezone -EXPOSE 8008 +EXPOSE 5002 ENV JAVA_OPTS="-Xmx400m -Xms400m -Djava.security.egd=file:/dev/./urandom" # 配置容器启动后执行的命令 ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /server.jar","--spring.profiles.active=prod"] diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java index f7c2e6d..7210cbb 100644 --- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java +++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java @@ -22,6 +22,7 @@ import org.springframework.web.client.RestTemplate; import java.nio.charset.StandardCharsets; +import java.util.TimeZone; /** * SpringBoot方式启动类 @@ -38,6 +39,7 @@ private final static Logger logger = LoggerFactory.getLogger(GunsApplication.class); public static void main(String[] args) { + TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai")); SpringApplication.run(GunsApplication.class, args); logger.info("GunsApplication is success!"); diff --git a/DriverTravel/guns-admin/src/main/resources/application.yml b/DriverTravel/guns-admin/src/main/resources/application.yml index 9a49d92..cbc4efb 100644 --- a/DriverTravel/guns-admin/src/main/resources/application.yml +++ b/DriverTravel/guns-admin/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 8007 + port: 5002 guns: swagger-open: true #是否开启swagger (true/false) diff --git a/EurekaTravel/docker/Dockerfile b/EurekaTravel/docker/Dockerfile index 81ddae4..636c1bc 100644 --- a/EurekaTravel/docker/Dockerfile +++ b/EurekaTravel/docker/Dockerfile @@ -7,7 +7,7 @@ RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime RUN echo 'Asia/Shanghai' >/etc/timezone -EXPOSE 8008 +EXPOSE 8081 ENV JAVA_OPTS="-Xmx400m -Xms400m -Djava.security.egd=file:/dev/./urandom" # 配置容器启动后执行的命令 ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /server.jar","--spring.profiles.active=prod"] diff --git a/EurekaTravel/src/main/java/com/sinata/eureka/EurekaApplication.java b/EurekaTravel/src/main/java/com/sinata/eureka/EurekaApplication.java index 1e9c18d..e193d7c 100644 --- a/EurekaTravel/src/main/java/com/sinata/eureka/EurekaApplication.java +++ b/EurekaTravel/src/main/java/com/sinata/eureka/EurekaApplication.java @@ -6,11 +6,14 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer; +import java.util.TimeZone; + @EnableEurekaServer//开启服务治理 @SpringBootApplication public class EurekaApplication extends SpringBootServletInitializer { public static void main(String[] args) { + TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai")); SpringApplication.run(EurekaApplication.class, args); } diff --git a/EurekaTravel/src/main/resources/application.yml b/EurekaTravel/src/main/resources/application.yml index 0241f86..827e96c 100644 --- a/EurekaTravel/src/main/resources/application.yml +++ b/EurekaTravel/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 8000 #服务端口号 + port: 8081 #服务端口号 spring: application: diff --git a/UserTravel/guns-admin/docker/Dockerfile b/UserTravel/guns-admin/docker/Dockerfile index 3a7e6b3..b4bb742 100644 --- a/UserTravel/guns-admin/docker/Dockerfile +++ b/UserTravel/guns-admin/docker/Dockerfile @@ -7,7 +7,7 @@ RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime RUN echo 'Asia/Shanghai' >/etc/timezone -EXPOSE 8008 +EXPOSE 5001 ENV JAVA_OPTS="-Xmx400m -Xms400m -Djava.security.egd=file:/dev/./urandom" # 配置容器启动后执行的命令 ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /server.jar","--spring.profiles.active=prod"] diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java index 52e34ea..59daec1 100644 --- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java +++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java @@ -20,6 +20,7 @@ import org.springframework.web.client.RestTemplate; import java.nio.charset.StandardCharsets; +import java.util.TimeZone; /** * SpringBoot方式启动类 @@ -36,6 +37,7 @@ private final static Logger logger = LoggerFactory.getLogger(GunsApplication.class); public static void main(String[] args) { + TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai")); SpringApplication.run(GunsApplication.class, args); logger.info("GunsApplication is success!"); } diff --git a/UserTravel/guns-admin/src/main/resources/application.yml b/UserTravel/guns-admin/src/main/resources/application.yml index b25082e..bae7c28 100644 --- a/UserTravel/guns-admin/src/main/resources/application.yml +++ b/UserTravel/guns-admin/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 8006 + port: 5001 guns: swagger-open: true #是否开启swagger (true/false) @@ -42,7 +42,7 @@ eureka: client: service-url: #注册中心地址 - defaultZone: http://sinata:sinata@127.0.0.1:8000/eureka #启用身份验证的方式连接 + defaultZone: http://127.0.0.1:8081/eureka #启用身份验证的方式连接 register-with-eureka: true #在注册中心进行注册 fetch-registry: true #从Eureka中获取注册信息。 diff --git a/ZuulTravel/src/main/java/com/sinata/zuul/ZuulApplication.java b/ZuulTravel/src/main/java/com/sinata/zuul/ZuulApplication.java index 422e674..8aecf47 100644 --- a/ZuulTravel/src/main/java/com/sinata/zuul/ZuulApplication.java +++ b/ZuulTravel/src/main/java/com/sinata/zuul/ZuulApplication.java @@ -29,6 +29,7 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; +import java.util.TimeZone; @EnableSwagger2Doc @@ -38,6 +39,7 @@ public class ZuulApplication extends SpringBootServletInitializer { public static void main(String[] args) { + TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai")); SpringApplication.run(ZuulApplication.class, args); // NettyServer nettyServer = new NettyServer(); // nettyServer.bind(); diff --git a/ZuulTravel/src/main/resources/application.yml b/ZuulTravel/src/main/resources/application.yml index 206bc1d..d21e043 100644 --- a/ZuulTravel/src/main/resources/application.yml +++ b/ZuulTravel/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 80 + port: 5000 spring: application: @@ -8,7 +8,7 @@ eureka: client: service-url: #注册中心地址 - defaultZone: http://sinata:sinata@127.0.0.1:8000/eureka #启用身份验证的方式连接 + defaultZone: http://127.0.0.1:8081/eureka #启用身份验证的方式连接 register-with-eureka: true #在注册中心进行注册 fetch-registry: true #从Eureka中获取注册信息。 @@ -18,15 +18,15 @@ routes: user-server: #接口调用路由服务,名字任意取。(用户端服务) path: /user/** #配置请求URL的请求规则 - url: http://127.0.0.1:8006 #真正的微服务地址,path匹配的请求都转发到这里 + url: http://127.0.0.1:5001 #真正的微服务地址,path匹配的请求都转发到这里 serviceid: user-server #指定Eureka注册中心的服务id driver-server: #路由司机相关请求 path: /driver/** #配置请求URL的请求规则 - url: http://127.0.0.1:8007 #真正的微服务地址,path匹配的请求都转发到这里 + url: http://127.0.0.1:5002 #真正的微服务地址,path匹配的请求都转发到这里 serviceid: driver-server #指定Eureka注册中心的服务id dispatch-server: #路由调度相关请求 path: /dispatch/** #配置请求URL的请求规则 - url: http://127.0.0.1:8008 #真正的微服务地址,path匹配的请求都转发到这里 + url: http://127.0.0.1:5003 #真正的微服务地址,path匹配的请求都转发到这里 serviceid: dispatch-server #指定Eureka注册中心的服务id # 配置zuul超时时间 host: -- Gitblit v1.7.1