Selaa lähdekoodia

배포 프로퍼티 설정

inkoreakim 2 vuotta sitten
vanhempi
commit
6c53a0068a

+ 1 - 0
build.gradle

@@ -73,3 +73,4 @@ dependencies {
 tasks.named('test') {
     useJUnitPlatform()
 }
+

+ 2 - 0
src/main/generated/com/example/ili_web/board/domain/QBoard.java

@@ -23,6 +23,8 @@ public class QBoard extends EntityPathBase<Board> {
 
     public final StringPath content = createString("content");
 
+    public final StringPath email = createString("email");
+
     public final NumberPath<Long> id = createNumber("id", Long.class);
 
     public final StringPath nickName = createString("nickName");

+ 3 - 0
src/main/java/com/example/ili_web/board/domain/Board.java

@@ -28,6 +28,8 @@ public class Board {
     @Column
     private String nickName;
     @Column
+    private String email;
+    @Column
     private String title;
     @Column
     private String content;
@@ -51,6 +53,7 @@ public class Board {
         this.company = req.getCompany();
         this.phoneNum = req.getPhoneNum();
         this.nickName = req.getNickname();
+        this.email = req.getEmail();
         this.title = req.getTitle();
         this.content = req.getContent();
         this.type = req.getType();

+ 33 - 0
src/main/resources/application-local.properties

@@ -0,0 +1,33 @@
+#spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration
+logging.level.org.springframework.web=INFO
+#local
+spring.datasource.url=jdbc:mysql://103.55.191.37:3306/iliweb_test?rewriteBatchedStatements=true&profileSQL=true&logger=Slf4JLogger&maxQuerySizeToLog=999999
+spring.datasource.username=logisticsbiz
+spring.datasource.password=#il2020)(*
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+
+#JPA
+spring.jpa.database=mysql
+spring.jpa.show-sql=true
+
+#?? ??
+server.port=80
+
+#SMS
+global.message.sms.address=http://211.230.149.175
+global.message.sms.url=/Remote/RemoteSms.html
+global.message.sms.id=intl2000
+global.message.sms.pass=972179
+
+#multipart config
+spring.servlet.multipart.enabled=true
+spring.servlet.multipart.max-file-size=100MB
+spring.servlet.multipart.max-request-size=100MB
+spring.http.multipart.enabled=true
+
+#file root
+#window
+multipart.file.storage.win=C:\\data\\ili_web
+#linux
+multipart.file.storage.linux=/data/ili_web
+

+ 33 - 0
src/main/resources/application-prod.properties

@@ -0,0 +1,33 @@
+#spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration
+logging.level.org.springframework.web=INFO
+#server
+spring.datasource.url=jdbc:mysql://127.0.0.1:3306/iliweb_test?rewriteBatchedStatements=true&profileSQL=true&logger=Slf4JLogger&maxQuerySizeToLog=999999
+spring.datasource.username=logisticsbiz
+spring.datasource.password=#il2020)(*
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+
+#JPA
+spring.jpa.database=mysql
+spring.jpa.show-sql=true
+
+#?? ??
+server.port=80
+
+#SMS
+global.message.sms.address=http://211.230.149.175
+global.message.sms.url=/Remote/RemoteSms.html
+global.message.sms.id=intl2000
+global.message.sms.pass=972179
+
+#multipart config
+spring.servlet.multipart.enabled=true
+spring.servlet.multipart.max-file-size=100MB
+spring.servlet.multipart.max-request-size=100MB
+spring.http.multipart.enabled=true
+
+#file root
+#window
+multipart.file.storage.win=C:\\data\\ili_web
+#linux
+multipart.file.storage.linux=/data/ili_web
+

+ 16 - 6
src/main/resources/static/js/contact/advice.js

@@ -1,4 +1,5 @@
 let fileArray = [];
+
 function openApply() {
     const manual = document.getElementById('advice_manual');
     const manualHead = document.getElementById('advice_manual_header');
@@ -59,7 +60,7 @@ function clearApply() {
     inputElements.forEach(input => {
         input.value = '';
     });
-    btnElements.forEach(btn=>{
+    btnElements.forEach(btn => {
         btn.disabled = false;
     })
 
@@ -68,7 +69,7 @@ function clearApply() {
     fileArray = [];
 }
 
-function clearModal() {
+/*function clearModal() {
     const form = document.getElementById('check_info');
     const inputElements = form.querySelectorAll('input');
     inputElements.forEach(input => {
@@ -77,10 +78,11 @@ function clearModal() {
 
     const timer = document.getElementById('timer');
     timer.innerHTML = '';
-}
+}*/
+
 
 
-function initFile (input) {
+function initFile(input) {
     const files = input.files;
     let html = '';
     if (fileArray.length > 5) {
@@ -99,14 +101,22 @@ function initFile (input) {
 
 async function bindDetail(id) {
     const data = await getDetail(id);
+    console.log(data);
+    document.getElementById('lg_detail_name').value = data.userName;
+    document.getElementById('lg_detail_phone').value = data.phoneNum;
+    document.getElementById('lg_detail_email').value = data.email;
+    document.getElementById('lg_detail_nickname').value = data.nickName;
+    document.getElementById('lg_detail_company').value = data.company;
+    document.getElementById('lg_detail_title').value = data.title;
+    document.getElementById('lg_detail_content').value = data.content;
 }
 
 function getDetail(id) {
-    axios.get('/api/v1/board/detail', {params : {id}})
+    return axios.get('/api/v1/board/detail', {params: {id}})
         .then(res => {
             return res.data;
         })
         .catch(error => {
-            console.log(error)
+            return error;
         })
 }

+ 1 - 0
src/main/resources/static/js/contact/auth-phone.js

@@ -125,6 +125,7 @@ function checkPassword() {
                 document.getElementById('advice_apply').style.display = 'none';
                 document.getElementById('advice_manual').style.display = 'none';
                 document.getElementById('advice_detail').style.display = 'flex';
+                closeModal('auth_modal');
                 bindDetail(id)
             }
         })

+ 22 - 21
src/main/resources/static/js/contact/modalControl.js

@@ -11,30 +11,31 @@ function closeModal(tag) {
     modal.style.display = 'none'
     document.getElementById('auth_phone').style.display = 'none';
     document.getElementById('auth_num').style.display = 'none';
-    clearModal();
+    clearModal(tag);
 }
 
 function clearModal() {
-    const modalBody = document.querySelector('.modal_body');
+    const modalBodies = document.querySelectorAll('.modal_body');
+    modalBodies.forEach(modalBody => {
+        if (modalBody) {
+            // 모든 input 필드를 찾아 값을 초기화하고 disabled 상태를 해제함
+            const inputs = modalBody.querySelectorAll('input');
+            inputs.forEach(input => {
+                input.value = ''; // 값 초기화
+                input.disabled = false; // disabled 해제
+            });
 
-    if (modalBody) {
-        // 모든 input 필드를 찾아 값을 초기화하고 disabled 상태를 해제함
-        const inputs = modalBody.querySelectorAll('input');
-        inputs.forEach(input => {
-            input.value = ''; // 값 초기화
-            input.disabled = false; // disabled 해제
-        });
+            // 모든 button을 찾아 disabled 상태를 해제함
+            const buttons = modalBody.querySelectorAll('button');
+            buttons.forEach(button => {
+                button.disabled = false; // disabled 해제
+            });
 
-        // 모든 button을 찾아 disabled 상태를 해제함
-        const buttons = modalBody.querySelectorAll('button');
-        buttons.forEach(button => {
-            button.disabled = false; // disabled 해제
-        });
-
-        // 모든 span 태그를 찾아 텍스트 내용을 초기화함
-        const ps = modalBody.querySelectorAll('span');
-        ps.forEach(p => {
-            p.textContent = ''; // 텍스트 내용 초기화
-        });
-    }
+            // 모든 span 태그를 찾아 텍스트 내용을 초기화함
+            const ps = modalBody.querySelectorAll('span');
+            ps.forEach(p => {
+                p.textContent = ''; // 텍스트 내용 초기화
+            });
+        }
+    })
 }

+ 4 - 4
src/main/resources/templates/html/about.html

@@ -37,10 +37,10 @@
                         <p>The Master of Global Logistics</p>
                         <p>중국을 시작으로 세계 각지에 글로벌 물류 네트워크를 구축하였고</p>
                         <p>오랜 실무경험을 통한 노하우로 언제 어디서나 고객만족을 실현하고 있습니다.</p>
-                        <p><a class="btn" href="#outline" th:onclick="scrollToDiv('outline')">회사개요</a>
-                            <a class="btn" href="#greeting" th:onclick="scrollToDiv('greeting')">CEO 인사말</a>
-                            <a class="btn" href="#history" th:onclick="scrollToDiv('history')">연혁</a>
-                            <a class="btn" href="#philosophy" th:onclick="scrollToDiv('philosophy')">경영이념</a>
+                        <p><a class="btn btn-primary" href="#outline" th:onclick="scrollToDiv('outline')">회사개요</a>
+                            <a class="btn btn-primary" href="#greeting" th:onclick="scrollToDiv('greeting')">CEO 인사말</a>
+                            <a class="btn btn-primary" href="#history" th:onclick="scrollToDiv('history')">연혁</a>
+                            <a class="btn btn-primary" href="#philosophy" th:onclick="scrollToDiv('philosophy')">경영이념</a>
                         </p>
                     </div>
                 </div>

+ 4 - 5
src/main/resources/templates/html/contact-inner/logi-advice.html

@@ -89,7 +89,7 @@
                         <label class="form-label" for="lg_title">제목</label>
                     </div>
                     <div class="mb-3 form-floating">
-                        <textarea class="form-control" id="lg_content" required rows="10" name="content"></textarea>
+                        <textarea class="form-control" id="lg_content" required rows="10" name="content" style="height: 300px"></textarea>
                         <label class="form-label" for="lg_content">내용</label>
                     </div>
                     <button class="btn btn-primary" type="button" onclick="subForm()">신청하기</button>
@@ -125,7 +125,7 @@
                             <input class="form-control" id="lg_detail_company" name="company" type="text" disabled>
                             <label class="form-label" for="lg_detail_company">상호</label>
                         </div>
-                        <div class="col-md-6">
+                        <div class="col-md-6" style="visibility: hidden">
                             <p>파일목록</p>
                             <ul id="lg_detail_file_list" class="list-group mb-3">
 
@@ -137,10 +137,9 @@
                         <label class="form-label" for="lg_detail_title">제목</label>
                     </div>
                     <div class="mb-3 form-floating">
-                        <textarea class="form-control" id="lg_detail_content" required rows="10" name="content" disabled></textarea>
-                        <label class="form-label" for="lg_content">내용</label>
+                        <textarea class="form-control" id="lg_detail_content" required rows="10" style="height: 300px" name="content" disabled></textarea>
+                        <label class="form-label" for="lg_detail_content">내용</label>
                     </div>
-                    <button class="btn btn-primary" type="button" onclick="subForm()">신청하기</button>
             </div>
         </div>
         <div class="row" id="advice_manual">

+ 7 - 4
src/main/resources/templates/html/contact-us.html

@@ -6,6 +6,9 @@
     <meta content="" name="description">
     <meta content="Mark Otto, Jacob Thornton, and Bootstrap contributors" name="author">
     <meta content="Hugo 0.84.0" name="generator">
+
+
+
     <title>(주)국제종합물류</title>
 
     <link href="https://getbootstrap.com/docs/5.0/examples/carousel/" rel="canonical">
@@ -36,10 +39,10 @@
                     <div class="carousel-caption">
                         <h1>고객센터</h1>
                         <p>The Master of Global Logistics</p>
-                        <p><a class="btn" href="javascript:void(0);" th:onclick="changeInnerAjax('notice')">안내/공지</a>
-                            <a class="btn" href="javascript:void(0);" th:onclick="changeInnerAjax('estimate')">물류견적</a>
-                            <a class="btn" href="javascript:void(0);" th:onclick="changeInnerAjax('logi-advice')">물류자문</a>
-                            <a class="btn" href="javascript:void(0);">무역자문</a>
+                        <p><a class="btn btn-primary" href="javascript:void(0);" th:onclick="changeInnerAjax('notice')">안내/공지</a>
+                            <!--<a class="btn btn-primary" href="javascript:void(0);" th:onclick="changeInnerAjax('estimate')">물류견적</a>-->
+                            <a class="btn btn-primary" href="javascript:void(0);" th:onclick="changeInnerAjax('logi-advice')">물류자문</a>
+                            <!--<a class="btn btn-primary" href="javascript:void(0);">무역자문</a>-->
                         </p>
                     </div>
                 </div>

+ 1 - 1
src/main/resources/templates/html/info-plaza.html

@@ -46,7 +46,7 @@
                             <button class="btn btn-primary"  th:onclick="changeInner('inner_form')">서식자료</button>
                             <button class="btn btn-primary"  th:onclick="changeInner('inner_container')">컨테이너제원</button>
                             <button class="btn btn-primary"  th:onclick="changeInner('inner_vol')">체적계산기</button>
-                            <button class="btn btn-primary"  th:onclick="changeInner('inner_global')">물류정보</button>
+                            <!--<button class="btn btn-primary"  th:onclick="changeInner('inner_global')">물류정보</button>-->
                         </p>
                     </div>
                 </div>