diff options
4 files changed, 287 insertions, 53 deletions
diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c85e31b..3e13f40 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,12 +2,9 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="7803fbe0-0492-4e54-9d86-e0390d08ce3a" name="Default Changelist" comment=""> - <change afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/FlumeDynamicApp.java" beforeDir="false" afterPath="$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/FlumeDynamicApp.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/hbase/HBaseUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/hbase/HBaseUtils.java" afterDir="false" /> </list> <ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/FlumeDynamicInterceptor/target/" /> @@ -58,24 +55,22 @@ <file leaf-file-name="FlumeDynamicApp.java" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/FlumeDynamicApp.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="262"> - <caret line="165" column="30" lean-forward="true" selection-start-line="165" selection-start-column="30" selection-end-line="165" selection-end-column="30" /> + <state relative-caret-position="-1395"> + <caret line="123" column="31" selection-start-line="123" selection-start-column="31" selection-end-line="123" selection-end-column="31" /> </state> </provider> </entry> </file> <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/pom.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-1596" /> - </provider> + <provider selected="true" editor-type-id="text-editor" /> </entry> </file> <file leaf-file-name="HBaseUtils.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/hbase/HBaseUtils.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1235"> - <caret line="78" column="27" selection-start-line="78" selection-start-column="27" selection-end-line="78" selection-end-column="27" /> + <state relative-caret-position="247"> + <caret line="26" column="67" selection-start-line="26" selection-start-column="67" selection-end-line="26" selection-end-column="67" /> </state> </provider> </entry> @@ -83,7 +78,7 @@ <file leaf-file-name="HttpClientUtil.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/http/HttpClientUtil.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="817"> + <state relative-caret-position="704"> <caret line="52" selection-start-line="52" selection-end-line="52" /> <folding> <element signature="e#1795#1841#0" /> @@ -95,8 +90,8 @@ <file leaf-file-name="JsonParseUtil.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/json/JsonParseUtil.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="3534"> - <caret line="193" column="28" selection-start-line="193" selection-start-column="28" selection-end-line="193" selection-end-column="28" /> + <state relative-caret-position="-1505"> + <caret line="86" column="25" selection-start-line="86" selection-start-column="25" selection-end-line="86" selection-end-column="25" /> </state> </provider> </entry> @@ -122,8 +117,8 @@ <file leaf-file-name="service_flow_config.properties" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/properties/service_flow_config.properties"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="228"> - <caret line="12" selection-start-line="12" selection-end-line="12" /> + <state relative-caret-position="171"> + <caret line="9" column="19" selection-start-line="9" selection-start-column="19" selection-end-line="9" selection-end-column="19" /> </state> </provider> </entry> @@ -136,10 +131,10 @@ <component name="IdeDocumentHistory"> <option name="CHANGED_PATHS"> <list> - <option value="$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/hbase/HBaseUtils.java" /> <option value="$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/http/HttpClientUtil.java" /> <option value="$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/json/JsonParseUtil.java" /> <option value="$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/system/FlowWriteConfigurations.java" /> + <option value="$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/hbase/HBaseUtils.java" /> <option value="$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/FlumeDynamicApp.java" /> </list> </option> @@ -166,7 +161,17 @@ </component> <component name="MavenProjectNavigator"> <treeState> - <expand /> + <expand> + <path> + <item name="" type="16c1761:MavenProjectsStructure$RootNode" /> + <item name="FlumeDynamicInterceptor" type="9519ce18:MavenProjectsStructure$ProjectNode" /> + </path> + <path> + <item name="" type="16c1761:MavenProjectsStructure$RootNode" /> + <item name="FlumeDynamicInterceptor" type="9519ce18:MavenProjectsStructure$ProjectNode" /> + <item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" /> + </path> + </expand> <select /> </treeState> </component> @@ -185,6 +190,8 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> + <pane id="PackagesPane" /> + <pane id="Scope" /> <pane id="ProjectPane"> <subPane> <expand> @@ -262,15 +269,52 @@ <item name="java" type="462c0819:PsiDirectoryNode" /> <item name="interceptor" type="462c0819:PsiDirectoryNode" /> <item name="utils" type="462c0819:PsiDirectoryNode" /> + <item name="hbase" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="dynamic_complement" type="b2602c69:ProjectViewProjectNode" /> + <item name="dynamic_complement" type="462c0819:PsiDirectoryNode" /> + <item name="FlumeDynamicInterceptor" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + <item name="java" type="462c0819:PsiDirectoryNode" /> + <item name="interceptor" type="462c0819:PsiDirectoryNode" /> + <item name="utils" type="462c0819:PsiDirectoryNode" /> + <item name="http" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="dynamic_complement" type="b2602c69:ProjectViewProjectNode" /> + <item name="dynamic_complement" type="462c0819:PsiDirectoryNode" /> + <item name="FlumeDynamicInterceptor" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + <item name="java" type="462c0819:PsiDirectoryNode" /> + <item name="interceptor" type="462c0819:PsiDirectoryNode" /> + <item name="utils" type="462c0819:PsiDirectoryNode" /> + <item name="json" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="dynamic_complement" type="b2602c69:ProjectViewProjectNode" /> + <item name="dynamic_complement" type="462c0819:PsiDirectoryNode" /> + <item name="FlumeDynamicInterceptor" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + <item name="java" type="462c0819:PsiDirectoryNode" /> + <item name="interceptor" type="462c0819:PsiDirectoryNode" /> + <item name="utils" type="462c0819:PsiDirectoryNode" /> <item name="system" type="462c0819:PsiDirectoryNode" /> </path> + <path> + <item name="dynamic_complement" type="b2602c69:ProjectViewProjectNode" /> + <item name="dynamic_complement" type="462c0819:PsiDirectoryNode" /> + <item name="FlumeDynamicInterceptor" type="462c0819:PsiDirectoryNode" /> + <item name="target" type="462c0819:PsiDirectoryNode" /> + </path> </expand> <select /> </subPane> </pane> - <pane id="PackagesPane" /> <pane id="AndroidView" /> - <pane id="Scope" /> </panes> </component> <component name="PropertiesComponent"> @@ -350,14 +394,15 @@ <updated>1591958573741</updated> <workItem from="1591958576333" duration="1762000" /> <workItem from="1591962716014" duration="1355000" /> + <workItem from="1592188791616" duration="6660000" /> </task> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="3117000" /> + <option name="totallyTimeSpent" value="9777000" /> </component> <component name="ToolWindowManager"> - <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> + <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" /> <editor active="true" /> <layout> <window_info anchor="right" id="Palette" order="3" /> @@ -366,23 +411,23 @@ <window_info id="Image Layers" order="2" /> <window_info anchor="bottom" id="Java Enterprise" order="7" /> <window_info anchor="right" id="Capture Analysis" order="3" /> - <window_info active="true" anchor="bottom" id="Event Log" order="7" side_tool="true" visible="true" weight="0.32936078" /> + <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" weight="0.25460455" /> <window_info anchor="right" id="Maven Projects" order="3" weight="0.17803837" /> <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" /> - <window_info anchor="bottom" id="Run" order="2" /> <window_info anchor="bottom" id="Version Control" order="7" /> + <window_info anchor="bottom" id="Run" order="2" weight="0.32936078" /> <window_info anchor="bottom" id="Terminal" order="7" /> <window_info id="Capture Tool" order="2" /> <window_info id="Designer" order="2" /> - <window_info content_ui="combo" id="Project" order="0" weight="0.25266525" /> + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25266525" /> <window_info anchor="right" id="Bean Validation" order="3" /> <window_info anchor="right" id="Database" order="3" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info id="UI Designer" order="2" /> <window_info anchor="right" id="Theme Preview" order="3" /> - <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> <window_info id="Favorites" order="2" side_tool="true" /> + <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> @@ -392,34 +437,34 @@ </layout> <layout-to-restore> <window_info anchor="right" id="Palette" order="3" /> - <window_info anchor="bottom" id="Find" order="1" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> <window_info anchor="right" id="Capture Analysis" order="4" /> - <window_info anchor="right" id="Database" order="5" /> <window_info anchor="bottom" id="Run" order="2" /> - <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> - <window_info anchor="bottom" id="Message" order="0" /> + <window_info anchor="right" id="Theme Preview" order="6" /> + <window_info id="Favorites" order="6" side_tool="true" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25266525" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> - <window_info anchor="right" id="Theme Preview" order="6" /> + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="bottom" id="TODO" order="6" /> - <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" /> + <window_info anchor="bottom" id="Version Control" order="10" /> <window_info id="Image Layers" order="2" /> <window_info id="Designer" order="3" /> - <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info id="UI Designer" order="4" /> - <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> + <window_info anchor="bottom" id="Find" order="1" /> <window_info anchor="right" id="Bean Validation" order="7" /> + <window_info anchor="right" id="Database" order="5" /> <window_info anchor="right" id="Palette	" order="8" /> <window_info anchor="bottom" id="Terminal" order="8" /> + <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> + <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" /> + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" /> - <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> - <window_info anchor="bottom" id="Version Control" order="10" /> <window_info id="Capture Tool" order="5" /> - <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> + <window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Java Enterprise" order="11" /> <window_info anchor="right" id="Maven Projects" order="9" visible="true" weight="0.17803837" /> - <window_info id="Favorites" order="6" side_tool="true" /> + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> </layout-to-restore> </component> <component name="TypeScriptGeneratedFilesManager"> @@ -431,11 +476,14 @@ <component name="editorHistoryManager"> <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/FlumeDynamicApp.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="4617"> - <caret line="270" column="48" selection-start-line="270" selection-start-column="48" selection-end-line="270" selection-end-column="48" /> + <state relative-caret-position="2736"> + <caret line="165" column="30" lean-forward="true" selection-start-line="165" selection-start-column="30" selection-end-line="165" selection-end-column="30" /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/pom.xml"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/hbase/HBaseUtils.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="1235"> @@ -463,14 +511,14 @@ <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/system/FlowWriteConfigurations.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="323"> - <caret line="17" column="33" lean-forward="true" selection-start-line="17" selection-start-column="33" selection-end-line="17" selection-end-column="33" /> + <caret line="17" column="33" selection-start-line="17" selection-start-column="33" selection-end-line="17" selection-end-column="33" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/common/FlowWriteConfig.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="798"> - <caret line="42" column="93" lean-forward="true" selection-start-line="42" selection-start-column="93" selection-end-line="42" selection-end-column="93" /> + <caret line="42" column="93" selection-start-line="42" selection-start-column="93" selection-end-line="42" selection-end-column="93" /> </state> </provider> </entry> @@ -481,6 +529,13 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/FlumeDynamicApp.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="4617"> + <caret line="270" column="48" selection-start-line="270" selection-start-column="48" selection-end-line="270" selection-end-column="48" /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/hbase/HBaseUtils.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="1235"> @@ -488,7 +543,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/json/BAKJsonParseUtil.java" /> <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/http/HttpClientUtil.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="817"> @@ -506,18 +560,17 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/system/SnowflakeId.java" /> <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/system/FlowWriteConfigurations.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="323"> - <caret line="17" column="33" selection-start-line="17" selection-start-column="33" selection-end-line="17" selection-end-column="33" /> + <caret line="17" column="33" lean-forward="true" selection-start-line="17" selection-start-column="33" selection-end-line="17" selection-end-column="33" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/common/FlowWriteConfig.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="798"> - <caret line="42" column="93" selection-start-line="42" selection-start-column="93" selection-end-line="42" selection-end-column="93" /> + <caret line="42" column="93" lean-forward="true" selection-start-line="42" selection-start-column="93" selection-end-line="42" selection-end-column="93" /> </state> </provider> </entry> @@ -528,15 +581,60 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/json/BAKJsonParseUtil.java" /> + <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/system/SnowflakeId.java" /> + <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/common/FlowWriteConfig.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="798"> + <caret line="42" column="93" selection-start-line="42" selection-start-column="93" selection-end-line="42" selection-end-column="93" /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/pom.xml"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/hbase/HBaseUtils.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-1596" /> + <state relative-caret-position="247"> + <caret line="26" column="67" selection-start-line="26" selection-start-column="67" selection-end-line="26" selection-end-column="67" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/http/HttpClientUtil.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="704"> + <caret line="52" selection-start-line="52" selection-end-line="52" /> + <folding> + <element signature="e#1795#1841#0" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/json/JsonParseUtil.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-1505"> + <caret line="86" column="25" selection-start-line="86" selection-start-column="25" selection-end-line="86" selection-end-column="25" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/properties/service_flow_config.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="171"> + <caret line="9" column="19" selection-start-line="9" selection-start-column="19" selection-end-line="9" selection-end-column="19" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/system/FlowWriteConfigurations.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="323"> + <caret line="17" column="33" selection-start-line="17" selection-start-column="33" selection-end-line="17" selection-end-column="33" /> + </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/FlumeDynamicApp.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="262"> - <caret line="165" column="30" lean-forward="true" selection-start-line="165" selection-start-column="30" selection-end-line="165" selection-end-column="30" /> + <state relative-caret-position="-1395"> + <caret line="123" column="31" selection-start-line="123" selection-start-column="31" selection-end-line="123" selection-end-column="31" /> </state> </provider> </entry> diff --git a/FlumeDynamicInterceptor/dependency-reduced-pom.xml b/FlumeDynamicInterceptor/dependency-reduced-pom.xml new file mode 100644 index 0000000..ff88a66 --- /dev/null +++ b/FlumeDynamicInterceptor/dependency-reduced-pom.xml @@ -0,0 +1,135 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>dynamic_complement</artifactId> + <groupId>com.zdjizhi</groupId> + <version>1.0</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>FlumeDynamicInterceptor</artifactId> + <build> + <resources> + <resource> + <directory>properties</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <artifactId>maven-shade-plugin</artifactId> + <version>2.4.1</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <transformers> + <transformer /> + <transformer> + <mainClass>com.zdjizhi.flume.interceptor.FlumeDynamicApp</mainClass> + </transformer> + <transformer> + <resource>META-INF/spring.handlers</resource> + </transformer> + <transformer> + <resource>META-INF/spring.schemas</resource> + </transformer> + </transformers> + </configuration> + </execution> + </executions> + <configuration> + <createDependencyReducedPom>true</createDependencyReducedPom> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + <executions> + <execution> + <goals> + <goal>exec</goal> + </goals> + </execution> + </executions> + <configuration> + <executable>java</executable> + <includeProjectDependencies>true</includeProjectDependencies> + <includePluginDependencies>false</includePluginDependencies> + <classpathScope>compile</classpathScope> + <mainClass>com.zdjizhi.flume.interceptor.FlumeDynamicApp</mainClass> + </configuration> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.3.2</version> + <configuration> + <source>1.8</source> + <target>1.8</target> + </configuration> + </plugin> + </plugins> + </build> + <repositories> + <repository> + <id>nexus</id> + <name>Team Nexus Repository</name> + <url>http://192.168.40.125:8099/content/groups/public</url> + </repository> + <repository> + <id>ebi</id> + <name>www.ebi.ac.uk</name> + <url>http://www.ebi.ac.uk/intact/maven/nexus/content/groups/public/</url> + </repository> + </repositories> + <dependencies> + <dependency> + <groupId>org.apache.flume</groupId> + <artifactId>flume-ng-core</artifactId> + <version>1.9.0</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <artifactId>flume-ng-sdk</artifactId> + <groupId>org.apache.flume</groupId> + </exclusion> + <exclusion> + <artifactId>flume-ng-configuration</artifactId> + <groupId>org.apache.flume</groupId> + </exclusion> + <exclusion> + <artifactId>flume-ng-auth</artifactId> + <groupId>org.apache.flume</groupId> + </exclusion> + <exclusion> + <artifactId>avro-ipc</artifactId> + <groupId>org.apache.avro</groupId> + </exclusion> + <exclusion> + <artifactId>jetty-jmx</artifactId> + <groupId>org.eclipse.jetty</groupId> + </exclusion> + <exclusion> + <artifactId>libthrift</artifactId> + <groupId>org.apache.thrift</groupId> + </exclusion> + <exclusion> + <artifactId>mina-core</artifactId> + <groupId>org.apache.mina</groupId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + <properties> + <hbase.version>2.2.1</hbase.version> + <flume.version>1.9.0</flume.version> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> +</project> + diff --git a/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/FlumeDynamicApp.java b/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/FlumeDynamicApp.java index 13c7efe..55423ec 100644 --- a/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/FlumeDynamicApp.java +++ b/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/FlumeDynamicApp.java @@ -61,9 +61,10 @@ public class FlumeDynamicApp implements Interceptor { /** * v1.0.3-com.zdjizhi.galaxy */ - .loadDataFile(ipDatPath + "all_ip_info_v4.mmdb") - .loadDataFilePrivateV4(ipDatPath + "ip_private.mmdb") - .loadDataFilePrivateV6(ipDatPath + "ip_private.mmdb") + .loadDataFileV4(ipDatPath + "ip_v4.mmdb") + .loadDataFileV6(ipDatPath + "ip_v6.mmdb") + .loadDataFilePrivateV4(ipDatPath + "ip_private_v4.mmdb") + .loadDataFilePrivateV6(ipDatPath + "ip_private_v6.mmdb") .loadAsnDataFile(ipDatPath + "asn_v4.mmdb") .loadAsnDataFileV6(ipDatPath + "asn_v6.mmdb") .build(); diff --git a/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/hbase/HBaseUtils.java b/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/hbase/HBaseUtils.java index 65681c4..85abf73 100644 --- a/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/hbase/HBaseUtils.java +++ b/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/hbase/HBaseUtils.java @@ -24,7 +24,7 @@ import java.util.TimerTask; public class HBaseUtils { private final static Logger logger = Logger.getLogger(HBaseUtils.class); - private static Map<String, String> subIdMap = new HashMap<>(333334); + private static Map<String, String> subIdMap = new HashMap<>(128); private static Connection connection; private static Long time; |