Merge branch 'main' of https://dev.lunaticbum.kr/lun_admin/lunBackServer

# Conflicts:
#	src/main/kotlin/kr/lunaticbum/back/lun/LunApplication.kt
#	src/main/kotlin/kr/lunaticbum/back/lun/controllers/Telegram.kt
#	src/main/kotlin/kr/lunaticbum/back/lun/model/TelegramUpdate.kt
#	src/main/resources/application.properties

src/main/resources/application.properties

@@ -1,13 +1,13 @@
 spring.application.name=lun
-spring.datasource.url=jdbc:mariadb://lunaticbum.kr:3307/lun_db
-#spring.datasource.url=jdbc:mariadb://localhost:3307/lun_db
-spring.datasource.username=lun_admin
-spring.datasource.password=VioPup*383
+server.port=443
+spring.datasource.username=c
+spring.datasource.password=c
 spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
-spring.data.mongodb.host=nas.lunaticbum.kr
+#<<<<<<< HEAD
+#spring.data.mongodb.host=nas.lunaticbum.kr
 #spring.data.mongodb.host=localhost
-spring.data.mongodb.port=27017
-spring.data.mongodb.database=lun_db
+#spring.data.mongodb.port=27017
+#spring.data.mongodb.database=lun_db
 #SSL
 server.ssl.key-store=classpath:prv.p12
 server.ssl.key-store-type=PKCS12
@@ -17,4 +17,36 @@ server.http2.enabled=true
 #logging.level.org.springframework.boot.autoconfigure=ERROR
 #spring.mvc.view.prefix=/templates
 #spring.mvc.view.suffix=.html
-#server.servlet.register-default-servlet=true
+#server.servlet.register-default-servlet=true
+#=======
+spring.datasource.url=b
+spring.data.mongodb.uri=a
+spring.data.mongodb.authentication-database=admin
+spring.data.mongodb.database=l
+spring.thymeleaf.prefix=classpath:/templates/
+spring.thymeleaf.suffix=.html
+telegram.bot.key=1
+telegram.my.id=2
+telegram.target.id=3
+weather.api.key=3 
+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
+spring.data.mongodb.option.server-selection-timeout=30000
+spring.data.mongodb.option.max-wait-time=120000
+spring.data.mongodb.option.max-connection-idle-time=0
+spring.data.mongodb.option.max-connection-life-time=0
+spring.data.mongodb.option.connect-timeout=10000
+spring.data.mongodb.option.socket-timeout=0
+
+spring.data.mongodb.option.socket-keep-alive=false
+spring.data.mongodb.option.ssl-enabled=false
+spring.data.mongodb.option.ssl-invalid-host-name-allowed=false
+spring.data.mongodb.option.always-use-m-beans=false
+
+spring.data.mongodb.option.heartbeat-socket-timeout=20000
+spring.data.mongodb.option.heartbeat-connect-timeout=20000
+spring.data.mongodb.option.min-heartbeat-frequency=500
+spring.data.mongodb.option.heartbeat-frequency=10000
+spring.data.mongodb.option.local-threshold=15
+#>>>>>>> ab915d0a416c69708f1df1ad76d7a14c779c1f59