From e909df301db76b987d86fb23059487874b94d930 Mon Sep 17 00:00:00 2001 From: lunaticbum Date: Tue, 11 Mar 2025 18:17:12 +0900 Subject: [PATCH] .... --- Dockerfile | 3 ++- .../kotlin/kr/lunaticbum/back/lun/configs/GlobalEnvironment.kt | 3 +++ src/main/resources/application.properties | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 76f80a6..f2c9353 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,6 +11,7 @@ ENV MRA_PW=default ENV RESOURCE_HANDLER=default ENV RESOURCE_LOCATION=default ENV IMAGE_UPLOAD_PATH=default +ENV GAPI_KEY=default WORKDIR /imgUpload LABEL maintainer="lunaticbum " LABEL version="0.0.7" @@ -21,6 +22,6 @@ COPY ${JAR_FILE} app.jar EXPOSE 443 #EXPOSE 27012 #EXPOSE 3307 -ENTRYPOINT ["java","-Dtelegram.bot.key=${BOT_KEY}","-Dtelegram.my.id=${TG_MINE}","-Dtelegram.target.id=${TG_TARGET_ID}","-Dweather.api.key=${WEATHER_KEY}","-Dspring.datasource.url=${DATASOURCE_URL}" ,"-Dspring.data.mongodb.uri=${MONGODB_HOST}","-Dspring.data.mongodb.database=${MONGODB_NAME}","-Dspring.datasource.username=${MRA_ADMIN}","-Dspring.datasource.password=${MRA_PW}","-Dresource.handler=${RESOURCE_HANDLER}","-Dresource.location=${RESOURCE_LOCATION}","-Dimage.upload.path=${IMAGE_UPLOAD_PATH}","-jar","app.jar"] +ENTRYPOINT ["java","-Dtelegram.bot.key=${BOT_KEY}","-Dtelegram.my.id=${TG_MINE}","-Dtelegram.target.id=${TG_TARGET_ID}","-Dweather.api.key=${WEATHER_KEY}","-Dspring.datasource.url=${DATASOURCE_URL}" ,"-Dspring.data.mongodb.uri=${MONGODB_HOST}","-Dspring.data.mongodb.database=${MONGODB_NAME}","-Dspring.datasource.username=${MRA_ADMIN}","-Dspring.datasource.password=${MRA_PW}","-Dresource.handler=${RESOURCE_HANDLER}","-Dresource.location=${RESOURCE_LOCATION}","-Dimage.upload.path=${IMAGE_UPLOAD_PATH}","-Dapi.gg.place=${GAPI_KEY}","-jar","app.jar"] #ENTRYPOINT ["java","-jar","app.jar","-Dspring-boot.run.arguments=--telegram.bot.key=${BOT_KEY}, --telegram.my.id=${TG_MINE}, --telegram.target.id=${TG_TARGET_ID}, --weather.api.key=${WEATHER_KEY}"] #-Dtelegram.bot.key=bot7934509464:AAE_xUbICxMdywLGnxo7BkeIqA1nVza4P9w -Dtelegram.target.id=71476436 -Dtelegram.my.id=71476436 -Dweather.api.key=de574a260b1f474d99955729241909 -Dspring.datasource.url=jdbc:mariadb://mra.sbspace.synology.me -Dspring.data.mongodb.uri=mongodb://lun_admin:VioPup*383@mongo.sbspace.synology.me/?wtimeoutMS=300&connectTimeoutMS=500&socketTimeoutMS=200 -Dspring.data.mongodb.database=lun_db -Dspring.datasource.username=lun_admin -Dspring.datasource.password=VioPup*383 -Dresource.handler=/blog/post/image/** -Dresource.location=file:///imgUpload -Dimage.upload.path=imgUpload diff --git a/src/main/kotlin/kr/lunaticbum/back/lun/configs/GlobalEnvironment.kt b/src/main/kotlin/kr/lunaticbum/back/lun/configs/GlobalEnvironment.kt index a9e445c..18a060a 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/configs/GlobalEnvironment.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/configs/GlobalEnvironment.kt @@ -29,6 +29,9 @@ class GlobalEnvironment : EnvironmentAware { @Value("\${weather.api.key}") var weatherApiKey: String? = "" + @Value("\${api.gg.place}") + var gapiKey : String? = "" + // @Value("jwt.access-secret") var ACCESS_SECRET_KEY: String = "l00u00n00a00t00i00c00b00u00m00a00c00sk" // @Value("jwt.refresh-secret") diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 9fe312c..94274a2 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -41,6 +41,7 @@ telegram.bot.key=1 telegram.my.id=2 telegram.target.id=3 weather.api.key=3 +api.gg.place=5 spring.data.mongodb.option.min-connection-per-host=0 spring.data.mongodb.option.max-connection-per-host=100 spring.data.mongodb.option.threads-allowed-to-block-for-connection-multiplier=5