bug fix

.idea/workspace.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="BookmarkManager">
+    <bookmark url="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/APIUtil.java" line="53" />
+  </component>
   <component name="ChangeListManager">
     <list default="true" id="ad2fe330-f201-4a05-ab3f-71348d2d007b" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
@@ -7,7 +10,6 @@
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -30,6 +32,42 @@
     <expand />
     <select />
   </component>
+  <component name="FUSProjectUsageTrigger">
+    <session id="87954253">
+      <usages-collector id="statistics.lifecycle.project">
+        <counts>
+          <entry key="project.open.time.2" value="1" />
+          <entry key="project.opened" value="1" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.extensions.open">
+        <counts>
+          <entry key="class" value="2" />
+          <entry key="java" value="16" />
+          <entry key="properties" value="2" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.open">
+        <counts>
+          <entry key="CLASS" value="2" />
+          <entry key="JAVA" value="16" />
+          <entry key="Properties" value="2" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="127" />
+          <entry key="properties" value="2" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="127" />
+          <entry key="Properties" value="2" />
+        </counts>
+      </usages-collector>
+    </session>
+  </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file leaf-file-name="InitService.java" pinned="false" current-in-tab="false">
@@ -98,15 +136,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>hasHKError</find>
-      <find>../lib/HCNetSDK</find>
-      <find>/HCNetSDK</find>
-      <find>Pointer</find>
-      <find>fastjson</find>
-      <find>NET_DVR_FACELIB_COND</find>
-      <find>NET_DVR_UploadFile_V40</find>
-      <find>IMPORT_DATA_TO_FACELIB</find>
-      <find>NET_DVR_SetupAlarmChan_V41</find>
       <find>hd.server</find>
       <find>deviceAPI</find>
       <find>body()</find>
@@ -128,6 +157,15 @@
       <find>NET_DVR_PLATE_INFO</find>
       <find>parseObject</find>
       <find>VLR_VEHICLE_CLASS</find>
+      <find>fmsgCallBack</find>
+      <find>init</find>
+      <find>initde</find>
+      <find>log.info</find>
+      <find>设备SDK错误</find>
+      <find>buildHeaders</find>
+      <find>buildFileBytes</find>
+      <find>getHcNetError</find>
+      <find>未知文件</find>
     </findStrings>
     <replaceStrings>
       <replace>log.info</replace>
@@ -180,7 +218,6 @@
         <option value="$PROJECT_DIR$/pom.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/config/WebSocketConfig.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/WSocketServer.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/APIUtil.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/controller/CommController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/ISubcriber.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/WSClient.java" />
@@ -188,8 +225,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/Action.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/Monitor.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/PersonDetect.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/HikService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/MainService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/CarDetect.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HIKSupplement.java" />
@@ -206,8 +241,8 @@
   <component name="MavenImportPreferences">
     <option name="generalSettings">
       <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Application/apache-maven-3.6.0" />
-        <option name="userSettingsFile" value="D:\Application\apache-maven-3.6.0\conf\settings.xml" />
+        <option name="mavenHome" value="E:/apache-maven-3.5.4" />
+        <option name="userSettingsFile" value="E:\apache-maven-3.5.4\conf\settings.xml" />
       </MavenGeneralSettings>
     </option>
     <option name="importingSettings">
@@ -237,14 +272,10 @@
       <select />
     </treeState>
   </component>
-  <component name="NodePackageJsonFileManager">
-    <packageJsonPaths />
-  </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
-    <option name="width" value="1296" />
-    <option name="height" value="735" />
+    <option name="x" value="-10" />
+    <option name="width" value="2585" />
+    <option name="height" value="1465" />
   </component>
   <component name="ProjectLevelVcsManager">
     <ConfirmationsSetting value="1" id="Add" />
