Skip to content

Z
znks
Commit a8de367d authored by 王夏晖's avatar 王夏晖
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents c799f58c 44fe55af
Show whitespace changes
Inline Side-by-side
Showing with 294 additions and 183 deletions
.idea/workspace.xml
View file @ a8de367d
......@@ -7,11 +7,11 @@
</component>
<component name="ChangeListManager">
<list default="true" id="55789a40-4cf0-4b7d-ac1a-d6938e521645" name="Default" comment="">
<change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_1_22_Final.xml" />
<change beforePath="" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/ZnksServer.java" />
<change beforePath="" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/handler/RequestDecoder.java" />
<change beforePath="" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/handler/ZnksServerHandler.java" />
<change beforePath="" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/utils/ClientUtils.java" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change beforePath="$PROJECT_DIR$/adc-da-main/adc-da-main.iml" afterPath="$PROJECT_DIR$/adc-da-main/adc-da-main.iml" />
<change beforePath="$PROJECT_DIR$/adc-da-main/pom.xml" afterPath="$PROJECT_DIR$/adc-da-main/pom.xml" />
<change beforePath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/ZnksServer.java" afterPath="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/ZnksServer.java" />
</list>
<ignored path="$PROJECT_DIR$/adc-da-ui/target/" />
<ignored path="$PROJECT_DIR$/target/" />
......@@ -52,18 +52,7 @@
<select />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="ZnksServer.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/ZnksServer.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="11" column="0" lean-forward="false" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
......@@ -115,9 +104,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znds/util/PersistModel.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znds/util/FileUtil.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znds/dao/AccidentEODao.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znds/page/BaseVO.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znds/util/FtpUtil.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znds/entity/ComponentStandardEO.java" />
......@@ -166,6 +152,9 @@
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/controller/PositionController.java" />
<option value="$PROJECT_DIR$/adc-da-main/pom.xml" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/ZnksServer.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/handler/RequestDecoder.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/utils/ClientUtils.java" />
<option value="$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/handler/ZnksServerHandler.java" />
</list>
</option>
</component>
......@@ -194,10 +183,10 @@
</treeState>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="434" />
<option name="y" value="58" />
<option name="x" value="221" />
<option name="y" value="1" />
<option name="width" value="1146" />
<option name="height" value="653" />
<option name="height" value="652" />
</component>
<component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default">
......@@ -651,10 +640,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scratches" />
<pane id="AndroidView" />
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
......@@ -707,10 +693,36 @@
<item name="da" type="462c0819:PsiDirectoryNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="znks" type="b2602c69:ProjectViewProjectNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="da" type="462c0819:PsiDirectoryNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="server" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="znks" type="b2602c69:ProjectViewProjectNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="adc-da-main" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="da" type="462c0819:PsiDirectoryNode" />
<item name="znks" type="462c0819:PsiDirectoryNode" />
<item name="server" type="462c0819:PsiDirectoryNode" />
<item name="handler" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scratches" />
<pane id="Scope" />
<pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -971,7 +983,8 @@
<workItem from="1536148387655" duration="14652000" />
<workItem from="1536164642063" duration="264000" />
<workItem from="1536164952365" duration="856000" />
<workItem from="1536195489453" duration="6553000" />
<workItem from="1536195489453" duration="8431000" />
<workItem from="1536208878764" duration="56000" />
</task>
<task id="LOCAL-00001" summary="A">
<created>1534412427208</created>
......@@ -1043,7 +1056,14 @@
<option name="project" value="LOCAL" />
<updated>1536200165769</updated>
</task>
<option name="localTasksCounter" value="11" />
<task id="LOCAL-00011" summary="1.新增netty-all依赖">
<created>1536204143826</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1536204143826</updated>
</task>
<option name="localTasksCounter" value="12" />
<servers />
</component>
<component name="TestHistory">
......@@ -1061,7 +1081,7 @@
</history-entry>
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="278370000" />
<option name="totallyTimeSpent" value="280304000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -1086,7 +1106,6 @@
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4243421" sideWeight="0.49394855" order="4" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32933104" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3070326" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32933104" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
......@@ -1096,7 +1115,7 @@
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
<window_info id="MyBatis Sql Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32933104" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.31240544" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3184569" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
<window_info id="Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
......@@ -1106,6 +1125,7 @@
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
<window_info id="Statistic" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5231561" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3070326" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="CheckStyle" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.17324185" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
......@@ -1141,7 +1161,8 @@
<MESSAGE value="初步调试通过车辆维修方案接口" />
<MESSAGE value="1.登录后台接口完成,测试有些问题" />
<MESSAGE value="1.新增位置接口" />
<option name="LAST_COMMIT_MESSAGE" value="1.新增位置接口" />
<MESSAGE value="1.新增netty-all依赖" />
<option name="LAST_COMMIT_MESSAGE" value="1.新增netty-all依赖" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......@@ -1158,66 +1179,6 @@
</watches-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/white/csrfWhite.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/config/application.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/resources/application-prd.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="4" column="47" lean-forward="true" selection-start-line="4" selection-start-column="47" selection-end-line="4" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/ServletInitializer.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
<caret line="8" column="13" lean-forward="false" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/main/config/WebConfig.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1114">
<caret line="76" column="24" lean-forward="false" selection-start-line="76" selection-start-column="24" selection-end-line="76" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/main/config/DruidDataSourceConfig.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2113">
<caret line="70" column="0" lean-forward="false" selection-start-line="70" selection-start-column="0" selection-end-line="75" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
<entry file="jar://D:/java/repo3/repository/com/adc/adc-da-swagger/2.0.0/adc-da-swagger-2.0.0.jar!/com/adc/da/util/utils/SwaggerUtils.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="jar://D:/java/repo3/repository/com/adc/adc-da-swagger/2.0.0/adc-da-swagger-2.0.0.jar!/com/adc/da/swagger/config/SwaggerConfig.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="jar://D:/java/repo3/repository/com/adc/adc-da-sys/2.2.1/adc-da-sys-2.2.1.jar!/com/adc/da/sys/controller/OrgEORestController.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-595">
......@@ -1313,7 +1274,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="799">
<caret line="65" column="28" lean-forward="false" selection-start-line="65" selection-start-column="28" selection-end-line="65" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
......@@ -1321,7 +1281,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="43" column="13" lean-forward="true" selection-start-line="43" selection-start-column="13" selection-end-line="43" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
......@@ -1329,7 +1288,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108">
<caret line="200" column="0" lean-forward="false" selection-start-line="200" selection-start-column="0" selection-end-line="200" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
......@@ -1337,7 +1295,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="6" column="13" lean-forward="true" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
......@@ -1345,7 +1302,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="4" column="64" lean-forward="true" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="64" />
<folding />
</state>
</provider>
</entry>
......@@ -1353,7 +1309,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="10" column="21" lean-forward="true" selection-start-line="10" selection-start-column="21" selection-end-line="10" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
......@@ -1361,10 +1316,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1938">
<caret line="135" column="0" lean-forward="false" selection-start-line="135" selection-start-column="0" selection-end-line="135" selection-end-column="0" />
<folding>
<marker date="1523163530045" expanded="true" signature="3805:3988" ph="select cu.co... user_cons_columns" />
<marker date="1523163530045" expanded="true" signature="4396:4509" ph="select COLUM... user_tab_cols" />
</folding>
</state>
</provider>
</entry>
......@@ -1372,54 +1323,15 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-119">
<caret line="10" column="61" lean-forward="false" selection-start-line="10" selection-start-column="61" selection-end-line="10" selection-end-column="61" />
<folding>
<marker date="1536197579529" expanded="true" signature="1373:1391" ph="select * fro... TEST" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/service/PositionService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/service/UserService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/service/PositionService.java" />
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/service/UserService.java" />
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/entity/User.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="12" column="4" lean-forward="false" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
<folding>
<element signature="e#633#634#0" expanded="false" />
<element signature="e#658#659#0" expanded="false" />
<element signature="e#694#695#0" expanded="false" />
<element signature="e#722#723#0" expanded="false" />
<element signature="e#757#758#0" expanded="false" />
<element signature="e#788#789#0" expanded="false" />
<element signature="e#836#837#0" expanded="false" />
<element signature="e#876#877#0" expanded="false" />
<element signature="e#911#912#0" expanded="false" />
<element signature="e#942#943#0" expanded="false" />
<element signature="e#990#991#0" expanded="false" />
<element signature="e#1030#1031#0" expanded="false" />
<element signature="e#1070#1071#0" expanded="false" />
<element signature="e#1106#1107#0" expanded="false" />
<element signature="e#1164#1165#0" expanded="false" />
<element signature="e#1214#1215#0" expanded="false" />
<element signature="e#1251#1252#0" expanded="false" />
<element signature="e#1284#1285#0" expanded="false" />
<element signature="e#1336#1337#0" expanded="false" />
<element signature="e#1380#1381#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1427,7 +1339,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-515">
<caret line="8" column="37" lean-forward="false" selection-start-line="8" selection-start-column="37" selection-end-line="8" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
......@@ -1435,9 +1346,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="318">
<caret line="21" column="88" lean-forward="false" selection-start-line="21" selection-start-column="88" selection-end-line="21" selection-end-column="88" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1461,25 +1369,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="30" lean-forward="true" selection-start-line="0" selection-start-column="8" selection-end-line="0" selection-end-column="30" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#966#967#0" expanded="false" />
<element signature="e#999#1000#0" expanded="false" />
<element signature="e#1051#1052#0" expanded="false" />
<element signature="e#1095#1096#0" expanded="false" />
<element signature="e#1130#1131#0" expanded="false" />
<element signature="e#1163#1164#0" expanded="false" />
<element signature="e#1213#1214#0" expanded="false" />
<element signature="e#1257#1258#0" expanded="false" />
<element signature="e#1296#1297#0" expanded="false" />
<element signature="e#1331#1332#0" expanded="false" />
<element signature="e#1387#1388#0" expanded="false" />
<element signature="e#1435#1436#0" expanded="false" />
<element signature="e#1468#1469#0" expanded="false" />
<element signature="e#1497#1498#0" expanded="false" />
<element signature="e#1541#1542#0" expanded="false" />
<element signature="e#1577#1578#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1511,7 +1400,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108">
<caret line="23" column="41" lean-forward="false" selection-start-line="23" selection-start-column="41" selection-end-line="23" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
......@@ -1519,9 +1407,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1020">
<caret line="60" column="16" lean-forward="true" selection-start-line="60" selection-start-column="16" selection-end-line="60" selection-end-column="16" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1529,7 +1414,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="10" column="13" lean-forward="false" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
......@@ -1537,7 +1421,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="386">
<caret line="280" column="50" lean-forward="false" selection-start-line="280" selection-start-column="45" selection-end-line="280" selection-end-column="50" />
<folding />
</state>
</provider>
</entry>
......@@ -1545,9 +1428,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="15" column="0" lean-forward="true" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1555,7 +1435,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
......@@ -1563,9 +1442,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1139">
<caret line="67" column="19" lean-forward="true" selection-start-line="67" selection-start-column="19" selection-end-line="67" selection-end-column="19" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1573,7 +1449,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3103">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
......@@ -1581,7 +1456,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
......@@ -1589,7 +1463,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="55" column="35" lean-forward="true" selection-start-line="55" selection-start-column="35" selection-end-line="55" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
......@@ -1618,7 +1491,76 @@
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/ZnksServer.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="11" column="0" lean-forward="false" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
<caret line="16" column="83" lean-forward="false" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="83" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/handler/RequestDecoder.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="9" column="18" lean-forward="false" selection-start-line="9" selection-start-column="18" selection-end-line="9" selection-end-column="18" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="jar://D:/java/repo3/repository/io/netty/netty-all/4.1.22.Final/netty-all-4.1.22.Final.jar!/io/netty/channel/ChannelHandlerAdapter.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="18" column="32" lean-forward="true" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="jar://D:/java/repo3/repository/io/netty/netty-all/4.1.22.Final/netty-all-4.1.22.Final-sources.jar!/io/netty/channel/ChannelHandler.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-260">
<caret line="179" column="17" lean-forward="false" selection-start-line="179" selection-start-column="17" selection-end-line="179" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="jar://D:/java/repo3/repository/io/netty/netty-all/4.1.22.Final/netty-all-4.1.22.Final-sources.jar!/io/netty/channel/ChannelHandlerAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="25" column="58" lean-forward="false" selection-start-line="25" selection-start-column="58" selection-end-line="25" selection-end-column="58" />
<folding />
</state>
</provider>
</entry>
<entry file="jar://D:/java/repo3/repository/io/netty/netty-all/4.1.22.Final/netty-all-4.1.22.Final-sources.jar!/io/netty/channel/ChannelHandlerContext.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1530">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/utils/ClientUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/adc-da-main/src/main/java/com/adc/da/znks/server/handler/ZnksServerHandler.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="50" column="26" lean-forward="false" selection-start-line="50" selection-start-column="26" selection-end-line="50" selection-end-column="26" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="jar://D:/java/repo3/repository/io/netty/netty-all/4.1.22.Final/netty-all-4.1.22.Final-sources.jar!/io/netty/channel/Channel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17">
<caret line="138" column="33" lean-forward="false" selection-start-line="138" selection-start-column="26" selection-end-line="138" selection-end-column="33" />
<folding />
</state>
</provider>
......
adc-da-main/src/main/java/com/adc/da/znks/server/ZnksServer.java
View file @ a8de367d
package com.adc.da.znks.server;
import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.*;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.nio.NioServerSocketChannel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* znks server
*
* @author ley
* **/
**/
public class ZnksServer {
private static final Logger logger = LoggerFactory.getLogger(ZnksServer.class);
/**
* init znks server
**/
public static void initZnksServer(int port) {
//服务类
ServerBootstrap bootstrap = new ServerBootstrap();
//boss和worker
//EventLoopGroup用来管理和调度netty中的各种线程
EventLoopGroup boss = new NioEventLoopGroup();
EventLoopGroup worker = new NioEventLoopGroup();
try {
//设置线程池
bootstrap.group(boss, worker);
//设置socket工厂、
bootstrap.channel(NioServerSocketChannel.class);
//设置管道工厂
bootstrap.childHandler(new ChannelInitializer<Channel>() {
@Override
protected void initChannel(Channel ch) throws Exception {
}
});
//设置参数，TCP参数
bootstrap.option(ChannelOption.SO_BACKLOG, 2048);//serverSocketchannel的设置，链接缓冲池的大小
bootstrap.childOption(ChannelOption.SO_KEEPALIVE, true);//socketchannel的设置,维持链接的活跃，清除死链接
bootstrap.childOption(ChannelOption.TCP_NODELAY, true);//socketchannel的设置,关闭延迟发送
//绑定端口
ChannelFuture future = bootstrap.bind(port);
logger.info("57所netty监听服务启动成功...");
//等待服务端关闭
future.channel().closeFuture().sync();
} catch (Exception e) {
e.printStackTrace();
} finally {
//释放资源
boss.shutdownGracefully();
worker.shutdownGracefully();
}
}
}
adc-da-main/src/main/java/com/adc/da/znks/server/handler/RequestDecoder.java 0 → 100644
View file @ a8de367d
package com.adc.da.znks.server.handler;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.ByteToMessageDecoder;
import java.util.List;
/**
* request decoder
**/
public class RequestDecoder extends ByteToMessageDecoder {
/**
*
* **/
@Override
protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List<Object> list) throws Exception {
}
}
adc-da-main/src/main/java/com/adc/da/znks/server/handler/ZnksServerHandler.java 0 → 100644
View file @ a8de367d
package com.adc.da.znks.server.handler;
import com.adc.da.znks.server.utils.ClientUtils;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
/**
* znks server handler
*
* @author ley
**/
public class ZnksServerHandler extends ChannelInboundHandlerAdapter {
private static final Logger logger = LoggerFactory.getLogger(ZnksServerHandler.class);
/**
* 存有连接进来的客户端
**/
public static final Map<String, ChannelHandlerContext> clientMap =
new ConcurrentHashMap<>(64);
/**
* 客户端数量
**/
private final AtomicInteger clientNumber = new AtomicInteger(0);
/**
* 接受客户端数据
**/
@Override
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
}
/**
* 新客户端接入
**/
@Override
public void channelActive(ChannelHandlerContext ctx) throws Exception {
String key = ClientUtils.getClientIpAndPort(ctx);
clientMap.put(key, ctx);
clientNumber.incrementAndGet();
logger.info("客户端: {}, 连接成功", key);
logger.info("连接服务端的客户端个数: {}", clientNumber.get());
}
/**
* 客户端断开
**/
@Override
public void channelInactive(ChannelHandlerContext ctx) throws Exception {
super.channelInactive(ctx);
}
/**
* 处理异常
**/
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
cause.printStackTrace();
}
}
adc-da-main/src/main/java/com/adc/da/znks/server/utils/ClientUtils.java 0 → 100644
View file @ a8de367d
package com.adc.da.znks.server.utils;
import io.netty.channel.ChannelHandlerContext;
import java.net.InetSocketAddress;
/**
* client utility class
*
* @author ley
**/
public class ClientUtils {
/**
* get client ip and port
**/
public static String getClientIpAndPort(ChannelHandlerContext context) {
InetSocketAddress clientSocket = (InetSocketAddress) context.channel().remoteAddress();
String clientIp = clientSocket.getAddress().getHostAddress();
int clientPort = clientSocket.getPort();
return clientIp + ":" + clientPort;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment