diff --git a/src/main/kotlin/kr/lunaticbum/back/lun/LunApplication.kt b/src/main/kotlin/kr/lunaticbum/back/lun/LunApplication.kt index e79d36b..b9d245a 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/LunApplication.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/LunApplication.kt @@ -1,6 +1,5 @@ package kr.lunaticbum.back.lun -import jdk.incubator.vector.VectorOperators.Test import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.runApplication import org.springframework.scheduling.annotation.EnableScheduling diff --git a/src/main/kotlin/kr/lunaticbum/back/lun/configs/AppConfig.kt b/src/main/kotlin/kr/lunaticbum/back/lun/configs/AppConfig.kt index 0c79082..3f623d9 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/configs/AppConfig.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/configs/AppConfig.kt @@ -2,7 +2,6 @@ package kr.lunaticbum.back.lun.configs import org.springframework.beans.factory.annotation.Value import org.springframework.context.annotation.Configuration -import org.springframework.web.reactive.config.ResourceHandlerRegistry import org.springframework.web.servlet.config.annotation.WebMvcConfigurer diff --git a/src/main/kotlin/kr/lunaticbum/back/lun/configs/AutoAppConfig.kt b/src/main/kotlin/kr/lunaticbum/back/lun/configs/AutoAppConfig.kt index 035df93..79b5491 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/configs/AutoAppConfig.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/configs/AutoAppConfig.kt @@ -3,7 +3,6 @@ package kr.lunaticbum.back.lun.configs import org.springframework.context.annotation.ComponentScan import org.springframework.context.annotation.Configuration import org.springframework.context.annotation.FilterType -import org.springframework.web.servlet.config.annotation.EnableWebMvc @Configuration 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 3dd0901..f1185c5 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/configs/GlobalEnvironment.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/configs/GlobalEnvironment.kt @@ -8,6 +8,12 @@ import org.springframework.stereotype.Component @Component class GlobalEnvironment : EnvironmentAware { companion object { + val EncTypeKey = "enc" + val EncType00 = "T0" + val EncType11 = "T3" + val EncType10 = "T2" + val EncType01 = "T1" + val ApiKeyWordKey = "keyword" private val pad = "%7C%2A-%2A%7C" fun padding(key : String) = pad.plus(key).plus(pad) } diff --git a/src/main/kotlin/kr/lunaticbum/back/lun/configs/RootAppContext.kt b/src/main/kotlin/kr/lunaticbum/back/lun/configs/RootAppContext.kt index 2656e32..c53d1ec 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/configs/RootAppContext.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/configs/RootAppContext.kt @@ -1,9 +1,6 @@ package kr.lunaticbum.back.lun.configs -import com.mongodb.reactivestreams.client.MongoClient -import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration -import org.springframework.data.mongodb.core.MongoTemplate import org.springframework.data.mongodb.repository.config.EnableMongoRepositories import org.springframework.scheduling.annotation.EnableAsync diff --git a/src/main/kotlin/kr/lunaticbum/back/lun/configs/ServletAppContext.kt b/src/main/kotlin/kr/lunaticbum/back/lun/configs/ServletAppContext.kt index e6a1c62..2f04091 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/configs/ServletAppContext.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/configs/ServletAppContext.kt @@ -1,14 +1,5 @@ package kr.lunaticbum.back.lun.configs -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.beans.factory.annotation.Qualifier -import org.springframework.context.annotation.ComponentScan -import org.springframework.context.annotation.Configuration -import org.springframework.http.CacheControl -import org.springframework.web.servlet.HandlerInterceptor -import org.springframework.web.servlet.config.annotation.* -import java.util.concurrent.TimeUnit - //// Spring MVC 프로젝트에 관련된 설정을 하는 클래스 //@Configuration // Controller 어노테이션이 셋팅되어 있는 클래스를 Controller로 등록한다. 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 8611632..e191bb9 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/controllers/BlogController.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/controllers/BlogController.kt @@ -6,9 +6,9 @@ import com.google.gson.Gson import jakarta.servlet.http.HttpServletRequest import jakarta.servlet.http.HttpServletResponse import kr.lunaticbum.back.lun.configs.GlobalEnvironment -import kr.lunaticbum.back.lun.controllers.UserController.Companion.ApiKeyWordKey -import kr.lunaticbum.back.lun.controllers.UserController.Companion.EncType11 -import kr.lunaticbum.back.lun.controllers.UserController.Companion.EncTypeKey +import kr.lunaticbum.back.lun.configs.GlobalEnvironment.Companion.ApiKeyWordKey +import kr.lunaticbum.back.lun.configs.GlobalEnvironment.Companion.EncType11 +import kr.lunaticbum.back.lun.configs.GlobalEnvironment.Companion.EncTypeKey import kr.lunaticbum.back.lun.model.* import kr.lunaticbum.back.lun.utils.LogService import kr.lunaticbum.back.lun.utils.getFileExtension @@ -80,11 +80,11 @@ class BlogController() { logService.log(Gson().toJson(model)) model.data?.let { jsonString -> try { - val reqString = jsonString.split(globalEvv.padding(model.getKeyword())) + val reqString = jsonString.split(GlobalEnvironment.padding(model.getKeyword())) val nb = arrayListOf() val na = arrayListOf() - reqString[0].replace(globalEvv.padding(model.getKeyword()),"").split("").toList().let { na.addAll(it) } - reqString[1].replace(globalEvv.padding(model.getKeyword()),"").split("").toList().let { nb.addAll(it) } + reqString[0].replace(GlobalEnvironment.padding(model.getKeyword()),"").split("").toList().let { na.addAll(it) } + reqString[1].replace(GlobalEnvironment.padding(model.getKeyword()),"").split("").toList().let { nb.addAll(it) } var max = nb.size + na.size var fullData = arrayListOf() for (idx in 0..max) { if (idx % 2 == 0) { if (nb.size > 0) { fullData.add(nb.removeLast()) } } else { if (na.size > 0) { fullData.add(na.removeLast()) } } } @@ -144,7 +144,8 @@ class BlogController() { postManageg.find20()?.apply { forEach { it.title = URLDecoder.decode(it.title) - it.content = URLDecoder.decode(it.content) + val content = URLDecoder.decode(it.content) + it.content = if (content.length > 50) content.substring(0,50) else content } vm.modelMap.put("chunkedPosts", this.chunked(3)) } 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 7e041bd..c7c8629 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/controllers/BumsPrivate.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/controllers/BumsPrivate.kt @@ -6,7 +6,9 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kr.lunaticbum.back.lun.configs.GlobalEnvironment -import kr.lunaticbum.back.lun.model.* +import kr.lunaticbum.back.lun.model.LocationLog +import kr.lunaticbum.back.lun.model.LocationLogService +import kr.lunaticbum.back.lun.model.ResponceResult import kr.lunaticbum.back.lun.utils.LogService import org.springframework.beans.factory.annotation.Autowired import org.springframework.http.MediaType diff --git a/src/main/kotlin/kr/lunaticbum/back/lun/controllers/Home.kt b/src/main/kotlin/kr/lunaticbum/back/lun/controllers/Home.kt index 1ef65a8..009335a 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/controllers/Home.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/controllers/Home.kt @@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.bind.annotation.RestController import org.springframework.web.servlet.ModelAndView import java.net.URLDecoder -import java.net.http.HttpClient.Redirect @RestController @RequestMapping() 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 89ec612..c152c3c 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/controllers/Telegram.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/controllers/Telegram.kt @@ -4,14 +4,10 @@ import com.google.gson.Gson import jakarta.servlet.http.HttpServletRequest import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.GlobalScope -import kotlinx.coroutines.flow.asFlow -import kotlinx.coroutines.flow.onCompletion import kotlinx.coroutines.launch import kr.lunaticbum.back.lun.configs.GlobalEnvironment import kr.lunaticbum.back.lun.model.* import kr.lunaticbum.back.lun.utils.LogService -import org.jsoup.Jsoup import org.springframework.beans.factory.annotation.Autowired import org.springframework.context.annotation.Bean import org.springframework.scheduling.annotation.Scheduled @@ -19,10 +15,8 @@ import org.springframework.web.bind.annotation.* import org.springframework.web.reactive.function.client.WebClient import java.math.BigDecimal import java.math.RoundingMode -import java.text.SimpleDateFormat import java.time.Duration import java.util.* -import java.util.concurrent.TimeUnit @RestController 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 e3758b6..2fb8356 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/controllers/UserController.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/controllers/UserController.kt @@ -3,6 +3,9 @@ package kr.lunaticbum.back.lun.controllers import com.google.gson.Gson import jakarta.servlet.http.HttpServletRequest import kr.lunaticbum.back.lun.configs.GlobalEnvironment +import kr.lunaticbum.back.lun.configs.GlobalEnvironment.Companion.ApiKeyWordKey +import kr.lunaticbum.back.lun.configs.GlobalEnvironment.Companion.EncType11 +import kr.lunaticbum.back.lun.configs.GlobalEnvironment.Companion.EncTypeKey import kr.lunaticbum.back.lun.model.RequestModel import kr.lunaticbum.back.lun.model.ResponceResult import kr.lunaticbum.back.lun.model.User @@ -17,18 +20,13 @@ import org.springframework.web.reactive.function.client.WebClient import org.springframework.web.servlet.ModelAndView import java.io.File import java.util.* -import kotlin.math.log @RestController @RequestMapping("/user") class UserController { - val EncTypeKey = "enc" - val EncType00 = "T0" - val EncType11 = "T3" - val EncType10 = "T2" - val EncType01 = "T1" - val ApiKeyWordKey = "keyword" + + @Autowired lateinit var globalEvv : GlobalEnvironment diff --git a/src/main/kotlin/kr/lunaticbum/back/lun/model/ArticleSaveFile.kt b/src/main/kotlin/kr/lunaticbum/back/lun/model/ArticleSaveFile.kt index b74cc9a..7334712 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/model/ArticleSaveFile.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/model/ArticleSaveFile.kt @@ -1,7 +1,2 @@ package kr.lunaticbum.back.lun.model -import lombok.Getter -import lombok.NoArgsConstructor -import lombok.Setter -import org.springframework.data.annotation.Id - diff --git a/src/main/kotlin/kr/lunaticbum/back/lun/model/BumsPrivate.kt b/src/main/kotlin/kr/lunaticbum/back/lun/model/BumsPrivate.kt index 8f1fa5f..82d9c1b 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/model/BumsPrivate.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/model/BumsPrivate.kt @@ -19,8 +19,6 @@ import reactor.core.publisher.Mono import java.text.SimpleDateFormat import java.time.Duration import java.util.* -import kotlin.collections.ArrayList -import kotlin.collections.List class BumsPrivate { } diff --git a/src/main/kotlin/kr/lunaticbum/back/lun/model/Post.kt b/src/main/kotlin/kr/lunaticbum/back/lun/model/Post.kt index ebb4ac0..9894e1d 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/model/Post.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/model/Post.kt @@ -5,16 +5,12 @@ import lombok.AllArgsConstructor import lombok.Data import lombok.NoArgsConstructor import org.bson.BsonType -import org.bson.codecs.pojo.annotations.BsonCreator import org.bson.codecs.pojo.annotations.BsonId import org.bson.codecs.pojo.annotations.BsonRepresentation import org.springframework.beans.factory.annotation.Autowired import org.springframework.data.domain.Pageable import org.springframework.data.mongodb.core.mapping.Document -import org.springframework.data.mongodb.repository.Query import org.springframework.data.mongodb.repository.ReactiveMongoRepository -import org.springframework.security.core.userdetails.UserDetails -import org.springframework.security.core.userdetails.UserDetailsService import org.springframework.security.crypto.password.PasswordEncoder import org.springframework.stereotype.Repository import org.springframework.stereotype.Service diff --git a/src/main/kotlin/kr/lunaticbum/back/lun/model/TelegramUpdate.kt b/src/main/kotlin/kr/lunaticbum/back/lun/model/TelegramUpdate.kt index 5482435..997b0e2 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/model/TelegramUpdate.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/model/TelegramUpdate.kt @@ -13,7 +13,6 @@ import org.springframework.data.mongodb.repository.ReactiveMongoRepository import org.springframework.stereotype.Repository import org.springframework.stereotype.Service import reactor.core.publisher.Mono -import java.util.* // import com.fasterxml.jackson.databind.ObjectMapper; // version 2.11.1 diff --git a/src/main/kotlin/kr/lunaticbum/back/lun/service/UserDetailsService.kt b/src/main/kotlin/kr/lunaticbum/back/lun/service/UserDetailsService.kt index 07b63bf..43c8eb7 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/service/UserDetailsService.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/service/UserDetailsService.kt @@ -1,8 +1,2 @@ package kr.lunaticbum.back.lun.service -import kr.lunaticbum.back.lun.model.User -import kr.lunaticbum.back.lun.model.UserRepository -import lombok.RequiredArgsConstructor -import org.springframework.security.core.userdetails.UserDetails -import org.springframework.security.core.userdetails.UsernameNotFoundException -import org.springframework.stereotype.Service diff --git a/src/main/kotlin/kr/lunaticbum/back/lun/utils/WebClientUtil.kt b/src/main/kotlin/kr/lunaticbum/back/lun/utils/WebClientUtil.kt index e5a672d..93e5fcf 100644 --- a/src/main/kotlin/kr/lunaticbum/back/lun/utils/WebClientUtil.kt +++ b/src/main/kotlin/kr/lunaticbum/back/lun/utils/WebClientUtil.kt @@ -1,12 +1,5 @@ package kr.lunaticbum.back.lun.utils -import lombok.RequiredArgsConstructor -import org.apache.logging.log4j.util.InternalException -import org.springframework.http.HttpMethod -import org.springframework.http.HttpStatus -import org.springframework.stereotype.Component -import reactor.core.publisher.Mono - //@Component //@RequiredArgsConstructor