@@ -261,48 +292,64 @@
           <expand>
             <path>
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
+              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
-              <item name="bak" type="462c0819:PsiDirectoryNode" />
+              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
-              <item name="bak" type="462c0819:PsiDirectoryNode" />
+              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
+              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
+              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="hardware" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
+              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="hardware" type="462c0819:PsiDirectoryNode" />
+              <item name="config" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
+              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="hardware" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="hardware" type="462c0819:PsiDirectoryNode" />
+              <item name="libs" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
@@ -345,11 +392,19 @@
             </path>
             <path>
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="hardware" type="462c0819:PsiDirectoryNode" />
+              <item name="websocket" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
-              <item name="libs" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -366,13 +421,16 @@
     <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://E:/JavaProjects/welcome3.0/hardware/src/main/java/com/huiju/welcome/hardware/service/Monitor.java" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1561449835132" />
+    <property name="go.gopath.indexing.explicitly.defined" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../service-welcome3" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="project.structure.last.edited" value="Artifacts" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.34514287" />
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
+    <property name="show.migrate.to.gradle.popup" value="false" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
@@ -415,56 +473,44 @@
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="Main" />
       <module name="hardware" />
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <configuration default="true" type="Application" factoryName="Application">
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <patterns />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <configuration name="HardwareApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <module name="hardware" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.huiju.welcome.hardware.HardwareApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <configuration default="true" type="TestNG" factoryName="TestNG">
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
       <properties />
       <listeners />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <list>
       <item itemvalue="Spring Boot.HardwareApplication" />
@@ -515,75 +561,77 @@
     <option name="totallyTimeSpent" value="225557000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1015" extended-state="6" />
-    <editor active="true" />
+    <frame x="-7" y="-7" width="2062" height="1126" extended-state="6" />
     <layout>
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
-      <window_info anchor="right" id="Maven Projects" order="3" weight="0.04424307" />
-      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
-      <window_info id="Capture Tool" order="2" />
-      <window_info id="Designer" order="2" />
-      <window_info anchor="right" id="Database" order="3" weight="0.3291506" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49918962" visible="true" weight="0.23353294" />
       <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="bottom" id="Debug" order="3" visible="true" weight="0.36374003" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Messages" order="7" weight="0.3295325" />
-      <window_info anchor="right" id="Palette&#9;" order="3" />
-      <window_info id="Image Layers" order="2" />
-      <window_info anchor="bottom" id="Java Enterprise" order="8" />
-      <window_info anchor="right" id="Capture Analysis" order="3" />
-      <window_info anchor="bottom" id="Version Control" order="7" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" sideWeight="0.5008104" side_tool="true" weight="0.23353294" />
+      <window_info anchor="bottom" id="Flutter Performance" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.3295325" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.22234891" />
-      <window_info anchor="bottom" id="Spring" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.22348917" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.11727079" />
-      <window_info anchor="right" id="Bean Validation" order="4" />
-      <window_info id="Web" order="3" side_tool="true" />
-      <window_info anchor="right" id="Theme Preview" order="3" />
-      <window_info id="Favorites" order="2" side_tool="true" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.499002" visible="true" weight="0.32920536" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.32920536" />
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.22291021" />
+      <window_info anchor="bottom" id="Event Log" order="8" sideWeight="0.500998" side_tool="true" weight="0.35500515" />
+      <window_info anchor="bottom" id="Messages" order="9" sideWeight="0.499501" weight="0.3364293" />
+      <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="11" weight="0.32920536" />
+      <window_info anchor="bottom" id="Spring" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" weight="0.32920536" />
+      <window_info anchor="right" id="Flutter Outline" />
+      <window_info anchor="right" id="Flutter Inspector" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.3295325" />
-      <window_info anchor="right" id="Coverage" order="4" side_tool="true" weight="0.32995737" />
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.04424307" />
+      <window_info anchor="right" id="Database" order="6" weight="0.3291506" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Theme Preview" order="8" />
+      <window_info anchor="right" id="Coverage" order="9" side_tool="true" weight="0.32995737" />
+      <window_info anchor="right" id="Bean Validation" order="10" />
     </layout>
     <layout-to-restore>
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17377399" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.22234891" />
-      <window_info anchor="bottom" id="Spring" order="12" />
       <window_info id="Image Layers" order="3" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32964474" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info id="UI Designer" order="4" />
       <window_info id="Favorites" order="5" side_tool="true" />
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.22348917" />
       <window_info id="Capture Tool" order="6" />
