diff --git a/youlai-gateway/Dockerfile b/youlai-gateway/Dockerfile index b68802382..17cae6a85 100644 --- a/youlai-gateway/Dockerfile +++ b/youlai-gateway/Dockerfile @@ -4,4 +4,3 @@ ARG JAR_FILE ADD target/${JAR_FILE} app.jar EXPOSE 9999 ENTRYPOINT ["java","-jar","/app.jar"] - diff --git a/youlai-gateway/pom.xml b/youlai-gateway/pom.xml index 6664d7960..5a70c5c23 100644 --- a/youlai-gateway/pom.xml +++ b/youlai-gateway/pom.xml @@ -63,6 +63,7 @@ 1.0.0-SNAPSHOT 1.4.13 + @@ -80,12 +81,27 @@ ${project.artifactId} - ${project.version} + latest ${project.build.finalName}.jar + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + true + + diff --git a/youlai-gateway/src/main/resources/bootstrap-dev.yml b/youlai-gateway/src/main/resources/bootstrap-dev.yml new file mode 100644 index 000000000..22db252ea --- /dev/null +++ b/youlai-gateway/src/main/resources/bootstrap-dev.yml @@ -0,0 +1,32 @@ +server: + port: 9999 + +spring: + main: + allow-bean-definition-overriding: true + application: + name: youlai-gateway + cloud: + nacos: + discovery: + server-addr: http://localhost:8848 + config: + # docker启动nacos-server需要配置 + server-addr: ${spring.cloud.nacos.discovery.server-addr} + file-extension: yaml + +# 全局参数设置 +ribbon: + ReadTimeout: 120000 + ConnectTimeout: 10000 + SocketTimeout: 10000 + MaxAutoRetries: 0 + MaxAutoRetriesNextServer: 1 + +hystrix: + command: + default: + execution: + isolation: + thread: + timeoutInMilliseconds: 40000 diff --git a/youlai-gateway/src/main/resources/bootstrap-prod.yml b/youlai-gateway/src/main/resources/bootstrap-prod.yml new file mode 100644 index 000000000..778e6a141 --- /dev/null +++ b/youlai-gateway/src/main/resources/bootstrap-prod.yml @@ -0,0 +1,15 @@ +server: + port: 9999 + +spring: + main: + allow-bean-definition-overriding: true + application: + name: youlai-gateway + cloud: + nacos: + discovery: + server-addr: http://c.youlai.store:8848 + config: + server-addr: ${spring.cloud.nacos.discovery.server-addr} + file-extension: yaml diff --git a/youlai-gateway/src/main/resources/bootstrap.yml b/youlai-gateway/src/main/resources/bootstrap.yml index 22db252ea..9f9660684 100644 --- a/youlai-gateway/src/main/resources/bootstrap.yml +++ b/youlai-gateway/src/main/resources/bootstrap.yml @@ -1,32 +1,3 @@ -server: - port: 9999 - spring: - main: - allow-bean-definition-overriding: true - application: - name: youlai-gateway - cloud: - nacos: - discovery: - server-addr: http://localhost:8848 - config: - # docker启动nacos-server需要配置 - server-addr: ${spring.cloud.nacos.discovery.server-addr} - file-extension: yaml - -# 全局参数设置 -ribbon: - ReadTimeout: 120000 - ConnectTimeout: 10000 - SocketTimeout: 10000 - MaxAutoRetries: 0 - MaxAutoRetriesNextServer: 1 - -hystrix: - command: - default: - execution: - isolation: - thread: - timeoutInMilliseconds: 40000 + profiles: + active: prod