diff --git a/src/main/java/com/nis/interceptor/DataSourceCInterceptor.java b/src/main/java/com/nis/interceptor/DataSourceCInterceptor.java index a05fa13..e27bb98 100644 --- a/src/main/java/com/nis/interceptor/DataSourceCInterceptor.java +++ b/src/main/java/com/nis/interceptor/DataSourceCInterceptor.java @@ -19,21 +19,21 @@ public class DataSourceCInterceptor implements HandlerInterceptor { @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { - searchActiveSys=request.getParameter("searchActiveSys"); - if(searchActiveSys == null - || !(Constants.ACTIVESYS_A.equals(searchActiveSys) - || Constants.ACTIVESYS_C.equals(searchActiveSys)) - ) searchActiveSys=Constants.ACTIVESYS_B; - if(Constants.ACTIVESYS_A.equals(searchActiveSys)){ - logger.info("开启数据源日志A操作库---"+System.currentTimeMillis()); - CustomerContextHolder.setCustomerType(CustomerContextHolder.DATA_SOURCE_F);//开启数据源F - }else if(Constants.ACTIVESYS_C.equals(searchActiveSys)){ - logger.info("开启数据源日志C操作库---"+System.currentTimeMillis()); - CustomerContextHolder.setCustomerType(CustomerContextHolder.DATA_SOURCE_G);//开启数据源F - }else{ - logger.info("开启数据源日志B操作库---"+System.currentTimeMillis()); +// searchActiveSys=request.getParameter("searchActiveSys"); +// if(searchActiveSys == null +// || !(Constants.ACTIVESYS_A.equals(searchActiveSys) +// || Constants.ACTIVESYS_C.equals(searchActiveSys)) +// ) searchActiveSys=Constants.ACTIVESYS_B; +// if(Constants.ACTIVESYS_A.equals(searchActiveSys)){ +// logger.info("开启数据源日志A操作库---"+System.currentTimeMillis()); +// CustomerContextHolder.setCustomerType(CustomerContextHolder.DATA_SOURCE_F);//开启数据源F +// }else if(Constants.ACTIVESYS_C.equals(searchActiveSys)){ +// logger.info("开启数据源日志C操作库---"+System.currentTimeMillis()); +// CustomerContextHolder.setCustomerType(CustomerContextHolder.DATA_SOURCE_G);//开启数据源F +// }else{ + logger.info("开启数据源日志操作库---"+System.currentTimeMillis()); CustomerContextHolder.setCustomerType(CustomerContextHolder.DATA_SOURCE_C);//开启数据源C - } +// } logger.info("日志数据源开启成功---"+System.currentTimeMillis()); return true; } diff --git a/src/main/java/com/nis/persistence/interceptor/SQLHelper.java b/src/main/java/com/nis/persistence/interceptor/SQLHelper.java index 851cbea..e4a772b 100644 --- a/src/main/java/com/nis/persistence/interceptor/SQLHelper.java +++ b/src/main/java/com/nis/persistence/interceptor/SQLHelper.java @@ -127,7 +127,7 @@ public class SQLHelper { } else if (dataSource.equals(CustomerContextHolder.DATA_SOURCE_B)) { return "oracle"; } else if (dataSource.equals(CustomerContextHolder.DATA_SOURCE_C)) { - return "oracle"; + return "mysql"; } else if (dataSource.equals(CustomerContextHolder.DATA_SOURCE_D)) { return "oracle"; } else if (dataSource.equals(CustomerContextHolder.DATA_SOURCE_F)) { diff --git a/src/main/java/com/nis/util/BlobTypeHandler.java b/src/main/java/com/nis/util/BlobTypeHandler.java new file mode 100644 index 0000000..50c5baa --- /dev/null +++ b/src/main/java/com/nis/util/BlobTypeHandler.java @@ -0,0 +1,111 @@ +/** + * + */ +package com.nis.util; + +import java.io.ByteArrayInputStream; +import java.io.UnsupportedEncodingException; +import java.sql.Blob; +import java.sql.CallableStatement; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + +import org.apache.ibatis.type.BaseTypeHandler; +import org.apache.ibatis.type.JdbcType; + +/** + * @ClassName:BlobTypeHandler + * @Description:TODO(这里用一句话描述这个类的作用) + * @author (zdx) + * @date 2018年6月25日 下午2:11:03 + * @version V1.0 + */ +public class BlobTypeHandler extends BaseTypeHandler { + + // ###指定字符集 + private static final String DEFAULT_CHARSET = "utf-8"; + + /* + * (non-Javadoc) + * + * @see org.apache.ibatis.type.BaseTypeHandler#setNonNullParameter(java.sql. + * PreparedStatement, int, java.lang.Object, + * org.apache.ibatis.type.JdbcType) + */ + @Override + public void setNonNullParameter(PreparedStatement ps, int i, + String parameter, JdbcType jdbcType) throws SQLException { + // TODO Auto-generated method stub + ByteArrayInputStream bis; + try { + // / ###把String转化成byte流 + bis = new ByteArrayInputStream(parameter.getBytes(DEFAULT_CHARSET)); + } catch (UnsupportedEncodingException e) { + throw new RuntimeException("Blob Encoding Error!"); + } + ps.setBinaryStream(i, bis, parameter.length()); + } + + /* + * (non-Javadoc) + * + * @see + * org.apache.ibatis.type.BaseTypeHandler#getNullableResult(java.sql.ResultSet + * , java.lang.String) + */ + @Override + public String getNullableResult(ResultSet rs, String columnName) + throws SQLException { + // TODO Auto-generated method stub + + Blob blob = rs.getBlob(columnName); + byte[] returnValue = null; + if (null != blob) { + returnValue = blob.getBytes(1, (int) blob.length()); + } + try { +// ###把byte转化成string + return new String(returnValue, DEFAULT_CHARSET); + } catch (UnsupportedEncodingException e) { + throw new RuntimeException("Blob Encoding Error!"); + } + } + + /* + * (non-Javadoc) + * + * @see + * org.apache.ibatis.type.BaseTypeHandler#getNullableResult(java.sql.ResultSet + * , int) + */ + @Override + public String getNullableResult(ResultSet rs, int columnIndex) + throws SQLException { + // TODO Auto-generated method stub + return null; + } + + /* + * (non-Javadoc) + * + * @see org.apache.ibatis.type.BaseTypeHandler#getNullableResult(java.sql. + * CallableStatement, int) + */ + @Override + public String getNullableResult(CallableStatement cs, int columnIndex) + throws SQLException { + // TODO Auto-generated method stub + Blob blob = cs.getBlob(columnIndex); + byte[] returnValue = null; + if (null != blob) { + returnValue = blob.getBytes(1, (int) blob.length()); + } + try { + return new String(returnValue, DEFAULT_CHARSET); + } catch (UnsupportedEncodingException e) { + throw new RuntimeException("Blob Encoding Error!"); + } + } + +} diff --git a/src/main/java/com/nis/web/dao/ServicesRequestLogDao.xml b/src/main/java/com/nis/web/dao/ServicesRequestLogDao.xml index 6aa5320..314e2db 100644 --- a/src/main/java/com/nis/web/dao/ServicesRequestLogDao.xml +++ b/src/main/java/com/nis/web/dao/ServicesRequestLogDao.xml @@ -7,12 +7,12 @@ - + - + @@ -90,7 +90,7 @@ insert into SERVICES_REQUEST_LOG - ID, + OPERATOR, @@ -129,7 +129,7 @@ - SEQ_SERVICES_REQUEST_LOG.Nextval, + #{operator,jdbcType=VARCHAR}, diff --git a/src/main/java/com/nis/web/service/SaveRequestLogThread.java b/src/main/java/com/nis/web/service/SaveRequestLogThread.java index 08c4fea..3fbd28e 100644 --- a/src/main/java/com/nis/web/service/SaveRequestLogThread.java +++ b/src/main/java/com/nis/web/service/SaveRequestLogThread.java @@ -123,7 +123,7 @@ public class SaveRequestLogThread implements Runnable { try { reader=request.getReader(); while((line=reader.readLine())!=null){ - bulider.append(line); + bulider.append(new String(line.getBytes(),"utf-8")); bulider.append("\n"); } } catch (IOException e) { diff --git a/src/main/resources/applicationContext-mybatis.xml b/src/main/resources/applicationContext-mybatis.xml index 9ad8c8a..f30e3ca 100644 --- a/src/main/resources/applicationContext-mybatis.xml +++ b/src/main/resources/applicationContext-mybatis.xml @@ -54,29 +54,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -99,74 +76,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -240,53 +149,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/commonSources/commonSources.xml b/src/main/resources/commonSources/commonSources.xml index 910c0e6..943a52a 100644 --- a/src/main/resources/commonSources/commonSources.xml +++ b/src/main/resources/commonSources/commonSources.xml @@ -74,7 +74,7 @@ - + diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties index a59a9d7..02e6234 100644 --- a/src/main/resources/jdbc.properties +++ b/src/main/resources/jdbc.properties @@ -6,52 +6,24 @@ jdbc.devlop.username=dfh jdbc.devlop.key=xLtQB+Bp6joOYrVIfBdrRA== jdbc.devlop.password=/+7+DgxK++ZaD1nIcRRmDg== -jdbc.product.driver=oracle.jdbc.driver.OracleDriver -#jdbc.product.url=jdbc:oracle:thin:@(DESCRIPTION =(ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.10.17)(PORT = 1521))(LOAD_BALANCE = yes)(CONNECT_DATA =(SERVICE_NAME = ORCL)(FAILOVER_MODE =(TYPE = select)(METHOD = basic)(RETRIES = 180)(DELAY = 180)))) -#jdbc.product.url=jdbc:oracle:thin:@10.0.6.212:1523:app -jdbc.product.url=jdbc:oracle:thin:@10.0.6.104:1521:orcl -#jdbc.product.url=jdbc:oracle:thin:@10.0.6.104:1521:orcl -#jdbc.product.url=jdbc:oracle:thin:@10.174.196.20:1521:orcl -#jdbc.product.username=kaz_maat -jdbc.product.username=zdx -#jdbc.product.username=dfxj_2015 -#jdbc.product.username=gk_pz -#jdbc.product.username=z2_5x9pz -jdbc.product.key=3X3ZBejyxS7lkVsHVm9KTw== -jdbc.product.password=sHqDBZIUS0hYZCbC+1xN3A== +#==========日志库 Mysql======================= +jdbc.log.driver=com.mysql.jdbc.Driver +jdbc.log.url=jdbc:mysql://10.0.6.100:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull +jdbc.log.username=dfh +jdbc.log.key=xLtQB+Bp6joOYrVIfBdrRA== +jdbc.log.password=/+7+DgxK++ZaD1nIcRRmDg== -jdbc.log.driver=oracle.jdbc.driver.OracleDriver -jdbc.log.url=jdbc:oracle:thin:@10.0.6.104:1521:orcl +#========================================== + +#==========日志库 Oracle ====================== +##jdbc.log.driver=oracle.jdbc.driver.OracleDriver +##jdbc.log.url=jdbc:oracle:thin:@10.0.6.104:1521:orcl #jdbc.log.url=jdbc:oracle:thin:@10.174.196.22:1521:orcl -jdbc.log.username=zdx +##jdbc.log.username=zdx #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.104:1521:orcl -#jdbc.logA.url=jdbc:oracle:thin:@10.174.196.21:1521:orcl -jdbc.logA.username=zdx -#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.104:1521:orcl -jdbc.logC.username=zdx -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.104:1521:orcl -#jdbc.jk.url=jdbc:oracle:thin:@10.174.196.20:1521:orcl -jdbc.jk.username=zdx -#jdbc.jk.username=z2_5x9jk -jdbc.jk.key=+FaavsHgQ0qBSebsAoochw== -jdbc.jk.password=wBrNar7gX/iQR7IyCSHuSg== - - - +##jdbc.log.key=pHl+0udycGQWNZcN68Sv9A== +##jdbc.log.password=Z/pVMDXcWNxzVGAX0yRp3Q== +#============================================ bonecp.idleMaxAgeInMinutes=60 bonecp.idleConnectionTestPeriodInMinutes=240 bonecp.maxConnectionsPerPartition=50 @@ -90,10 +62,6 @@ 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 @@ -104,7 +72,6 @@ jdbc.hiveB.password=V3GyFlG8Mg01bTt8ykFVaA== #实际密码 #jdbc.hiveB.password=123!@#qwe - bonecp.hive.idleMaxAgeInMinutes=60 bonecp.hive.idleConnectionTestPeriodInMinutes=240 bonecp.hive.maxConnectionsPerPartition=20 @@ -113,24 +80,12 @@ 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== - ##################################################################################################################################### ##redis连接 ##################################################################################################################################### #redis.host=10.0.6.228 redis.host=10.0.6.249 -redis.port=6380 +redis.port=6379 redis.pass= redis.maxIdle=5 redis.maxTotal=250 diff --git a/src/main/resources/maatXml/maat.xml b/src/main/resources/maatXml/maat.xml index a60b6c0..475ec8b 100644 --- a/src/main/resources/maatXml/maat.xml +++ b/src/main/resources/maatXml/maat.xml @@ -27,7 +27,7 @@ EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id] - [cfg_id];\t;[service];\t;[level];\t;[description];\t;[is_valid] + [cfg_id];\t;[service];\t;[level];\t;[description];\t;[is_valid];\n 1 @@ -48,7 +48,7 @@ EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id] - [cfg_id];\t;[service];\t;[action];\t;[addr_type];\t;[src_ip];\t;[mask_src_ip];\t;[src_port];\t;[mask_src_port];\t;[dst_ip];\t;[mask_dst_ip];\t;[dst_port];\t;[mask_dst_port];\t;[protocol];\t;[direction];\t;[is_valid];\t;[op_time] + [cfg_id];\t;[service];\t;[action];\t;[addr_type];\t;[src_ip];\t;[mask_src_ip];\t;[src_port];\t;[mask_src_port];\t;[dst_ip];\t;[mask_dst_ip];\t;[dst_port];\t;[mask_dst_port];\t;[protocol];\t;[direction];\t;[is_valid];\t;[op_time]; \n 1 @@ -69,7 +69,7 @@ EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id] - [cfg_id];\t;[service];\t;[action];\t;[policyGroup];\t;[addr_type];\t;[src_ip];\t;[mask_src_ip];\t;[src_port];\t;[mask_src_port];\t;[dst_ip];\t;[mask_dst_ip];\t;[dst_port];\t;[mask_dst_port];\t;[protocol];\t;[direction];\t;[is_valid];\t;[op_time] + [cfg_id];\t;[service];\t;[action];\t;[policyGroup];\t;[addr_type];\t;[src_ip];\t;[mask_src_ip];\t;[src_port];\t;[mask_src_port];\t;[dst_ip];\t;[mask_dst_ip];\t;[dst_port];\t;[mask_dst_port];\t;[protocol];\t;[direction];\t;[is_valid];\t;[op_time]; \n 1 @@ -90,7 +90,7 @@ EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id] - [cfg_id];\t;[service];\t;[action];\t;[req_strate_id];\t;[strate_name];\t;[res_group_1_id];\t;[res_group_1_num];\t;[res_group_2_id];\t;[res_group_2_num];\t;[res_group_3_id];\t;[res_group_3_num];\t;[res_group_4_id];\t;[res_group_4_num];\t;[res_group_5_id];\t;[res_group_5_num];\t;[min_ttl];\t;[max_ttl];\t;[is_valid] + [cfg_id];\t;[service];\t;[action];\t;[req_strate_id];\t;[strate_name];\t;[res_group_1_id];\t;[res_group_1_num];\t;[res_group_2_id];\t;[res_group_2_num];\t;[res_group_3_id];\t;[res_group_3_num];\t;[res_group_4_id];\t;[res_group_4_num];\t;[res_group_5_id];\t;[res_group_5_num];\t;[min_ttl];\t;[max_ttl];\t;[is_valid];\n 1 @@ -110,7 +110,7 @@ EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id] - [cfg_id];\t;[service];\t;[action];\t;[policy_group];\t;[addr_type];\t;[ip];\t;[port];\t;[user_region];\t;[location];\t;[is_valid];\t;[op_time] + [cfg_id];\t;[service];\t;[action];\t;[policy_group];\t;[addr_type];\t;[ip];\t;[port];\t;[user_region];\t;[location];\t;[is_valid];\t;[op_time]; \n diff --git a/src/main/resources/spring-mvc.xml b/src/main/resources/spring-mvc.xml index 11d5abc..de1f4af 100644 --- a/src/main/resources/spring-mvc.xml +++ b/src/main/resources/spring-mvc.xml @@ -179,34 +179,13 @@ - - - - - - - - - + - - - - - - - - - - - - -