-      <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
-      <window_info anchor="bottom" id="Messages" order="11" />
+      <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32964474" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.22234891" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.41619155" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.22348917" />
+      <window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
       <window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="10" />
-      <window_info anchor="right" id="Maven Projects" order="6" visible="true" weight="0.04424307" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17377399" />
+      <window_info anchor="bottom" id="Messages" order="11" />
+      <window_info anchor="bottom" id="Spring" order="12" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <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="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="Database" order="5" weight="0.3291506" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="right" id="Maven Projects" order="6" visible="true" weight="0.04424307" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.41619155" />
       <window_info anchor="right" id="Bean Validation" order="9" />
     </layout-to-restore>
   </component>
@@ -593,20 +641,11 @@
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <option name="time" value="19" />
-    </breakpoint-manager>
-  </component>
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/assembly/myassembly.xml" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/MicroServer.java" />
-    <entry file="file://$PROJECT_DIR$/setting.conf" />
     <entry file="file://$PROJECT_DIR$/bak/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="700">
@@ -622,87 +661,20 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/App.java" />
-    <entry file="jar://D:/REPO/com/squareup/okhttp3/okhttp/3.14.0/okhttp-3.14.0.jar!/okhttp3/Response.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="125">
-          <caret line="117" column="19" selection-start-line="117" selection-start-column="19" selection-end-line="117" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://D:/REPO/com/squareup/okhttp3/okhttp/3.14.0/okhttp-3.14.0.jar!/okhttp3/ResponseBody.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="47" column="17" selection-start-line="47" selection-start-column="17" selection-end-line="47" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://D:/Application/jdk1.8.0_161/src.zip!/java/lang/ClassLoader.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="1305" column="23" selection-start-line="1305" selection-start-column="23" selection-end-line="1305" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://D:/REPO/com/squareup/okhttp3/okhttp/3.14.0/okhttp-3.14.0.jar!/okhttp3/Headers.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-380">
-          <caret line="159" column="26" selection-start-line="159" selection-start-column="26" selection-end-line="159" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="jar://D:/REPO/com/squareup/okhttp3/okhttp/3.14.0/okhttp-3.14.0.jar!/okhttp3/Response.class" />
+    <entry file="jar://D:/REPO/com/squareup/okhttp3/okhttp/3.14.0/okhttp-3.14.0.jar!/okhttp3/ResponseBody.class" />
+    <entry file="jar://D:/Application/jdk1.8.0_161/src.zip!/java/lang/ClassLoader.java" />
+    <entry file="jar://D:/REPO/com/squareup/okhttp3/okhttp/3.14.0/okhttp-3.14.0.jar!/okhttp3/Headers.class" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/TinyLog.java" />
-    <entry file="jar://D:/REPO/com/squareup/okhttp3/okhttp/3.14.0/okhttp-3.14.0.jar!/okhttp3/MediaType.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="19">
-          <caret line="32" column="42" selection-start-line="32" selection-start-column="30" selection-end-line="32" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://D:/Application/jdk1.8.0_161/src.zip!/java/io/File.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="268">
-          <caret line="453" column="52" lean-forward="true" selection-start-line="453" selection-start-column="52" selection-end-line="453" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://D:/REPO/com/squareup/okhttp3/okhttp/3.14.0/okhttp-3.14.0.jar!/okhttp3/MultipartBody.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="76">
-          <caret line="15" column="23" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="jar://D:/REPO/com/squareup/okhttp3/okhttp/3.14.0/okhttp-3.14.0.jar!/okhttp3/MediaType.class" />
+    <entry file="jar://D:/Application/jdk1.8.0_161/src.zip!/java/io/File.java" />
+    <entry file="jar://D:/REPO/com/squareup/okhttp3/okhttp/3.14.0/okhttp-3.14.0.jar!/okhttp3/MultipartBody.class" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/config/HikConfig.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/config/AppConfig.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/config/DeviceConfig.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/Configer.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="15" column="5" selection-start-line="15" selection-start-column="5" selection-end-line="15" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://D:/Application/jdk1.8.0_161/src.zip!/java/net/URI.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="514">
-          <caret line="1601" column="26" selection-start-line="1601" selection-start-column="18" selection-end-line="1601" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://D:/REPO/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar!/org/slf4j/Logger.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="284">
-          <caret line="40" column="9" selection-start-line="40" selection-start-column="9" selection-end-line="40" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://D:/REPO/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar!/org/slf4j/event/EventRecodingLogger.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="267">
-          <caret line="31" column="17" selection-start-line="31" selection-start-column="17" selection-end-line="31" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="jar://D:/Application/jdk1.8.0_161/src.zip!/java/net/URI.java" />
+    <entry file="jar://D:/REPO/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar!/org/slf4j/Logger.class" />
+    <entry file="jar://D:/REPO/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar!/org/slf4j/event/EventRecodingLogger.class" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/INetSubscriber.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/Server.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/Rand.java">
@@ -761,13 +733,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="jar://D:/REPO/org/java-websocket/Java-WebSocket/1.4.0/Java-WebSocket-1.4.0.jar!/org/java_websocket/client/WebSocketClient.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="241">
-          <caret line="339" column="23" selection-start-line="339" selection-start-column="13" selection-end-line="339" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="jar://D:/REPO/org/java-websocket/Java-WebSocket/1.4.0/Java-WebSocket-1.4.0.jar!/org/java_websocket/client/WebSocketClient.class" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/WSServer.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2079">
@@ -795,9 +761,27 @@
         </state>
       </provider>
     </entry>
