Merge pull request #376 from experdb/develop

Develop

Author: swbyun

eXperDB-Management-Agent/src/main/java/com/k4m/dx/tcontrol/server/DxT040.java

@@ -58,6 +58,7 @@ public class DxT040 extends SocketCtl{
 								, "du -s $PGLOG" //PG_LOG 용량	
 								, "ls $PGALOG | wc -l"
 								, "ls $PGLOG | wc -l"
+								, " psql -t -c \"select setting from pg_settings where name = 'max_wal_size'\"" 
 							   };
 
 	public DxT040(Socket socket, BufferedInputStream is, BufferedOutputStream	os) {
@@ -93,6 +94,7 @@ public void execute(String strDxExCode, JSONObject jObj) throws Exception {
 		String pgalog_cnt;
 		String log_cnt="";
 
+		String max_wal_size="";
 
 		byte[] sendBuff = null;
 
@@ -115,8 +117,13 @@ public void execute(String strDxExCode, JSONObject jObj) throws Exception {
 			resultHP.put(ProtocolID.PGWAL_CNT, pgwal_cnt);	
 
 			wal_keep_segments = util.getPidExec(arrCmd[4]);
-			resultHP.put(ProtocolID.WAL_KEEP_SEGMENTS, wal_keep_segments);
-			
+			if(wal_keep_segments.trim().equals("0")) {
+				max_wal_size = util.getPidExec(arrCmd[14]);
+				resultHP.put(ProtocolID.WAL_KEEP_SEGMENTS, 0);
+				resultHP.put(ProtocolID.MAX_WAL_SIZE, max_wal_size);
+			}else {
+				resultHP.put(ProtocolID.WAL_KEEP_SEGMENTS, wal_keep_segments);
+			}
 
 			pgalog_path = util.getPidExec(arrCmd[5]);
 			resultHP.put(ProtocolID.PGALOG_PATH, pgalog_path);
@@ -149,6 +156,8 @@ public void execute(String strDxExCode, JSONObject jObj) throws Exception {
 			log_cnt = util.getPidExec(arrCmd[13]);
 			resultHP.put(ProtocolID.LOG_CNT, log_cnt);	
 
+						
+			
 			setShowData(serverInfoObj, resultHP);
 
 

eXperDB-Management-Agent/src/main/java/com/k4m/dx/tcontrol/socket/ProtocolID.java

@@ -275,6 +275,7 @@ public class ProtocolID {
 	public static final String PGDBAK_PATH = "PGDBAK_PATH";
 	public static final String PGWAL_PATH = "PGWAL_PATH";
 	public static final String WAL_KEEP_SEGMENTS = "WAL_KEEP_SEGMENTS";
+	public static final String MAX_WAL_SIZE = "MAX_WAL_SIZE";
 	public static final String BACKUP_PATH = "BACKUP_PATH";
 	public static final String BACKUP_MOUNT = "BACKUP_MOUNT";
 	public static final String BACKUP_V = "BACKUP_V";

eXperDB-Management-WebConsole/pom.xml

@@ -5,7 +5,7 @@
    <groupId>com.k4m</groupId> 
    <artifactId>eXperDB-Management-WebConsole</artifactId>
    <packaging>war</packaging>
-   <version>v15.0.4</version>
+   <version>v15.1.0</version>
    <name>eXperDB-Management-WebConsole</name>
    <url>http://www.egovframe.go.kr</url>
 

eXperDB-Management-WebConsole/src/main/java/com/k4m/dx/tcontrol/admin/usermanager/service/UserManagerService.java

@@ -97,4 +97,11 @@ public interface UserManagerService {
 
 	public void updateEncUserPw(Map<String, Object> param) throws Exception;
 
+	/**
+	 * 사용자 유저 사용유무 n
+	 * @param string
+	 * @throws Exception
+	 */
+	public void updateUserUseyn(String usr_id)throws Exception;
+	
 }

eXperDB-Management-WebConsole/src/main/java/com/k4m/dx/tcontrol/admin/usermanager/service/impl/UserManagerDAO.java

@@ -152,6 +152,17 @@ public void updateEncUserPw(Map<String, Object> param) throws SQLException {
 		update("userManagerSql.updateEncUserPw", param);
 
 	}
+	
+	
+	/**
+	 * 사용자 사용유무 변경
+	 * 
+	 * @param string
+	 * @throws SQLException
+	 */
+	public void updateUserUseyn(String string) throws SQLException {
+		update("userManagerSql.updateUserUseyn", string);
+	}
 
 
 }

eXperDB-Management-WebConsole/src/main/java/com/k4m/dx/tcontrol/admin/usermanager/service/impl/UserManagerServiceImpl.java

@@ -73,7 +73,12 @@ public void updateUserPw(UserVO userVo) throws Exception {
 	public void updateEncUserPw(Map<String, Object> param) throws Exception{
 		userManagerDAO.updateEncUserPw(param);
 	}
-
+	
+	@Override
+	public void updateUserUseyn(String usr_id) throws Exception {
+		userManagerDAO.updateUserUseyn(usr_id);
+		
+	}
 
 
 }

eXperDB-Management-WebConsole/src/main/java/com/k4m/dx/tcontrol/cmmn/WebConsoleSetting.java

@@ -15,7 +15,7 @@ public class WebConsoleSetting {
 
 	public static void main(String[] args) throws Exception {
 		String strLanguage ="";
-		String strVersion ="eXperDB-Management-WebConsole-15.0.4";
+		String strVersion ="eXperDB-Management-WebConsole-15.1.0";
 
 		String strDatabaseIp = "";
 		String strDatabasePort = "";

eXperDB-Management-WebConsole/src/main/java/com/k4m/dx/tcontrol/cmmn_web/ErrorSettingController.java

@@ -0,0 +1,50 @@
+package com.k4m.dx.tcontrol.cmmn_web;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+@Controller
+public class ErrorSettingController {
+
+	
+	@RequestMapping(value = "/error/400")
+	public ModelAndView error400(HttpServletRequest request, ModelMap model) throws Exception {
+		ModelAndView mv = new ModelAndView();
+		mv.setViewName("error/400Error");
+		return mv;	
+	}
+	
+	@RequestMapping(value = "/error/401")
+	public ModelAndView error401(HttpServletRequest request, ModelMap model) throws Exception {
+		ModelAndView mv = new ModelAndView();
+		mv.setViewName("error/401Error");
+		return mv;
+	}
+	
+	@RequestMapping(value = "/error/403")
+	public ModelAndView error403(HttpServletRequest request, ModelMap model) throws Exception {
+		ModelAndView mv = new ModelAndView();
+		mv.setViewName("error/403Error");
+		return mv;	
+	}
+	
+	@RequestMapping(value = "/error/404")
+	public ModelAndView error404(HttpServletRequest request, ModelMap model) throws Exception {
+		ModelAndView mv = new ModelAndView();
+		mv.setViewName("error/404Error");
+		return mv;	
+	}
+	
+	@RequestMapping(value = "/error/500")
+	public ModelAndView error500(HttpServletRequest request, ModelMap model) throws Exception {
+		ModelAndView mv = new ModelAndView();
+		mv.setViewName("error/500Error");
+		return mv;	
+	}
+	
+
+}

eXperDB-Management-WebConsole/src/main/java/com/k4m/dx/tcontrol/encrypt/service/call/BackupServiceCall.java

@@ -176,7 +176,7 @@ public JSONObject validateBackupFile(MultipartFile mFile, HashMap<String, Object
 			return result;
 		}
 
-		if(!header.ContainsPolicy() && (boolean) param.get("chkKey")){
+		if(!header.ContainsPolicy() && (boolean) param.get("chkPolicy")){
 			System.out.println("not contains policy in file");
 			result.put("RESULT_CODE", SystemCode.ResultCode.ITEM_NOT_FOUND_ERROR);
 			result.put("RESULT_MESSAGE", "The backup file does not contain the policy data");
@@ -190,7 +190,7 @@ public JSONObject validateBackupFile(MultipartFile mFile, HashMap<String, Object
 			return result;
 		}
 
-		if(!header.ContainsBackupLog() && (boolean) param.get("chkConfig")){
+		if(!header.ContainsConfig() && (boolean) param.get("chkConfig")){
 			System.out.println("not contains config info in file");
 			result.put("RESULT_CODE", SystemCode.ResultCode.ITEM_NOT_FOUND_ERROR);
 			result.put("RESULT_MESSAGE", "The backup file does not contain the config data");

eXperDB-Management-WebConsole/src/main/java/com/k4m/dx/tcontrol/encrypt/service/call/SecurityPolicyServiceCall.java

@@ -323,6 +323,7 @@ public JSONObject selectProfileProtectionContents(String lang, String restIp, in
 					System.out.println(" offset : " + profileCipherSpec.getOffset());
 					System.out.println(" length : " + profileCipherSpec.getLength());
 					System.out.println(" binUid : " + profileCipherSpec.getBinUid());
+					jsonObj.put("rownum", i+1);
 					jsonObj.put("specIndex", profileCipherSpec.getSpecIndex());
 					jsonObj.put("profileUid", profileCipherSpec.getProfileUid());
 					jsonObj.put("CipherAlgorithmCode", profileCipherSpec.getCipherAlgorithmCode());
@@ -476,6 +477,7 @@ public JSONObject selectProfileProtectionContents(String lang, String restIp, in
 						}
 					}
 
+					jsonObj.put("no", i+1);
 					jsonObj.put("specName", new String(profileAclSpec.getSpecName().getBytes("iso-8859-1"),"UTF-8"));  
 					if(profileAclSpec.getServerInstanceId() != null){
 						jsonObj.put("serverInstanceId", new String(profileAclSpec.getServerInstanceId().getBytes("iso-8859-1"),"UTF-8"));