Merge remote-tracking branch 'origin/dev' into dev
commit
0758f78178
|
|
@ -0,0 +1,9 @@
|
|||
FROM jjb-registry-registry.cn-hangzhou.cr.aliyuncs.com/pub/jdk:1.8.0_202
|
||||
|
||||
ENV TZ=Asia/Shanghai
|
||||
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||
|
||||
COPY ./start/target/start.jar /opt/app.jar
|
||||
|
||||
|
||||
ENTRYPOINT ["java", "-jar", "/opt/app.jar"]
|
||||
|
|
@ -1,37 +1,5 @@
|
|||
spring:
|
||||
profiles:
|
||||
active: ${SPRING_PROFILES_ACTIVE:local}
|
||||
cloud:
|
||||
nacos:
|
||||
config:
|
||||
import-check:
|
||||
enabled: false
|
||||
---
|
||||
spring:
|
||||
config:
|
||||
activate:
|
||||
on-profile: local
|
||||
import:
|
||||
- classpath:nacos.yml
|
||||
- classpath:nacos/config-common.yml
|
||||
- classpath:nacos/config-port.yml
|
||||
- classpath:nacos/config-mq.yml
|
||||
- classpath:nacos/config-log.yml
|
||||
- classpath:nacos/config-actuator.yml
|
||||
- classpath:nacos/config-job.yml
|
||||
- classpath:nacos/config-mysql.yml
|
||||
- classpath:nacos/config-redis.yml
|
||||
- classpath:nacos/config-cache.yml
|
||||
- classpath:nacos/config-spring.yml
|
||||
- classpath:nacos/config-mybatis.yml
|
||||
- classpath:nacos/config-sdk.yml
|
||||
- classpath:sdk.yml
|
||||
- classpath:swagger.yml
|
||||
---
|
||||
spring:
|
||||
config:
|
||||
activate:
|
||||
on-profile: prod
|
||||
import:
|
||||
- classpath:nacos-prod.yml
|
||||
- classpath:sdk-prod.yml
|
||||
|
|
|
|||
|
|
@ -1,13 +1,11 @@
|
|||
nacos:
|
||||
url: prod-nacos:8848
|
||||
namespace: jjb-dragon
|
||||
|
||||
application:
|
||||
name: safety-eval-service
|
||||
version:
|
||||
gateway: safety-eval
|
||||
gateway: safetyEval
|
||||
cn-name: 重庆安全评价
|
||||
|
||||
spring:
|
||||
application:
|
||||
name: ${application.name}${application.version}
|
||||
|
|
|
|||
Loading…
Reference in New Issue