From 86060d74713a2d419950713998d90ff6998754b5 Mon Sep 17 00:00:00 2001 From: lunaticbum <> Date: Thu, 10 Oct 2024 11:11:25 +0900 Subject: [PATCH] ... --- Dockerfile | 17 +++++++++++------ build.gradle.kts | 2 +- .../back/lun/configs/SpringConfigClass.kt | 2 -- .../back/lun/controllers/BlogController.kt | 4 ++-- .../back/lun/controllers/BumsPrivate.kt | 4 ++-- .../lunaticbum/back/lun/controllers/Telegram.kt | 4 ++-- .../back/lun/controllers/UserController.kt | 2 +- 7 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index add202f..76f80a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,14 +8,19 @@ ENV MONGODB_HOST=default ENV MONGODB_NAME=default ENV MRA_ADMIN=default ENV MRA_PW=default +ENV RESOURCE_HANDLER=default +ENV RESOURCE_LOCATION=default +ENV IMAGE_UPLOAD_PATH=default +WORKDIR /imgUpload LABEL maintainer="lunaticbum " -LABEL version="0.0.5" +LABEL version="0.0.7" LABEL description="Spring Boot Jar Test" -ARG JAR_FILE=build/libs/lun-0.0.5-SNAPSHOT.jar +ARG JAR_FILE=build/libs/lun-0.0.7-SNAPSHOT.jar 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}","-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}"] \ No newline at end of file +#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","-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/build.gradle.kts b/build.gradle.kts index e65464d..11650ad 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } group = "kr.lunaticbum.back" -version = "0.0.5-SNAPSHOT" +version = "0.0.7-SNAPSHOT" java { toolchain { diff --git a/src/main/kotlin/kr/lunaticbum/back/lun/configs/SpringConfigClass.kt b/src/main/kotlin/kr/lunaticbum/back/lun/configs/SpringConfigClass.kt index 41901b3..dcbb99d 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/configs/SpringConfigClass.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/configs/SpringConfigClass.kt @@ -12,6 +12,4 @@ class SpringConfigClass : WebApplicationInitializer { filter.setInitParameter("encoding", "UTF-8") filter.addMappingForServletNames(null, false, "dispatcher") } - - } \ No newline at end of file diff --git a/src/main/kotlin/kr/lunaticbum/back/lun/controllers/BlogController.kt b/src/main/kotlin/kr/lunaticbum/back/lun/controllers/BlogController.kt index 240e628..4113894 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/controllers/BlogController.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/controllers/BlogController.kt @@ -20,13 +20,13 @@ import java.util.* @RestController -@RequestMapping("blog") +@RequestMapping("/blog") class BlogController() { @Autowired lateinit var logService: LogService - @GetMapping("","/write") + @GetMapping("/write") fun writ() : ModelAndView{ val vm = ModelAndView("/content/blog/write") // when(System.currentTimeMillis() % 5L) { diff --git a/src/main/kotlin/kr/lunaticbum/back/lun/controllers/BumsPrivate.kt b/src/main/kotlin/kr/lunaticbum/back/lun/controllers/BumsPrivate.kt index aa70996..f0a8eec 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/controllers/BumsPrivate.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/controllers/BumsPrivate.kt @@ -16,7 +16,7 @@ import java.util.* @RestController -@RequestMapping("bums") +@RequestMapping("/bums") class BumsPrivate { @Autowired lateinit var globalEvv : GlobalEnvironment @@ -25,7 +25,7 @@ class BumsPrivate { lateinit var logService: LogService @ResponseBody - @PostMapping("save/loc.api") + @PostMapping("/save/loc.api") fun login(httpServletRequest: HttpServletRequest, @RequestBody jsonString: String) : ResponseEntity { logService.log("${httpServletRequest.requestURI}") logService.log(jsonString) diff --git a/src/main/kotlin/kr/lunaticbum/back/lun/controllers/Telegram.kt b/src/main/kotlin/kr/lunaticbum/back/lun/controllers/Telegram.kt index 68b2158..e0518a7 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/controllers/Telegram.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/controllers/Telegram.kt @@ -21,7 +21,7 @@ import java.util.* @RestController -@RequestMapping("tlg") +@RequestMapping("/tlg") class Telegram { @Autowired @@ -39,7 +39,7 @@ class Telegram { } @ResponseBody - @PostMapping("webhook") + @PostMapping("/webhook") fun test(httpServletRequest: HttpServletRequest, @RequestBody update : TelegramUpdate?) { try { logService.log("test strat ${update}") diff --git a/src/main/kotlin/kr/lunaticbum/back/lun/controllers/UserController.kt b/src/main/kotlin/kr/lunaticbum/back/lun/controllers/UserController.kt index 76cacb9..d3da8ba 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/controllers/UserController.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/controllers/UserController.kt @@ -21,7 +21,7 @@ import kotlin.math.log @RestController -@RequestMapping("user") +@RequestMapping("/user") class UserController { val EncTypeKey = "enc" val EncType00 = "T0"