diff --git a/.classpath b/.classpath
index b8e015c85..b9688176e 100644
--- a/.classpath
+++ b/.classpath
@@ -22,12 +22,16 @@
-
+
-
+
+
+
+
+
diff --git a/.project b/.project
index 79812e211..fe32f5dbf 100644
--- a/.project
+++ b/.project
@@ -30,18 +30,24 @@
+
+ com.genuitec.eclipse.ast.deploy.core.DeploymentBuilder
+
+
+
org.eclipse.m2e.core.maven2Builder
- com.genuitec.eclipse.ast.deploy.core.DeploymentBuilder
+ com.genuitec.eclipse.springframework.springbuilder
+ com.genuitec.eclipse.springframework.springnature
org.eclipse.jem.workbench.JavaEMFNature
org.eclipse.wst.common.modulecore.ModuleCoreNature
org.eclipse.jdt.core.javanature
diff --git a/.settings/com.genuitec.eclipse.j2eedt.core.prefs b/.settings/com.genuitec.eclipse.j2eedt.core.prefs
index 4d10217a9..6819d3c4d 100644
--- a/.settings/com.genuitec.eclipse.j2eedt.core.prefs
+++ b/.settings/com.genuitec.eclipse.j2eedt.core.prefs
@@ -1,2 +1,2 @@
-defaultTldInfo=f\=http\://java.sun.com/jsf/core;http\://java.sun.com/jsf/html\=h;http\://struts.apache.org/tags-bean\=bean;http\://java.sun.com/jsp/jstl/fmt\=fmt;nested\=http\://struts.apache.org/tags-nested;bean\=http\://struts.apache.org/tags-bean;http\://java.sun.com/jsp/jstl/sql\=sql;c\=http\://java.sun.com/jsp/jstl/core;fmt\=http\://java.sun.com/jsp/jstl/fmt;http\://struts.apache.org/tags-logic\=logic;http\://java.sun.com/jsp/jstl/xml\=x;http\://java.sun.com/jsp/jstl/core\=c;logic\=http\://struts.apache.org/tags-logic;h\=http\://java.sun.com/jsf/html;http\://struts.apache.org/tags-tiles\=tiles;http\://java.sun.com/jsp/jstl/functions\=fn;tiles\=http\://struts.apache.org/tags-tiles;sql\=http\://java.sun.com/jsp/jstl/sql;http\://struts.apache.org/tags-html\=html;http\://struts.apache.org/tags-nested\=nested;html\=http\://struts.apache.org/tags-html;http\://java.sun.com/jsf/core\=f;fn\=http\://java.sun.com/jsp/jstl/functions;x\=http\://java.sun.com/jsp/jstl/xml
+defaultTldInfo=f\=http\://java.sun.com/jsf/core;http\://java.sun.com/jsf/html\=h;http\://struts.apache.org/tags-bean\=bean;http\://java.sun.com/jsp/jstl/fmt\=fmt;bean\=http\://struts.apache.org/tags-bean;nested\=http\://struts.apache.org/tags-nested;http\://java.sun.com/jsp/jstl/sql\=sql;c\=http\://java.sun.com/jsp/jstl/core;fmt\=http\://java.sun.com/jsp/jstl/fmt;http\://struts.apache.org/tags-logic\=logic;http\://java.sun.com/jsp/jstl/xml\=x;http\://java.sun.com/jsp/jstl/core\=c;logic\=http\://struts.apache.org/tags-logic;h\=http\://java.sun.com/jsf/html;http\://struts.apache.org/tags-tiles\=tiles;http\://java.sun.com/jsp/jstl/functions\=fn;tiles\=http\://struts.apache.org/tags-tiles;sql\=http\://java.sun.com/jsp/jstl/sql;http\://struts.apache.org/tags-html\=html;html\=http\://struts.apache.org/tags-html;http\://struts.apache.org/tags-nested\=nested;http\://java.sun.com/jsf/core\=f;fn\=http\://java.sun.com/jsp/jstl/functions;x\=http\://java.sun.com/jsp/jstl/xml
eclipse.preferences.version=1
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 4531ab9cc..b1d4da759 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -11,4 +11,3 @@ encoding//src/main/webapp/WEB-INF/tlds/fns.tld=UTF-8
encoding//src/main/webapp/WEB-INF/views/letter/process/errorView.jsp=UTF-8
encoding//src/main/webapp/static/common/jeesite.css=UTF-8
encoding//src/test/java=UTF-8
-encoding/=UTF-8
diff --git a/.settings/org.eclipse.m2e.wtp.prefs b/.settings/org.eclipse.m2e.wtp.prefs
new file mode 100644
index 000000000..0492759d7
--- /dev/null
+++ b/.settings/org.eclipse.m2e.wtp.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.m2e.wtp.enabledProjectSpecificPrefs=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 9b367ac5f..dbec03a4c 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,10 +1,10 @@
-
+
-
+
diff --git a/pom.xml b/pom.xml
index 18dae5f4b..fa978d4b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,9 +14,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
war
- gk
+ gwall
com.nis.springmvc
- gk
+ gwall
0.0.1-SNAPSHOT
diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java
index 6f62a478f..b9701e495 100644
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -26,6 +26,14 @@ import com.nis.web.service.OfficeService;
import com.nis.web.service.RoleService;
import com.nis.web.service.SystemService;
import com.nis.web.service.UserService;
+import com.nis.web.service.configuration.AppCfgService;
+import com.nis.web.service.configuration.FtpCfgService;
+import com.nis.web.service.configuration.IpCfgService;
+import com.nis.web.service.configuration.MailCfgService;
+import com.nis.web.service.configuration.MediaCfgService;
+import com.nis.web.service.configuration.SslCfgService;
+import com.nis.web.service.configuration.TunnelCfgService;
+import com.nis.web.service.configuration.WebCfgService;
public class BaseController {
@@ -56,6 +64,29 @@ public class BaseController {
@Autowired
protected DictService dictService;
+ @Autowired
+ protected IpCfgService ipCfgService;
+
+ @Autowired
+ protected WebCfgService webCfgService;
+
+ @Autowired
+ protected MailCfgService mailCfgService;
+
+ @Autowired
+ protected FtpCfgService ftpCfgService;
+
+ @Autowired
+ protected TunnelCfgService tunnCfgService;
+
+ @Autowired
+ protected SslCfgService sslCfgService;
+
+ @Autowired
+ protected MediaCfgService mediaCfgService;
+
+ @Autowired
+ protected AppCfgService appCfgService;
protected final Logger logger = Logger.getLogger(this.getClass());
diff --git a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java
new file mode 100644
index 000000000..79eaa7215
--- /dev/null
+++ b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java
@@ -0,0 +1,13 @@
+package com.nis.web.controller.configuration;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * 特定协议相关配置控制类
+ * @author dell
+ *
+ */
+@Controller
+public class AppCfgController {
+
+}
diff --git a/src/main/java/com/nis/web/controller/configuration/FtpCfgController.java b/src/main/java/com/nis/web/controller/configuration/FtpCfgController.java
new file mode 100644
index 000000000..220bf9f66
--- /dev/null
+++ b/src/main/java/com/nis/web/controller/configuration/FtpCfgController.java
@@ -0,0 +1,13 @@
+package com.nis.web.controller.configuration;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * FTP相关配置控制类
+ * @author dell
+ *
+ */
+@Controller
+public class FtpCfgController {
+
+}
diff --git a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java
new file mode 100644
index 000000000..1fca05138
--- /dev/null
+++ b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java
@@ -0,0 +1,13 @@
+package com.nis.web.controller.configuration;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * IP相关配置控制类
+ * @author dell
+ *
+ */
+@Controller
+public class IpCfgController {
+
+}
diff --git a/src/main/java/com/nis/web/controller/configuration/MailCfgController.java b/src/main/java/com/nis/web/controller/configuration/MailCfgController.java
new file mode 100644
index 000000000..a7920e3f8
--- /dev/null
+++ b/src/main/java/com/nis/web/controller/configuration/MailCfgController.java
@@ -0,0 +1,13 @@
+package com.nis.web.controller.configuration;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * 邮件相关配置控制类
+ * @author dell
+ *
+ */
+@Controller
+public class MailCfgController {
+
+}
diff --git a/src/main/java/com/nis/web/controller/configuration/MediaCfgController.java b/src/main/java/com/nis/web/controller/configuration/MediaCfgController.java
new file mode 100644
index 000000000..afe53d6af
--- /dev/null
+++ b/src/main/java/com/nis/web/controller/configuration/MediaCfgController.java
@@ -0,0 +1,13 @@
+package com.nis.web.controller.configuration;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * 在线媒体相关配置控制类
+ * @author dell
+ *
+ */
+@Controller
+public class MediaCfgController {
+
+}
diff --git a/src/main/java/com/nis/web/controller/configuration/SslCfgController.java b/src/main/java/com/nis/web/controller/configuration/SslCfgController.java
new file mode 100644
index 000000000..12364d836
--- /dev/null
+++ b/src/main/java/com/nis/web/controller/configuration/SslCfgController.java
@@ -0,0 +1,13 @@
+package com.nis.web.controller.configuration;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * 证书相关配置控制类
+ * @author dell
+ *
+ */
+@Controller
+public class SslCfgController {
+
+}
diff --git a/src/main/java/com/nis/web/controller/configuration/TunnelCfgController.java b/src/main/java/com/nis/web/controller/configuration/TunnelCfgController.java
new file mode 100644
index 000000000..c19151c15
--- /dev/null
+++ b/src/main/java/com/nis/web/controller/configuration/TunnelCfgController.java
@@ -0,0 +1,20 @@
+package com.nis.web.controller.configuration;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * 隧道协议相关配置控制类
+ * @author dell
+ *
+ */
+@Controller
+public class TunnelCfgController {
+
+ /**
+ *
+ * @return
+ */
+ public String l2tpList(){
+ return "/configuration/tunnel/l2tpList";
+ }
+}
diff --git a/src/main/java/com/nis/web/controller/configuration/WebCfgController.java b/src/main/java/com/nis/web/controller/configuration/WebCfgController.java
new file mode 100644
index 000000000..d0197e24e
--- /dev/null
+++ b/src/main/java/com/nis/web/controller/configuration/WebCfgController.java
@@ -0,0 +1,13 @@
+package com.nis.web.controller.configuration;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * WEB相关配置控制类
+ * @author dell
+ *
+ */
+@Controller
+public class WebCfgController {
+
+}
diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java
new file mode 100644
index 000000000..b5e4bdb38
--- /dev/null
+++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java
@@ -0,0 +1,11 @@
+package com.nis.web.dao.configuration;
+
+
+/**
+ * 特定协议相关配置数据处理类
+ * @author dell
+ *
+ */
+public class AppCfgDao {
+
+}
diff --git a/src/main/java/com/nis/web/dao/configuration/FtpCfgDao.java b/src/main/java/com/nis/web/dao/configuration/FtpCfgDao.java
new file mode 100644
index 000000000..c6e1f1c64
--- /dev/null
+++ b/src/main/java/com/nis/web/dao/configuration/FtpCfgDao.java
@@ -0,0 +1,11 @@
+package com.nis.web.dao.configuration;
+
+
+/**
+ * FTP相关配置数据处理类
+ * @author dell
+ *
+ */
+public class FtpCfgDao {
+
+}
diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java
new file mode 100644
index 000000000..296b047b8
--- /dev/null
+++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java
@@ -0,0 +1,11 @@
+package com.nis.web.dao.configuration;
+
+
+/**
+ * IP相关配置数据处理类
+ * @author dell
+ *
+ */
+public class IpCfgDao {
+
+}
diff --git a/src/main/java/com/nis/web/dao/configuration/MailCfgDao.java b/src/main/java/com/nis/web/dao/configuration/MailCfgDao.java
new file mode 100644
index 000000000..9550cb3f7
--- /dev/null
+++ b/src/main/java/com/nis/web/dao/configuration/MailCfgDao.java
@@ -0,0 +1,11 @@
+package com.nis.web.dao.configuration;
+
+
+/**
+ * 邮件相关配置数据处理类
+ * @author dell
+ *
+ */
+public class MailCfgDao {
+
+}
diff --git a/src/main/java/com/nis/web/dao/configuration/MediaCfgDao.java b/src/main/java/com/nis/web/dao/configuration/MediaCfgDao.java
new file mode 100644
index 000000000..d961428a5
--- /dev/null
+++ b/src/main/java/com/nis/web/dao/configuration/MediaCfgDao.java
@@ -0,0 +1,11 @@
+package com.nis.web.dao.configuration;
+
+
+/**
+ * 在线媒体相关配置数据处理类
+ * @author dell
+ *
+ */
+public class MediaCfgDao {
+
+}
diff --git a/src/main/java/com/nis/web/dao/configuration/SslCfgDao.java b/src/main/java/com/nis/web/dao/configuration/SslCfgDao.java
new file mode 100644
index 000000000..2b3e26c2b
--- /dev/null
+++ b/src/main/java/com/nis/web/dao/configuration/SslCfgDao.java
@@ -0,0 +1,11 @@
+package com.nis.web.dao.configuration;
+
+
+/**
+ * 证书相关配置数据处理类
+ * @author dell
+ *
+ */
+public class SslCfgDao {
+
+}
diff --git a/src/main/java/com/nis/web/dao/configuration/TunnelCfgDao.java b/src/main/java/com/nis/web/dao/configuration/TunnelCfgDao.java
new file mode 100644
index 000000000..227ae5a36
--- /dev/null
+++ b/src/main/java/com/nis/web/dao/configuration/TunnelCfgDao.java
@@ -0,0 +1,20 @@
+package com.nis.web.dao.configuration;
+
+import java.util.List;
+
+
+/**
+ * 隧道协议相关配置数据处理类
+ * @author dell
+ *
+ */
+public class TunnelCfgDao {
+
+ /**
+ *
+ * @return
+ */
+ public List getL2tpList(){
+ return null;
+ }
+}
diff --git a/src/main/java/com/nis/web/dao/configuration/WebCfgDao.java b/src/main/java/com/nis/web/dao/configuration/WebCfgDao.java
new file mode 100644
index 000000000..a40200c31
--- /dev/null
+++ b/src/main/java/com/nis/web/dao/configuration/WebCfgDao.java
@@ -0,0 +1,11 @@
+package com.nis.web.dao.configuration;
+
+
+/**
+ * WEB相关配置数据处理类
+ * @author dell
+ *
+ */
+public class WebCfgDao {
+
+}
diff --git a/src/main/java/com/nis/web/service/configuration/AppCfgService.java b/src/main/java/com/nis/web/service/configuration/AppCfgService.java
new file mode 100644
index 000000000..20577d6a9
--- /dev/null
+++ b/src/main/java/com/nis/web/service/configuration/AppCfgService.java
@@ -0,0 +1,13 @@
+package com.nis.web.service.configuration;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * 特定协议相关配置事务类
+ * @author dell
+ *
+ */
+@Service
+public class AppCfgService {
+
+}
diff --git a/src/main/java/com/nis/web/service/configuration/FtpCfgService.java b/src/main/java/com/nis/web/service/configuration/FtpCfgService.java
new file mode 100644
index 000000000..f4ad1d99a
--- /dev/null
+++ b/src/main/java/com/nis/web/service/configuration/FtpCfgService.java
@@ -0,0 +1,13 @@
+package com.nis.web.service.configuration;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * FTP相关配置事务类
+ * @author dell
+ *
+ */
+@Service
+public class FtpCfgService {
+
+}
diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
new file mode 100644
index 000000000..609f50b49
--- /dev/null
+++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
@@ -0,0 +1,13 @@
+package com.nis.web.service.configuration;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * IP相关配置事务类
+ * @author dell
+ *
+ */
+@Service
+public class IpCfgService {
+
+}
diff --git a/src/main/java/com/nis/web/service/configuration/MailCfgService.java b/src/main/java/com/nis/web/service/configuration/MailCfgService.java
new file mode 100644
index 000000000..9eca64848
--- /dev/null
+++ b/src/main/java/com/nis/web/service/configuration/MailCfgService.java
@@ -0,0 +1,13 @@
+package com.nis.web.service.configuration;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * 邮件相关配置事务类
+ * @author dell
+ *
+ */
+@Service
+public class MailCfgService {
+
+}
diff --git a/src/main/java/com/nis/web/service/configuration/MediaCfgService.java b/src/main/java/com/nis/web/service/configuration/MediaCfgService.java
new file mode 100644
index 000000000..53f0491bb
--- /dev/null
+++ b/src/main/java/com/nis/web/service/configuration/MediaCfgService.java
@@ -0,0 +1,13 @@
+package com.nis.web.service.configuration;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * 在线媒体相关配置事务类
+ * @author dell
+ *
+ */
+@Service
+public class MediaCfgService {
+
+}
diff --git a/src/main/java/com/nis/web/service/configuration/SslCfgService.java b/src/main/java/com/nis/web/service/configuration/SslCfgService.java
new file mode 100644
index 000000000..60ca347ed
--- /dev/null
+++ b/src/main/java/com/nis/web/service/configuration/SslCfgService.java
@@ -0,0 +1,13 @@
+package com.nis.web.service.configuration;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * 证书相关配置事务类
+ * @author dell
+ *
+ */
+@Service
+public class SslCfgService {
+
+}
diff --git a/src/main/java/com/nis/web/service/configuration/TunnelCfgService.java b/src/main/java/com/nis/web/service/configuration/TunnelCfgService.java
new file mode 100644
index 000000000..997c46d94
--- /dev/null
+++ b/src/main/java/com/nis/web/service/configuration/TunnelCfgService.java
@@ -0,0 +1,19 @@
+package com.nis.web.service.configuration;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * 隧道协议相关配置事务类
+ * @author dell
+ *
+ */
+@Service
+public class TunnelCfgService {
+
+ public List getL2tpList(){
+
+ return null;
+ }
+}
diff --git a/src/main/java/com/nis/web/service/configuration/WebCfgService.java b/src/main/java/com/nis/web/service/configuration/WebCfgService.java
new file mode 100644
index 000000000..8a5440242
--- /dev/null
+++ b/src/main/java/com/nis/web/service/configuration/WebCfgService.java
@@ -0,0 +1,13 @@
+package com.nis.web.service.configuration;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * WEB相关配置事务类
+ * @author dell
+ *
+ */
+@Service
+public class WebCfgService {
+
+}
diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties
index 17006d37a..f017d30a7 100644
--- a/src/main/resources/jdbc.properties
+++ b/src/main/resources/jdbc.properties
@@ -15,35 +15,35 @@ jdbc.product.username=gk_pz
jdbc.product.key=3X3ZBejyxS7lkVsHVm9KTw==
jdbc.product.password=sHqDBZIUS0hYZCbC+1xN3A==
-jdbc.log.driver=oracle.jdbc.driver.OracleDriver
-jdbc.log.url=jdbc:oracle:thin:@10.0.6.212:1523:app
-#jdbc.log.url=jdbc:oracle:thin:@10.174.196.22:1521:orcl
-jdbc.log.username=gk_log
-#jdbc.log.username=z2_5x9logb
-jdbc.log.key=pHl+0udycGQWNZcN68Sv9A==
-jdbc.log.password=Z/pVMDXcWNxzVGAX0yRp3Q==
-
-jdbc.logA.driver=oracle.jdbc.driver.OracleDriver
-#jdbc.logA.url=jdbc:oracle:thin:@10.0.6.212:1523:app
-jdbc.logA.url=jdbc:oracle:thin:@10.174.196.21:1521:orcl
-#jdbc.logA.username=gk_log_a
-jdbc.logA.username=z2_5x9loga
-jdbc.logA.key=SXHfLUwzPw0cQEc1wzwM4w==
-jdbc.logA.password=auvtDoVZpGP6P4OqfBrWAg==
-
-jdbc.logC.driver=oracle.jdbc.driver.OracleDriver
-jdbc.logC.url=jdbc:oracle:thin:@10.0.6.212:1523:app
-jdbc.logC.username=gk_log_c
-jdbc.logC.key=MvwfUIYP0nLyiQeprHB/5A==
-jdbc.logC.password=3HXvsqpbOoNBIkHDS5c9Aw==
-
-jdbc.jk.driver=oracle.jdbc.driver.OracleDriver
-jdbc.jk.url=jdbc:oracle:thin:@10.0.6.212:1523:app
-#jdbc.jk.url=jdbc:oracle:thin:@10.174.196.20:1521:orcl
-jdbc.jk.username=gk_jk
-#jdbc.jk.username=z2_5x9jk
-jdbc.jk.key=+FaavsHgQ0qBSebsAoochw==
-jdbc.jk.password=wBrNar7gX/iQR7IyCSHuSg==
+#jdbc.log.driver=oracle.jdbc.driver.OracleDriver
+#jdbc.log.url=jdbc:oracle:thin:@10.0.6.212:1523:app
+##jdbc.log.url=jdbc:oracle:thin:@10.174.196.22:1521:orcl
+#jdbc.log.username=gk_log
+##jdbc.log.username=z2_5x9logb
+#jdbc.log.key=pHl+0udycGQWNZcN68Sv9A==
+#jdbc.log.password=Z/pVMDXcWNxzVGAX0yRp3Q==
+#
+#jdbc.logA.driver=oracle.jdbc.driver.OracleDriver
+##jdbc.logA.url=jdbc:oracle:thin:@10.0.6.212:1523:app
+#jdbc.logA.url=jdbc:oracle:thin:@10.174.196.21:1521:orcl
+##jdbc.logA.username=gk_log_a
+#jdbc.logA.username=z2_5x9loga
+#jdbc.logA.key=SXHfLUwzPw0cQEc1wzwM4w==
+#jdbc.logA.password=auvtDoVZpGP6P4OqfBrWAg==
+#
+#jdbc.logC.driver=oracle.jdbc.driver.OracleDriver
+#jdbc.logC.url=jdbc:oracle:thin:@10.0.6.212:1523:app
+#jdbc.logC.username=gk_log_c
+#jdbc.logC.key=MvwfUIYP0nLyiQeprHB/5A==
+#jdbc.logC.password=3HXvsqpbOoNBIkHDS5c9Aw==
+#
+#jdbc.jk.driver=oracle.jdbc.driver.OracleDriver
+#jdbc.jk.url=jdbc:oracle:thin:@10.0.6.212:1523:app
+##jdbc.jk.url=jdbc:oracle:thin:@10.174.196.20:1521:orcl
+#jdbc.jk.username=gk_jk
+##jdbc.jk.username=z2_5x9jk
+#jdbc.jk.key=+FaavsHgQ0qBSebsAoochw==
+#jdbc.jk.password=wBrNar7gX/iQR7IyCSHuSg==
@@ -58,66 +58,66 @@ bonecp.statementsCacheSize=100
############################################################################################################################################
#数据中心神通数据库接口配置
############################################################################################################################################
-bonecp.cluster.idleMaxAgeInMinutes=60
-bonecp.cluster.idleConnectionTestPeriodInMinutes=240
-bonecp.cluster.maxConnectionsPerPartition=10
-bonecp.cluster.minConnectionsPerPartition=5
-bonecp.cluster.partitionCount=3
-bonecp.cluster.acquireIncrement=5
-bonecp.cluster.statementsCacheSize=100
-
-jdbc.log.cluster.driver=com.oscar.cluster.BulkDriver
-jdbc.log.cluster.url=jdbc:oscarclusterbulk://10.3.129.125:2010/logdb
-jdbc.log.cluster.username=xa_z2_iie
-jdbc.log.cluster.key=2fa3hQn28+4AOdJXL4Ud2w==
-jdbc.log.cluster.password=uut+weC9of5ocPheagBJ4A==
+#bonecp.cluster.idleMaxAgeInMinutes=60
+#bonecp.cluster.idleConnectionTestPeriodInMinutes=240
+#bonecp.cluster.maxConnectionsPerPartition=10
+#bonecp.cluster.minConnectionsPerPartition=5
+#bonecp.cluster.partitionCount=3
+#bonecp.cluster.acquireIncrement=5
+#bonecp.cluster.statementsCacheSize=100
+#
+#jdbc.log.cluster.driver=com.oscar.cluster.BulkDriver
+#jdbc.log.cluster.url=jdbc:oscarclusterbulk://10.3.129.125:2010/logdb
+#jdbc.log.cluster.username=xa_z2_iie
+#jdbc.log.cluster.key=2fa3hQn28+4AOdJXL4Ud2w==
+#jdbc.log.cluster.password=uut+weC9of5ocPheagBJ4A==
############################################################################################################################################
#数据中心hive接口配置
############################################################################################################################################
#A版日志库
-jdbc.hiveA.driver=org.apache.hive.jdbc.HiveDriver
-jdbc.hiveA.url=jdbc:hive2://10.3.130.24:10000/default
-jdbc.hiveA.username=xa_z2_mesa
-jdbc.hiveA.key=aC/8fTC9vfPVhCk+CDzbAQ==
-#加密后密码
-#jdbc.hiveA.password=V3GyFlG8Mg01bTt8ykFVaA==
-#实际密码
-jdbc.hiveA.password=123!@#qwe
-
-
-
-
-
-#B版日志库
-jdbc.hiveB.driver=org.apache.hive.jdbc.HiveDriver
-jdbc.hiveB.url=jdbc:hive2://10.3.130.25:10000/default
-jdbc.hiveB.username=xa_z2_mesa
-jdbc.hiveB.key=aC/8fTC9vfPVhCk+CDzbAQ==
-#加密后密码
-#jdbc.hiveB.password=V3GyFlG8Mg01bTt8ykFVaA==
-#实际密码
-jdbc.hiveB.password=123!@#qwe
-
-
-bonecp.hive.idleMaxAgeInMinutes=60
-bonecp.hive.idleConnectionTestPeriodInMinutes=240
-bonecp.hive.maxConnectionsPerPartition=20
-bonecp.hive.minConnectionsPerPartition=10
-bonecp.hive.partitionCount=3
-bonecp.hive.acquireIncrement=5
-bonecp.hive.statementsCacheSize=100
-
-
-
-############################################################################################################################################
-#下面的库为测试库,测试完成后会删除
-############################################################################################################################################
-
-jdbc.test.driver=oracle.jdbc.driver.OracleDriver
-jdbc.test.url=jdbc:oracle:thin:@10.0.6.212:1523:app
-jdbc.test.username=gk_pztest
-jdbc.test.key=cV9126WUYdojQjvuKNjidw==
-jdbc.test.password=OrTu/cLwlduYPW/tmxqNgQ==
+#jdbc.hiveA.driver=org.apache.hive.jdbc.HiveDriver
+#jdbc.hiveA.url=jdbc:hive2://10.3.130.24:10000/default
+#jdbc.hiveA.username=xa_z2_mesa
+#jdbc.hiveA.key=aC/8fTC9vfPVhCk+CDzbAQ==
+##加密后密码
+##jdbc.hiveA.password=V3GyFlG8Mg01bTt8ykFVaA==
+##实际密码
+#jdbc.hiveA.password=123!@#qwe
+#
+#
+#
+#
+#
+##B版日志库
+#jdbc.hiveB.driver=org.apache.hive.jdbc.HiveDriver
+#jdbc.hiveB.url=jdbc:hive2://10.3.130.25:10000/default
+#jdbc.hiveB.username=xa_z2_mesa
+#jdbc.hiveB.key=aC/8fTC9vfPVhCk+CDzbAQ==
+##加密后密码
+##jdbc.hiveB.password=V3GyFlG8Mg01bTt8ykFVaA==
+##实际密码
+#jdbc.hiveB.password=123!@#qwe
+#
+#
+#bonecp.hive.idleMaxAgeInMinutes=60
+#bonecp.hive.idleConnectionTestPeriodInMinutes=240
+#bonecp.hive.maxConnectionsPerPartition=20
+#bonecp.hive.minConnectionsPerPartition=10
+#bonecp.hive.partitionCount=3
+#bonecp.hive.acquireIncrement=5
+#bonecp.hive.statementsCacheSize=100
+#
+#
+#
+#############################################################################################################################################
+##下面的库为测试库,测试完成后会删除
+#############################################################################################################################################
+#
+#jdbc.test.driver=oracle.jdbc.driver.OracleDriver
+#jdbc.test.url=jdbc:oracle:thin:@10.0.6.212:1523:app
+#jdbc.test.username=gk_pztest
+#jdbc.test.key=cV9126WUYdojQjvuKNjidw==
+#jdbc.test.password=OrTu/cLwlduYPW/tmxqNgQ==