+    <entry file="jar://D:/REPO/com/alibaba/fastjson/1.2.56/fastjson-1.2.56.jar!/com/alibaba/fastjson/JSON.class" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HIKSupplement.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="147">
+          <caret line="7" column="28" selection-start-line="7" selection-start-column="28" selection-end-line="7" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/CarDetect.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="93">
+          <caret line="35" lean-forward="true" selection-start-line="35" selection-end-line="35" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/WSClient.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="798">
+        <state relative-caret-position="474">
           <caret line="47" column="53" selection-start-line="47" selection-start-column="53" selection-end-line="47" selection-end-column="53" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -850,7 +834,21 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/PersonDetect.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="77">
+          <caret line="3856" column="13" selection-start-line="3856" selection-start-column="13" selection-end-line="3856" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/Ping.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="108">
+          <caret line="16" selection-start-line="16" selection-end-line="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/config/InitService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-210">
           <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
@@ -906,7 +904,8 @@
         <state relative-caret-position="384">
           <caret line="97" lean-forward="true" selection-start-line="97" selection-end-line="97" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#1984#1985#0" expanded="true" />
+            <element signature="e#2032#2033#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -977,7 +976,6 @@
             <option name="proportions">
               <list>
                 <option value="0.2" />
-                <option value="0.6" />
               </list>
             </option>
           </splitter-proportions>
@@ -997,7 +995,7 @@
       </state>
       <state key="ProjectLibrariesConfigurable.UI">
         <settings>
-          <last-edited>Maven: com.sun.jna:jna:3.0.9</last-edited>
+          <last-edited>examples</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>

src/main/java/com/huiju/welcome/hardware/libs/APIUtil.java

