lun_admin/lunBackServer
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
lunaticbum 2024-10-10 11:11:25 +09:00
parent 1a2b5376ea
commit 86060d7471
7 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Dockerfile
View File

@ -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 <lunaticbum@gmail.com>"
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}"]
#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

2
build.gradle.kts
View File

@ -6,7 +6,7 @@ plugins {
}
group = "kr.lunaticbum.back"
version = "0.0.5-SNAPSHOT"
version = "0.0.7-SNAPSHOT"
java {
toolchain {

2
src/main/kotlin/kr/lunaticbum/back/lun/configs/SpringConfigClass.kt
View File

@ -12,6 +12,4 @@ class SpringConfigClass : WebApplicationInitializer {
filter.setInitParameter("encoding", "UTF-8")
filter.addMappingForServletNames(null, false, "dispatcher")
}
}

4
src/main/kotlin/kr/lunaticbum/back/lun/controllers/BlogController.kt
View File

@ -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) {

4
src/main/kotlin/kr/lunaticbum/back/lun/controllers/BumsPrivate.kt
View File

@ -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<ResponceResult> {
logService.log("${httpServletRequest.requestURI}")
logService.log(jsonString)

4
src/main/kotlin/kr/lunaticbum/back/lun/controllers/Telegram.kt
View File

@ -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}")

2
src/main/kotlin/kr/lunaticbum/back/lun/controllers/UserController.kt
View File

@ -21,7 +21,7 @@ import kotlin.math.log
@RestController
@RequestMapping("user")
@RequestMapping("/user")
class UserController {
val EncTypeKey = "enc"
val EncType00 = "T0"