Merge branch 'main' into dev

This commit is contained in:
linxtmty
2022-07-19 15:05:39 +08:00
7 changed files with 47 additions and 24 deletions
+15
View File
@@ -0,0 +1,15 @@
version: '3.3'
services:
orion-ops-service:
build:
context: .
dockerfile: docker/orion-ops-service/Dockerfile
image: orion-ops:1.0
# 启动的时候需要填写对应mysql,redis的地址和用户密码
# environment:
# - REDIS_HOST=
# - REDIS_PORT=
# - REDIS_PASSWORD=
# - MYSQL_HOST=
# - USER_NAME=
# - USER_PASSWORD=
+5
View File
@@ -0,0 +1,5 @@
FROM openjdk:8
WORKDIR /app
ADD orion-ops-service/target/orion-ops-service-1.0.0.jar /app
ADD docker/orion-ops-service/entrypoint.sh /app/entrypoint.sh
ENTRYPOINT [ "sh", "/app/entrypoint.sh" ]
+3
View File
@@ -0,0 +1,3 @@
#!/bin/bash
cd /app
java -jar orion-ops-service-1.0.0.jar --spring.profiles.active=prod --generator-admin
@@ -1,10 +1,10 @@
# redis
spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.password=lijiahang
spring.redis.host=${REDIS_HOST:127.0.0.1}
spring.redis.port=${REDIS_PORT:6379}
spring.redis.password=${REDIS_PASSWORD:lijiahang}
# mysql
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/orion-ops?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true
spring.datasource.username=root
spring.datasource.password=admin123
spring.datasource.url=jdbc:mysql://${MYSQL_HOST:127.0.0.1}:3306/orion-ops?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true
spring.datasource.username=${MYSQL_HOST:root}
spring.datasource.password=${MYSQL_PASSWORD:admin123}
# mybatis
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
@@ -1,10 +1,10 @@
# redis
spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.password=lijiahang
spring.redis.host=${REDIS_HOST:127.0.0.1}
spring.redis.port=${REDIS_PORT:6379}
spring.redis.password=${REDIS_PASSWORD:lijiahang}
# mysql
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/orion-ops?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true
spring.datasource.username=root
spring.datasource.password=admin123
spring.datasource.url=jdbc:mysql://${MYSQL_HOST:127.0.0.1}:3306/orion-ops?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true
spring.datasource.username=${MYSQL_HOST:root}
spring.datasource.password=${MYSQL_PASSWORD:admin123}
# mybatis
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
@@ -1,8 +1,8 @@
# redis
spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.password=lijiahang
spring.redis.host=${REDIS_HOST:127.0.0.1}
spring.redis.port=${REDIS_PORT:6379}
spring.redis.password=${REDIS_PASSWORD:lijiahang}
# mysql
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/orion-ops?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true
spring.datasource.username=root
spring.datasource.password=admin123
spring.datasource.url=jdbc:mysql://${MYSQL_HOST:127.0.0.1}:3306/orion-ops?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true
spring.datasource.username=${MYSQL_HOST:root}
spring.datasource.password=${MYSQL_PASSWORD:admin123}
@@ -1,10 +1,10 @@
# redis
spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.password=lijiahang
spring.redis.host=${REDIS_HOST:127.0.0.1}
spring.redis.port=${REDIS_PORT:6379}
spring.redis.password=${REDIS_PASSWORD:lijiahang}
# mysql
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/orion-ops?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true
spring.datasource.username=root
spring.datasource.password=admin123
spring.datasource.url=jdbc:mysql://${MYSQL_HOST:127.0.0.1}:3306/orion-ops?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true
spring.datasource.username=${USER_NAME:root}
spring.datasource.password=${USER_PASSWORD:admin123}
# mybatis
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl