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
2024-10-05 17:18:43 +09:00
parent b945a0d677 ab915d0a41
commit dfa6b28a66
20 changed files with 793 additions and 305 deletions
@@ -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
@@ -1,6 +1,5 @@
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org">

-<html lang="ko">
 <head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -8,7 +7,7 @@
    <style>
        table {
            width: 280px;
-            height: 550px;
+            height: 850px;
            margin: auto;

        }
@@ -65,50 +64,64 @@
        }
    </style>
    <script>
+        function getDivder() {
+            return "_||L_"
+        }
+        function mergeData(a , b) {
+            return a.join("") + getDivder() + b.join("")
+        }

        function userJoin() {
            var httpRequest;
            var user_id = document.getElementById("user_id").value;
            var user_pw = document.getElementById("user_pw").value;
            var user_pw_check = document.getElementById("user_pw_check").value;
-            var user_email = document.getElementById("user_email").value;
-            var user_birth = document.getElementById("user_birth").value;
-            var user_name = document.getElementById("user_name").value;
+            if (user_pw === user_pw_check) {
+                var user_email = document.getElementById("user_email").value;
+                var user_birth = document.getElementById("user_birth").value;
+                var user_name = document.getElementById("user_name").value;

-            /* 통신에 사용 될 XMLHttpRequest 객체 정의 */
-            httpRequest = new XMLHttpRequest();
-            /* httpRequest의 readyState가 변화했을때 함수 실행 */
-            httpRequest.onreadystatechange = () => {
-                /* readyState가 Done이고 응답 값이 200일 때, 받아온 response로 name과 age를 그려줌 */
-                if (httpRequest.readyState === XMLHttpRequest.DONE) {
-                    if (httpRequest.status === 200) {
-                        var result = httpRequest.response;
-                        document.getElementById("name").innerText = result.name;
-                        document.getElementById("age").innerText = result.age;
-                    } else {
-                        alert('Request Error!');
+                /* 통신에 사용 될 XMLHttpRequest 객체 정의 */
+                httpRequest = new XMLHttpRequest();
+                /* httpRequest의 readyState가 변화했을때 함수 실행 */
+                httpRequest.onreadystatechange = () => {
+                    /* readyState가 Done이고 응답 값이 200일 때, 받아온 response로 name과 age를 그려줌 */
+                    if (httpRequest.readyState === XMLHttpRequest.DONE) {
+                        if (httpRequest.status === 200) {
+                            var result = httpRequest.response;
+                            console.log(result)
+                            alert('Request OK!' +  result);
+                            // document.getElementById("name").innerText = result.name;
+                            // document.getElementById("age").innerText = result.age;
+                        } else {
+                            alert('Request Error!');
+                        }
                    }
+                };
+                /* Get 방식으로 name 파라미터와 함께 요청 */
+                httpRequest.open('POST', 'joinUser.api', true);
+                httpRequest.setRequestHeader("Content-Type", "text/plain");
+
+                let data = {
+                    'user_id': user_id,
+                    'user_pw': user_pw,
+                    'user_pw_check': user_pw_check,
+                    'user_email': user_email,
+                    'user_birth': user_birth,
+                    'user_name': user_name
                }
-            };
-            /* Get 방식으로 name 파라미터와 함께 요청 */
-            httpRequest.open('POST', 'joinUser.api', true);
-            httpRequest.setRequestHeader("Content-Type", "application/json");
-
-            let data = {
-                'user_id': user_id,
-                'user_pw': user_pw,
-                'user_pw_check': user_pw_check,
-                'user_email': user_email,
-                'user_birth': user_birth,
-                'user_name': user_name
+                var odd = []
+                var even = []
+                var dataStr = JSON.stringify(data)
+                var src = dataStr.split("")
+                src.forEach(function (s,i,a) {if (i % 2 === 0) {even.push(s)} else {odd.push(s)}})
+                httpRequest.send(mergeData(even.reverse(),odd.reverse()));
            }
-
-            httpRequest.send(JSON.stringify(data));
        }
    </script>
 </head>
 <body>
-<form >
+
    <table>
        <tr>
            <td><h2>회원가입</h2></td>
@@ -136,6 +149,6 @@
        </tr>
        <tr><td><input type="submit" value="가입하기" class="btn" onclick="userJoin()"></td></tr>
    </table>
-</form>
+
 </body>
 </html>