From e53dc4a91468996bf8a1b4769b3373dca2379afb Mon Sep 17 00:00:00 2001 From: KNKIM Date: Mon, 20 Dec 2021 10:43:04 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=A3=BC=EC=84=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/nlib/nlib.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/nlib/nlib.properties b/src/main/resources/nlib/nlib.properties index b9387452..d4400855 100644 --- a/src/main/resources/nlib/nlib.properties +++ b/src/main/resources/nlib/nlib.properties @@ -93,7 +93,7 @@ list.paging.page.size = 10 # \uba54\uc778\ud654\uba74 \uae30\ubcf8 \ubc30\ub108 #---------------------------------------- # \uba54\uc778\ud654\uba74 \uae30\ubcf8 \ubc30\ub108 \uc704\uce58 -# \ub85c\uceec LLLLLLLLLLLLLLL +# \ub85c\uceec \uc11c\ubc84 #main.banner.img.path = C:/iams/workspace/nlib/src/main/webapp/images/bg/bg-mainbanner.jpg # \uac1c\ubc1c\uc11c\ubc84 main.banner.img.path = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/images/bg/bg-mainbanner.jpg @@ -111,7 +111,7 @@ fileupload.max.mbsize = 10 # \ucd5c\ub300 \ud30c\uc77c \uac1c\uc218 fileupload.max.files = 5 # \ud30c\uc77c \uc5c5\ub85c\ub4dc \uac00\ub2a5 \ud655\uc7a5\uc790 -fileupload.acceptable.ext = image/*,.hwp,.xls,.xlsx,.ppt,.pptx,.doc,.docx,.txt +fileupload.acceptable.ext = .jpg,.jpe,.jpge,.bmp,.gif,.png,.hwp,.hwpx,.pdf,.xls,.xlsx,.ppt,.pptx,.doc,.docx,.txt # \uc784\uc2dc \uc800\uc7a5 \uc704\uce58 @@ -121,8 +121,8 @@ fileupload.temp.subpath = /temp fileupload.bbs.qna.subpath = /bbs/qna fileupload.bbs.ancmnt.subpath = /bbs/ancmnt -# \uba54\uc77c \uacbd\ub85c -# \ub85c\uceec LLLLLLLLLLLLLLL +# \uc774\uba54\uc77c \ud15c\ud50c\ub9bf \uacbd\ub85c +# \ub85c\uceec\uc11c\ubc84 #mailing.sender.membership.signUpTemplate = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/signUp_mail_template.html #mailing.sender.membership.pwdTemplate = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/pwd_mail_template.html #mailing.sender.membership.certTemplate = C:/iams/workspace/nlib/src/main/webapp/WEB-INF/template/mail/cert_mail_template.html From b4be848e7d68bbf3e939c930c94506aa38676548 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Mon, 20 Dec 2021 10:47:14 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EB=AF=B8=EC=82=AC=EC=9A=A9=20import=20?= =?UTF-8?q?=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ext/oauth/service/OAuthLogin.java | 29 ++----------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/src/main/java/egovframework/com/ext/oauth/service/OAuthLogin.java b/src/main/java/egovframework/com/ext/oauth/service/OAuthLogin.java index 9ab2fd6b..a90ddb8f 100644 --- a/src/main/java/egovframework/com/ext/oauth/service/OAuthLogin.java +++ b/src/main/java/egovframework/com/ext/oauth/service/OAuthLogin.java @@ -1,26 +1,7 @@ package egovframework.com.ext.oauth.service; -import java.io.IOException; -import java.net.URI; -import java.util.Iterator; - -import org.apache.commons.lang3.StringUtils; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.http.client.ClientHttpResponse; -import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; -import org.springframework.web.client.ResponseErrorHandler; -import org.springframework.web.client.RestTemplate; - -import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.github.scribejava.core.builder.ScopeBuilder; import com.github.scribejava.core.builder.ServiceBuilder; import com.github.scribejava.core.model.OAuth2AccessToken; @@ -29,8 +10,6 @@ import com.github.scribejava.core.model.Response; import com.github.scribejava.core.model.Verb; import com.github.scribejava.core.oauth.OAuth20Service; -import nlib.cmm.snslogin.GoogleOAuthResponse; -import nlib.user.service.LoginService; import nlib.util.StringUtil; @@ -101,7 +80,7 @@ public class OAuthLogin { if (this.oauthVO.isNaver()) { //------------------------------------ - // 네이버 (2021.08.19 KKN) + // 네이버 //------------------------------------ user.setSnsType(OAuthConfig.NAVER_SERVICE_NAME); JsonNode resNode = rootNode.get("response"); @@ -153,8 +132,7 @@ public class OAuthLogin { // 로그인 성공 user.setValidLogin(true); - } - else if (this.oauthVO.isGoogle()) { + } else if (this.oauthVO.isGoogle()) { //------------------------------------ // 구글 //------------------------------------ @@ -168,8 +146,7 @@ public class OAuthLogin { if (rootNode.has("name")) user.setSnsName(StringUtil.getString(rootNode.get("name").asText(), "")); - } - else if (this.oauthVO.isKakao()) { + } else if (this.oauthVO.isKakao()) { //------------------------------------ // 카카오 //------------------------------------ From 0a7ba51df14cfb80e794e67786e62b480cb8eab3 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Mon, 20 Dec 2021 13:09:00 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/nlib/nlib.properties | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/resources/nlib/nlib.properties b/src/main/resources/nlib/nlib.properties index d4400855..4eb2e388 100644 --- a/src/main/resources/nlib/nlib.properties +++ b/src/main/resources/nlib/nlib.properties @@ -152,8 +152,7 @@ search.searchIp = 210.181.197.67 search.searchPort = 7800 search.protocol = http -#search.managerIp = 210.181.197.67 -search.managerIp = search.nculture.org +search.managerIp = 210.181.197.67 search.managerPort = 7800