DBNT
/
geoinfo_eGov_work
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 비밀번호 찾기 오류 수정 건

main
thkim 2026-02-24 10:51:56 +09:00
parent 71754b3c94
commit 0f164cf739
8 changed files with 69 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pom.xml
View File

@ -983,30 +983,31 @@
<version>1.0.0</version>
</dependency>
<!-- ▼▼▼ 세션을 Redis에 저장 ▼▼▼ -->
<dependency>
<groupId>org.springframework.session</groupId>
<artifactId>spring-session-data-redis</artifactId>
<version>1.2.2.RELEASE</version>
<exclusions>
<exclusion>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
<version>1.6.2.RELEASE</version>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>2.8.2</version>
</dependency>
<groupId>org.springframework.session</groupId>
<artifactId>spring-session-data-redis</artifactId>
<version>1.2.2.RELEASE</version>
<exclusions>
<exclusion>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
<version>1.6.2.RELEASE</version>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>2.8.2</version>
</dependency>
<!-- ▲▲▲ 세션을 Redis에 저장 ▲▲▲ -->
</dependencies>

47
src/main/java/geoinfo/main/login/LoginController.java
View File

@ -332,19 +332,33 @@ public class LoginController {
map.put("name", name);
Map<String, Object> result = loginService.selectSearchPass(map);
Map<String, Object> resultByUserIdOrEmail = loginService.selectSearchPassByUserIdOrEmail(map);
map.put("DI", DI);
Map<String, Object> resultByDupinfo = loginService.selectSearchPassByDupinfo(map);
ArrayList<Map<String, Object>> resultByUserIdOrEmailList = loginService.selectSearchPassByUserIdOrEmail(map);
if (result == null && resultByUserIdOrEmail == null) {
if( resultByUserIdOrEmailList.size() == 0 ) {
mv.setViewName("body/account/pwNotFind");
mv.addObject("msg", name + "님의 아이디는 등록되어있지 않습니다.");
} else if (result == null && resultByUserIdOrEmail != null) {
mv.addObject("msg", name + "님의 아이디는 등록되어있지 않습니다. '개인' 또는 '기업' 사용자 체크 부분도 확인바랍니다.");
return mv;
}
Map<String, Object> resultByUserIdOrEmail = resultByUserIdOrEmailList.get(0);
map.put("DI", DI);
ArrayList<Map<String, Object>> resultByDupinfoList = loginService.selectSearchPassByDupinfo(map);
if( resultByDupinfoList.size() == 0 ) {
mv.setViewName("body/account/pwNotFind");
mv.addObject("msg", name + "님의 모마일 인증으로 가입된 계정이 존재하지 않습니다.");
return mv;
}
Map<String, Object> resultByDupinfo = resultByDupinfoList.get(0);
if (result == null && resultByUserIdOrEmail != null) {
mv.setViewName("body/account/pwNotFind");
mv.addObject("msg", name + "님의 아이디 또는 이메일이 등록되어있지 않습니다.");
return mv;
} else if (result == null && resultByDupinfo != null) {
mv.setViewName("body/account/pwNotFind");
mv.addObject("msg", name + "님의 아이디 또는 이메일이 등록되어있지 않습니다..");
return mv;
} else {
mv.setViewName("body/account/pass_post");
mv.addObject("hdnCertNum",hdnCertNum);
@ -352,27 +366,8 @@ public class LoginController {
mv.addObject("userId", userId);
mv.addObject("name", name);
mv.addObject("cls", cls);
return mv;
}
/*if (result != null) {
mv.addObject("username", result.get("user_name"));
mv.addObject("userid", result.get("userid"));
mv.addObject("datetime", result.get("datetime"));
mv.addObject("passwd", result.get("passwd"));
SecureRandom r = new SecureRandom();
int l = r.nextInt(1000000000);
String newPass = Integer.toString(l);
System.out.println("rand===" + newPass);
mv.addObject("script", "<script>newPassj = hex_sha256('" + newPass + "').substring(0,20);</script>" + "<input type=hidden name='newPass' value=" + GeoinfoCommon.parseData(newPass) + ">" + "<input type=hidden name='newPassj' value=''>" + "<input type=hidden name='useridq' value=" + GeoinfoCommon.parseData(result.get("userid").toString()) + ">" + "<input type=hidden name='clsq' value=" + GeoinfoCommon.parseData(result.get("cls").toString()) + ">"
+ "<input type=hidden name='userNameq' value=" + GeoinfoCommon.parseData(result.get("user_name").toString()) + ">" + "<script>document.passSearch.newPassj.value = newPassj;document.passSearch.submit();</script>");
} else {
mv.setViewName("body/account/pwNotFind");
mv.addObject("msg", name + "님의 아이디는 등록되어있지 않습니다.");
}*/
return mv;
}
@RequestMapping(value = "/searchPassch.do")

5
src/main/java/geoinfo/main/login/service/LoginMapper.java
View File

@ -1,5 +1,6 @@
package geoinfo.main.login.service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -30,8 +31,8 @@ public interface LoginMapper {
Map<String, Object> selectSearchPass(Map<String, Object> map);
Map<String, Object> selectSearchPassByUserIdOrEmail(Map<String, Object> map);
Map<String, Object> selectSearchPassByDupinfo(Map<String, Object> map);
ArrayList<Map<String, Object>> selectSearchPassByUserIdOrEmail(Map<String, Object> map);
ArrayList<Map<String, Object>> selectSearchPassByDupinfo(Map<String, Object> map);
void updateSearchPassch(Map<String, Object> map);

5
src/main/java/geoinfo/main/login/service/LoginService.java
View File

@ -1,5 +1,6 @@
package geoinfo.main.login.service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -22,8 +23,8 @@ public interface LoginService {
Map<String, Object> selectSearchId(Map<String, Object> map) throws Exception;
Map<String, Object> selectSearchIdByNameAndPhoneAndDupinfoIsNullAndCertificationYnFalse(Map<String, Object> map) throws Exception;
Map<String, Object> selectSearchPass(Map<String, Object> map) throws Exception;
Map<String, Object> selectSearchPassByUserIdOrEmail(Map<String, Object> map) throws Exception;
Map<String, Object> selectSearchPassByDupinfo(Map<String, Object> map) throws Exception;
ArrayList<Map<String, Object>> selectSearchPassByUserIdOrEmail(Map<String, Object> map) throws Exception;
ArrayList<Map<String, Object>> selectSearchPassByDupinfo(Map<String, Object> map) throws Exception;
void updateSearchPassch(Map<String, Object> map) throws Exception;
int selectWebDownLoadLog(Map<String, Object> map);
List<Map<String, Object>> selectDownLoadContent(Map<String, Object> map);

5
src/main/java/geoinfo/main/login/service/impl/LoginServiceImpl.java
View File

@ -8,6 +8,7 @@ import geoinfo.util.FileUtil;
import java.io.FileNotFoundException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
@ -86,12 +87,12 @@ public class LoginServiceImpl implements LoginService{
}
@Override
public Map<String, Object> selectSearchPassByUserIdOrEmail(Map<String, Object> map) throws Exception {
public ArrayList<Map<String, Object>> selectSearchPassByUserIdOrEmail(Map<String, Object> map) throws Exception {
return loginMapper.selectSearchPassByUserIdOrEmail(map);
}
@Override
public Map<String, Object> selectSearchPassByDupinfo(Map<String, Object> map) throws Exception {
public ArrayList<Map<String, Object>> selectSearchPassByDupinfo(Map<String, Object> map) throws Exception {
return loginMapper.selectSearchPassByDupinfo(map);
}

7
src/main/resources/egovframework/sqlmap/mapper/main/Login_SQL.xml
View File

@ -187,8 +187,11 @@
SELECT CLS, USER_NAME, USERID, PASSWD, TO_CHAR(DATETIME,'YYYY-MM-DD') DATETIME, CERTIFICATION_YN
FROM WEB_MEMBER_IN
WHERE
TRIM(USERID) = TRIM(#{userId}) OR
TRIM(EMAIL) = TRIM(#{email})
TRIM(CLS) = TRIM(#{cls}) AND
(
TRIM(USERID) = TRIM(#{userId}) OR
TRIM(EMAIL) = TRIM(#{email})
)
]]>
</select>

2
src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry_project.jsp
View File

@ -274,7 +274,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe
*/
function handleRowClick(p_code) {
if (!isDragging) {
openMapLoc(p_code);
onClickBtnViewOnMap(p_code);
}
}

20
src/main/webapp/com/js/drilling/drilling-common.js
View File

@ -1,4 +1,4 @@
function onClickBtnViewOnMap() {
function onClickBtnViewOnMap(pCode = null) {
const projectMasterCompanyName = '${mbr.projectMasterCompanyName}';
let projectCode = '${mbr.ProjectCode}';
@ -17,24 +17,24 @@ function onClickBtnViewOnMap() {
const lastTeamName = document.getElementById('last-team-name').value;
const masterCompanyCode = document.getElementById('master-company-code').value;
openMap('${sessionScope.USERID}','${cls}', gl, gm, gs, gf, lastTeamName, projectMasterCompanyName, maxX-minX, maxY-minY, masterCompanyCode);
openMap('${sessionScope.USERID}','${cls}', gl, gm, gs, gf, lastTeamName, projectMasterCompanyName, maxX-minX, maxY-minY, masterCompanyCode, pCode);
}
function openMap(userid,cls, gl = null, gm = null, gs = null, gf = null, lastTeamName = null, projectMasterCompanyName = null, positionX= null, positionY= null, masterCompanyCode=null)
function openMap(userid,cls, gl = null, gm = null, gs = null, gf = null, lastTeamName = null, projectMasterCompanyName = null, positionX= null, positionY= null, masterCompanyCode=null, pCode=null)
{
win = 'map';
sizeX=window.screen.width;
sizeY=window.screen.height;
let userArea = projectMasterCompanyName;
if( userArea == null ) {
if( userid === 't3-1' ) {
userArea = "충청남도";
} else if( userid === 't3-2' ) {
userArea = "부산광역시";
}
let mapWin = null;
const url_base = "/map/mapMain.do?";
let url = "userArea=" + encodeURIComponent(userArea) + "&gl=" + gl + "&gm=" + gm + "&gs=" + gs + "&gf=" + gf + "&lastTeamName=" + lastTeamName + "&masterCompanyCode=" + masterCompanyCode + "&positionX=" + positionX + "&positionY=" + positionY + "#tab_1_1";
if( pCode ) {
url = "pcode=" + pCode + "&" + url;
}
var mapWin = window.open("/map/mapMain.do?userArea=" + encodeURIComponent(userArea) + "&gl=" + gl + "&gm=" + gm + "&gs=" + gs + "&gf=" + gf + "&lastTeamName=" + lastTeamName + "&masterCompanyCode=" + masterCompanyCode + "&positionX=" + positionX + "&positionY=" + positionY + "#tab_1_1","mapWin","toolbar=no,location=no,directories=no,status=yes,menubar=no,scrollbars=yes,resizable=yes,width=" + sizeX + ",height=" + sizeY + ",left=0,top=0");
mapWin = window.open(url_base + url,"mapWin","toolbar=no,location=no,directories=no,status=yes,menubar=no,scrollbars=yes,resizable=yes,width=" + sizeX + ",height=" + sizeY + ",left=0,top=0");
mapWin.focus();
}