diff --git a/.classpath b/.classpath
index f90d8a5..9ca42e7 100644
--- a/.classpath
+++ b/.classpath
@@ -29,8 +29,8 @@
-
-
+
+
diff --git a/src/main/java/geoinfo/admins/main/MainController.java b/src/main/java/geoinfo/admins/main/MainController.java
index f51a912..8577397 100644
--- a/src/main/java/geoinfo/admins/main/MainController.java
+++ b/src/main/java/geoinfo/admins/main/MainController.java
@@ -103,8 +103,15 @@ public class MainController {
params.put("id", id);
params.put("ipAdd", ipAdd);
- String strAccessAllows = "[" + "{\"ip\":\"218.49.16.78\", \"id\":\"admin_user\"}, " + "{\"ip\":\"0:0:0:0:0:0:0:1\", \"id\":\"admin_user\"}, "+
- "{\"ip\":\"218.49.21.65\",\"id\":\"admin_user\"}, " + "{\"ip\":\"218.49.21.65\",\"id\":\"sogone\"}, " + "{\"ip\":\"218.232.234.161\",\"id\":\"admin_user\"} " +"]";
+/*
+ String strAccessAllows =
+ "[" +
+ "{\"ip\":\"218.49.16.78\", \"id\":\"admin_user\"}, " +
+ "{\"ip\":\"0:0:0:0:0:0:0:1\", \"id\":\"admin_user\"}, "+
+ "{\"ip\":\"218.49.21.65\",\"id\":\"admin_user\"}, " +
+ "{\"ip\":\"218.49.21.65\",\"id\":\"sogone\"}, " +
+ "{\"ip\":\"218.232.234.161\",\"id\":\"admin_user\"} " +
+ "]";
JSONArray jsonArray = new JSONArray(strAccessAllows);
@@ -120,7 +127,6 @@ public class MainController {
isAuth = false;
}
}
-
if (isAuth) {
String encryptChk = mainService.encryptChk(params);
@@ -147,6 +153,45 @@ public class MainController {
mainService.insertAccessLog(params);
}
}
+*/
+ String[] allowIp = {"0:0:0:0:0:0:0:1", "218.49.16.78", "218.49.21.65", "218.232.234.161"};
+ boolean isAuth = false;
+ boolean encryptChange = true;
+ boolean loginSuccess = false;
+
+ String encryptChk = mainService.encryptChk(params);
+
+ if (encryptChk == null || ("").equals(encryptChk)) {
+ encryptChange = false;
+ }
+
+ if (encryptChange) {
+ params.put("pw", admin_passwd);
+ } else {
+ params.put("pw", admin_pass);
+ }
+
+ EgovMap getMemberInfo = mainService.getMemberInfo(params);
+
+ if (getMemberInfo != null) {
+ if(getMemberInfo.get("cls").toString().equals("9")) {
+ for(String ip : allowIp) {
+ if(ip.equals(ipAdd)) {
+ isAuth = true;
+ }
+ }
+ if(isAuth) {
+ loginSuccess = true;
+ UserInfo.setSession(request, id.trim(), getMemberInfo.get("userName").toString(), "", "admin");
+
+ if (!encryptChange) {
+ params.put("pw", admin_passwd);
+ mainService.updateEncrypt(params);
+ }
+ mainService.insertAccessLog(params);
+ }
+ }
+ }
HashMap jsonMap = new HashMap();
jsonMap.put("isAuth", isAuth);
diff --git a/src/main/java/geoinfo/admins/manager/AdminInfoMngController.java b/src/main/java/geoinfo/admins/manager/AdminInfoMngController.java
index e695915..f16472e 100644
--- a/src/main/java/geoinfo/admins/manager/AdminInfoMngController.java
+++ b/src/main/java/geoinfo/admins/manager/AdminInfoMngController.java
@@ -41,14 +41,21 @@ public class AdminInfoMngController {
} else {
int affectRow = 0;
- params.put("id", "admin_user");
+ //params.put("id", "admin_user");
EgovMap result = masterService.getMember(params);
try {
- if (result != null) {
- affectRow = 1;
- masterService.updateInfo(params);
+ if (result == null) {
+ affectRow = -1;
+ }else if (result != null) {
+ String dbpw = result.get("passwd").toString();
+ String inputpw = params.get("old_pass").toString();
+ boolean pwFlag = dbpw.equals(inputpw);
+ if(pwFlag) {
+ affectRow = 1;
+ masterService.updateInfo(params);
+ }
}
jsonMap.put("affectRow", affectRow);
diff --git a/src/main/resources/geoinfo/sqlmap/mappers/admins/main/Login_SQL.xml b/src/main/resources/geoinfo/sqlmap/mappers/admins/main/Login_SQL.xml
index 283ee38..eca19d6 100644
--- a/src/main/resources/geoinfo/sqlmap/mappers/admins/main/Login_SQL.xml
+++ b/src/main/resources/geoinfo/sqlmap/mappers/admins/main/Login_SQL.xml
@@ -15,7 +15,8 @@
diff --git a/src/main/webapp/WEB-INF/views/admins/manager/00.jsp b/src/main/webapp/WEB-INF/views/admins/manager/00.jsp
index 05386da..1712b95 100644
--- a/src/main/webapp/WEB-INF/views/admins/manager/00.jsp
+++ b/src/main/webapp/WEB-INF/views/admins/manager/00.jsp
@@ -13,6 +13,12 @@