@@ -74,11 +74,11 @@ public class APIUtil {
     }
 
     public static Headers buildHeaders(Map<String, String> headers) {
-        if (null == headers) return null;
-
         Headers.Builder builder = new Headers.Builder();
-        for (Map.Entry<String, String> entry: headers.entrySet()) {
-            builder.add(entry.getKey(), entry.getValue());
+        if (null != headers) {
+            for (Map.Entry<String, String> entry: headers.entrySet()) {
+                builder.add(entry.getKey(), entry.getValue());
+            }
         }
         return builder.build();
     }
@@ -119,7 +119,9 @@ public class APIUtil {
                 } else if (fieldValue instanceof FileInputStream) {
                     buildFileInputStream(builder, (FileInputStream) fieldValue, fieldName);
                 } else if (fieldValue instanceof ByteBuffer) {
-                    buildFileBytes(builder, ((ByteBuffer) fieldValue).array(), fieldName);
+                    byte[] array = new byte[((ByteBuffer) fieldValue).remaining()];
+                    ((ByteBuffer) fieldValue).get(array);
+                    buildFileBytes(builder, array, fieldName);
                 } else if (fieldValue instanceof Array) {
                     for (int i = 0; i < Array.getLength(fieldValue); i ++) {
                         Object item = Array.get(fieldValue, i);
@@ -161,7 +163,7 @@ public class APIUtil {
 
             MediaType tp = MediaType.get("application/octet-stream");
             RequestBody body = RequestBody.create(tp, content);
-            builder.addFormDataPart(field, "未知文件", body);
+            builder.addFormDataPart(field, "未知文件.jpg", body);
         } catch (IOException e) {
             e.printStackTrace();
             log.error("转换 form-data 数据 到 body 失败: " + e.getMessage());
@@ -171,7 +173,7 @@ public class APIUtil {
     private static void buildFileBytes(MultipartBody.Builder builder, byte[] content, String field) {
         MediaType tp = MediaType.get("application/octet-stream");
         RequestBody body = RequestBody.create(tp, content);
-        builder.addFormDataPart(field, "未知文件", body);
+        builder.addFormDataPart(field, "未知文件.jpg", body);
     }
 
     private static String getSearchString(Map<String, String> query) {

src/main/java/com/huiju/welcome/hardware/service/HikService.java

@@ -54,7 +54,7 @@ public class HikService {
     HCNetSDK.FMSGCallBack_V31 fmsgCallBack;
 
     public boolean init() {
-        String deviceIP = Configer.pick("device.id");
+        String deviceIP = Configer.pick("device.ip");
 
         if (!Ping.attemp(deviceIP)) {
             log.error("设备未上线...");
@@ -65,6 +65,7 @@ public class HikService {
         if (!setDeviceCallback()) return false;
         if (!loginDevice()) return false;
         if (!setDeviceAlarm()) return false;
+        if (!setDeviceOnline()) return false;
 
         return true;
     }
@@ -108,7 +109,7 @@ public class HikService {
         HCNetSDK.NET_DVR_DEVICEINFO_V30 device = new HCNetSDK.NET_DVR_DEVICEINFO_V30();
 
         user = hcNetSDK.NET_DVR_Login_V30(
-                Configer.pick("device.id"),
+                Configer.pick("device.ip"),
                 (short) Integer.valueOf(Configer.pick("device.port")).intValue(),
                 Configer.pick("device.loginUser"),
                 Configer.pick("device.password"),
@@ -341,6 +342,7 @@ public class HikService {
         query.put("port", Configer.pick("device.port"));
         query.put("username", Configer.pick("device.loginUser"));
         query.put("password", Configer.pick("device.password"));
+        query.put("status", "1");
         query.put("api", Configer.pick("api.current") + ":" + Configer.pick("server.port"));
 
         try {

src/main/java/com/huiju/welcome/hardware/service/Monitor.java

@@ -32,7 +32,7 @@ public class Monitor extends Thread {
 
             if (!lastResult && netOk) {
                 while (true) {
-                    boolean success = hikService.initDevice();
+                    boolean success = hikService.init();
                     if (success) break;
 
                     try {

src/main/java/com/huiju/welcome/hardware/service/PersonDetect.java

@@ -48,6 +48,7 @@ public class PersonDetect implements HCNetSDK.FMSGCallBack_V31 {
     }
 
     // 海康回调
+    @Override
     public boolean invoke(NativeLong lCommand, HCNetSDK.NET_DVR_ALARMER pAlarmer, Pointer pAlarmInfo, int dwBufLen, Pointer pUser) {
         // 回调类型
         switch (lCommand.intValue()){