Your Name 6 years ago
parent
commit
3b7d98ec45
2 changed files with 153 additions and 316 deletions
  1. 148
    311
      .idea/workspace.xml
  2. 5
    5
      src/main/resources/application.properties

+ 148
- 311
.idea/workspace.xml View File

6
   <component name="ChangeListManager">
6
   <component name="ChangeListManager">
7
     <list default="true" id="ad2fe330-f201-4a05-ab3f-71348d2d007b" name="Default" comment="">
7
     <list default="true" id="ad2fe330-f201-4a05-ab3f-71348d2d007b" name="Default" comment="">
8
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
8
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
9
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
10
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/controller/CommController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/controller/CommController.java" afterDir="false" />
11
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/APIUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/APIUtil.java" afterDir="false" />
12
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/CarDetect.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/CarDetect.java" afterDir="false" />
13
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/HikService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/HikService.java" afterDir="false" />
14
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/PersonDetect.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/PersonDetect.java" afterDir="false" />
15
       <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
9
       <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
16
     </list>
10
     </list>
17
     <ignored path="$PROJECT_DIR$/out/" />
11
     <ignored path="$PROJECT_DIR$/out/" />
18
     <ignored path="$PROJECT_DIR$/target/" />
12
     <ignored path="$PROJECT_DIR$/target/" />
19
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
13
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
20
-    <option name="TRACKING_ENABLED" value="true" />
21
     <option name="SHOW_DIALOG" value="false" />
14
     <option name="SHOW_DIALOG" value="false" />
22
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
15
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
23
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
16
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
75
         </counts>
68
         </counts>
76
       </usages-collector>
69
       </usages-collector>
77
     </session>
70
     </session>
71
+    <session id="-280456795">
72
+      <usages-collector id="statistics.lifecycle.project">
73
+        <counts>
74
+          <entry key="project.open.time.2" value="1" />
75
+          <entry key="project.opened" value="1" />
76
+        </counts>
77
+      </usages-collector>
78
+      <usages-collector id="statistics.file.extensions.edit">
79
+        <counts>
80
+          <entry key="properties" value="19" />
81
+        </counts>
82
+      </usages-collector>
83
+      <usages-collector id="statistics.file.types.edit">
84
+        <counts>
85
+          <entry key="Properties" value="19" />
86
+        </counts>
87
+      </usages-collector>
88
+    </session>
78
   </component>
89
   </component>
79
   <component name="FileEditorManager">
90
   <component name="FileEditorManager">
80
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
91
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
81
-      <file leaf-file-name="application.properties" pinned="false" current-in-tab="false">
92
+      <file pinned="false" current-in-tab="false">
82
         <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
93
         <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
83
           <provider selected="true" editor-type-id="text-editor">
94
           <provider selected="true" editor-type-id="text-editor">
84
-            <state relative-caret-position="252">
85
-              <caret line="12" column="12" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="12" />
95
+            <state relative-caret-position="469">
96
+              <caret line="27" column="37" selection-start-line="27" selection-start-column="37" selection-end-line="27" selection-end-column="37" />
86
             </state>
97
             </state>
87
           </provider>
98
           </provider>
88
         </entry>
99
         </entry>
89
       </file>
100
       </file>
90
-      <file leaf-file-name="PersonDetect.java" pinned="false" current-in-tab="false">
101
+      <file pinned="false" current-in-tab="false">
91
         <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/PersonDetect.java">
102
         <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/PersonDetect.java">
92
           <provider selected="true" editor-type-id="text-editor">
103
           <provider selected="true" editor-type-id="text-editor">
93
-            <state relative-caret-position="840">
104
+            <state relative-caret-position="760">
94
               <caret line="51" column="132" selection-start-line="51" selection-start-column="132" selection-end-line="51" selection-end-column="132" />
105
               <caret line="51" column="132" selection-start-line="51" selection-start-column="132" selection-end-line="51" selection-end-column="132" />
95
             </state>
106
             </state>
96
           </provider>
107
           </provider>
97
         </entry>
108
         </entry>
98
       </file>
109
       </file>
99
-      <file leaf-file-name="HikService.java" pinned="false" current-in-tab="false">
110
+      <file pinned="false" current-in-tab="false">
100
         <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/HikService.java">
111
         <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/HikService.java">
101
           <provider selected="true" editor-type-id="text-editor">
112
           <provider selected="true" editor-type-id="text-editor">
102
-            <state relative-caret-position="455">
103
-              <caret line="313" column="60" lean-forward="true" selection-start-line="313" selection-start-column="60" selection-end-line="313" selection-end-column="60" />
104
-              <folding>
105
-                <element signature="imports" expanded="true" />
106
-              </folding>
113
+            <state relative-caret-position="362">
114
+              <caret line="28" selection-start-line="28" selection-end-line="28" />
107
             </state>
115
             </state>
108
           </provider>
116
           </provider>
109
         </entry>
117
         </entry>
110
       </file>
118
       </file>
111
-      <file leaf-file-name="APIUtil.java" pinned="false" current-in-tab="true">
119
+      <file pinned="false" current-in-tab="true">
112
         <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/APIUtil.java">
120
         <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/APIUtil.java">
113
           <provider selected="true" editor-type-id="text-editor">
121
           <provider selected="true" editor-type-id="text-editor">
114
-            <state relative-caret-position="340">
115
-              <caret line="173" lean-forward="true" selection-start-line="173" selection-end-line="173" />
122
+            <state relative-caret-position="85">
123
+              <caret line="67" selection-start-line="67" selection-end-line="67" />
116
             </state>
124
             </state>
117
           </provider>
125
           </provider>
118
         </entry>
126
         </entry>
119
       </file>
127
       </file>
120
-      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
128
+      <file pinned="false" current-in-tab="false">
121
         <entry file="file://$PROJECT_DIR$/pom.xml">
129
         <entry file="file://$PROJECT_DIR$/pom.xml">
122
           <provider selected="true" editor-type-id="text-editor">
130
           <provider selected="true" editor-type-id="text-editor">
123
-            <state relative-caret-position="273">
131
+            <state relative-caret-position="1615">
124
               <caret line="85" selection-start-line="85" selection-end-line="85" />
132
               <caret line="85" selection-start-line="85" selection-end-line="85" />
125
             </state>
133
             </state>
126
           </provider>
134
           </provider>
127
         </entry>
135
         </entry>
128
       </file>
136
       </file>
129
-      <file leaf-file-name="HCNetSDK.java" pinned="false" current-in-tab="false">
137
+      <file pinned="false" current-in-tab="false">
130
         <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java">
138
         <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java">
131
           <provider selected="true" editor-type-id="text-editor">
139
           <provider selected="true" editor-type-id="text-editor">
132
-            <state relative-caret-position="269">
140
+            <state relative-caret-position="63137">
133
               <caret line="3354" column="34" selection-start-line="3354" selection-start-column="23" selection-end-line="3354" selection-end-column="34" />
141
               <caret line="3354" column="34" selection-start-line="3354" selection-start-column="23" selection-end-line="3354" selection-end-column="34" />
134
             </state>
142
             </state>
135
           </provider>
143
           </provider>
136
         </entry>
144
         </entry>
137
       </file>
145
       </file>
138
-      <file leaf-file-name="NativeString.java" pinned="false" current-in-tab="false">
146
+      <file pinned="false" current-in-tab="false">
139
         <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/NativeString.java">
147
         <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/NativeString.java">
140
           <provider selected="true" editor-type-id="text-editor">
148
           <provider selected="true" editor-type-id="text-editor">
141
-            <state relative-caret-position="504">
149
+            <state relative-caret-position="1159">
142
               <caret line="65" selection-start-line="65" selection-end-line="65" />
150
               <caret line="65" selection-start-line="65" selection-end-line="65" />
143
               <folding>
151
               <folding>
144
                 <element signature="imports" expanded="true" />
152
                 <element signature="imports" expanded="true" />
147
           </provider>
155
           </provider>
148
         </entry>
156
         </entry>
149
       </file>
157
       </file>
150
-      <file leaf-file-name="Configer.java" pinned="false" current-in-tab="false">
158
+      <file pinned="false" current-in-tab="false">
151
         <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/Configer.java">
159
         <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/Configer.java">
152
           <provider selected="true" editor-type-id="text-editor">
160
           <provider selected="true" editor-type-id="text-editor">
153
-            <state relative-caret-position="147">
161
+            <state relative-caret-position="133">
154
               <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
162
               <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
155
             </state>
163
             </state>
156
           </provider>
164
           </provider>
157
         </entry>
165
         </entry>
158
       </file>
166
       </file>
159
-      <file leaf-file-name="WSServer.java" pinned="false" current-in-tab="false">
167
+      <file pinned="false" current-in-tab="false">
160
         <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/WSServer.java">
168
         <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/WSServer.java">
161
           <provider selected="true" editor-type-id="text-editor">
169
           <provider selected="true" editor-type-id="text-editor">
162
-            <state relative-caret-position="2079">
170
+            <state relative-caret-position="1881">
163
               <caret line="109" column="30" selection-start-line="109" selection-start-column="18" selection-end-line="109" selection-end-column="30" />
171
               <caret line="109" column="30" selection-start-line="109" selection-start-column="18" selection-end-line="109" selection-end-column="30" />
164
             </state>
172
             </state>
165
           </provider>
173
           </provider>
166
         </entry>
174
         </entry>
167
       </file>
175
       </file>
168
-      <file leaf-file-name="CommController.java" pinned="false" current-in-tab="false">
176
+      <file pinned="false" current-in-tab="false">
169
         <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/controller/CommController.java">
177
         <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/controller/CommController.java">
170
           <provider selected="true" editor-type-id="text-editor">
178
           <provider selected="true" editor-type-id="text-editor">
171
-            <state relative-caret-position="189">
179
+            <state relative-caret-position="1140">
172
               <caret line="60" selection-start-line="60" selection-end-line="60" />
180
               <caret line="60" selection-start-line="60" selection-end-line="60" />
173
               <folding>
181
               <folding>
174
                 <element signature="imports" expanded="true" />
182
                 <element signature="imports" expanded="true" />
279
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HIKSupplement.java" />
287
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HIKSupplement.java" />
280
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/CarDetect.java" />
288
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/CarDetect.java" />
281
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/PersonDetect.java" />
289
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/PersonDetect.java" />
282
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
283
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/NativeString.java" />
290
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/NativeString.java" />
284
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/controller/CommController.java" />
291
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/controller/CommController.java" />
285
         <option value="$PROJECT_DIR$/pom.xml" />
292
         <option value="$PROJECT_DIR$/pom.xml" />
286
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/HikService.java" />
293
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/HikService.java" />
287
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/APIUtil.java" />
294
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/APIUtil.java" />
295
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
288
       </list>
296
       </list>
289
     </option>
297
     </option>
290
   </component>
298
   </component>
297
   <component name="MavenImportPreferences">
305
   <component name="MavenImportPreferences">
298
     <option name="generalSettings">
306
     <option name="generalSettings">
299
       <MavenGeneralSettings>
307
       <MavenGeneralSettings>
300
-        <option name="mavenHome" value="E:/apache-maven-3.5.4" />
301
-        <option name="userSettingsFile" value="E:\apache-maven-3.5.4\conf\settings.xml" />
308
+        <option name="mavenHome" value="d:/apache-maven-3.5.4" />
309
+        <option name="userSettingsFile" value="d:\apache-maven-3.5.4\conf\settings.xml" />
302
       </MavenGeneralSettings>
310
       </MavenGeneralSettings>
303
     </option>
311
     </option>
304
     <option name="importingSettings">
312
     <option name="importingSettings">
328
       <select />
336
       <select />
329
     </treeState>
337
     </treeState>
330
   </component>
338
   </component>
331
-  <component name="NodePackageJsonFileManager">
332
-    <packageJsonPaths />
333
-  </component>
334
-  <component name="ProjectFrameBounds" extendedState="7">
339
+  <component name="ProjectFrameBounds" extendedState="6">
335
     <option name="x" value="-10" />
340
     <option name="x" value="-10" />
336
-    <option name="width" value="2585" />
337
-    <option name="height" value="1465" />
341
+    <option name="width" value="1943" />
342
+    <option name="height" value="1103" />
338
   </component>
343
   </component>
339
   <component name="ProjectLevelVcsManager">
344
   <component name="ProjectLevelVcsManager">
340
     <ConfirmationsSetting value="1" id="Add" />
345
     <ConfirmationsSetting value="1" id="Add" />
344
       <foldersAlwaysOnTop value="true" />
349
       <foldersAlwaysOnTop value="true" />
345
     </navigator>
350
     </navigator>
346
     <panes>
351
     <panes>
352
+      <pane id="Scope" />
353
+      <pane id="PackagesPane" />
347
       <pane id="ProjectPane">
354
       <pane id="ProjectPane">
348
         <subPane>
355
         <subPane>
349
           <expand>
356
           <expand>
350
             <path>
357
             <path>
351
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
358
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
352
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
353
-            </path>
354
-            <path>
355
-              <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
356
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
357
-              <item name="src" type="462c0819:PsiDirectoryNode" />
358
-            </path>
359
-            <path>
360
-              <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
361
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
362
-              <item name="src" type="462c0819:PsiDirectoryNode" />
363
-              <item name="main" type="462c0819:PsiDirectoryNode" />
364
-            </path>
365
-            <path>
366
-              <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
367
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
368
-              <item name="src" type="462c0819:PsiDirectoryNode" />
369
-              <item name="main" type="462c0819:PsiDirectoryNode" />
370
-              <item name="java" type="462c0819:PsiDirectoryNode" />
371
-            </path>
372
-            <path>
373
-              <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
374
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
375
-              <item name="src" type="462c0819:PsiDirectoryNode" />
376
-              <item name="main" type="462c0819:PsiDirectoryNode" />
377
-              <item name="java" type="462c0819:PsiDirectoryNode" />
378
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
379
-            </path>
380
-            <path>
381
-              <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
382
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
383
-              <item name="src" type="462c0819:PsiDirectoryNode" />
384
-              <item name="main" type="462c0819:PsiDirectoryNode" />
385
-              <item name="java" type="462c0819:PsiDirectoryNode" />
386
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
387
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
388
-            </path>
389
-            <path>
390
-              <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
391
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
392
-              <item name="src" type="462c0819:PsiDirectoryNode" />
393
-              <item name="main" type="462c0819:PsiDirectoryNode" />
394
-              <item name="java" type="462c0819:PsiDirectoryNode" />
395
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
396
-              <item name="hik" type="462c0819:PsiDirectoryNode" />
359
+              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
397
             </path>
360
             </path>
398
             <path>
361
             <path>
399
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
362
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
400
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
363
+              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
401
               <item name="src" type="462c0819:PsiDirectoryNode" />
364
               <item name="src" type="462c0819:PsiDirectoryNode" />
402
-              <item name="main" type="462c0819:PsiDirectoryNode" />
403
-              <item name="java" type="462c0819:PsiDirectoryNode" />
404
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
405
-              <item name="libs" type="462c0819:PsiDirectoryNode" />
406
             </path>
365
             </path>
407
             <path>
366
             <path>
408
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
367
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
409
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
368
+              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
410
               <item name="src" type="462c0819:PsiDirectoryNode" />
369
               <item name="src" type="462c0819:PsiDirectoryNode" />
411
               <item name="main" type="462c0819:PsiDirectoryNode" />
370
               <item name="main" type="462c0819:PsiDirectoryNode" />
412
-              <item name="java" type="462c0819:PsiDirectoryNode" />
413
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
414
-              <item name="service" type="462c0819:PsiDirectoryNode" />
415
             </path>
371
             </path>
416
             <path>
372
             <path>
417
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
373
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
418
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
419
-              <item name="src" type="462c0819:PsiDirectoryNode" />
420
-              <item name="main" type="462c0819:PsiDirectoryNode" />
421
-              <item name="java" type="462c0819:PsiDirectoryNode" />
422
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
423
-              <item name="websocket" type="462c0819:PsiDirectoryNode" />
424
-            </path>
425
-            <path>
426
-              <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
427
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
374
+              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
428
               <item name="src" type="462c0819:PsiDirectoryNode" />
375
               <item name="src" type="462c0819:PsiDirectoryNode" />
429
               <item name="main" type="462c0819:PsiDirectoryNode" />
376
               <item name="main" type="462c0819:PsiDirectoryNode" />
430
               <item name="resources" type="462c0819:PsiDirectoryNode" />
377
               <item name="resources" type="462c0819:PsiDirectoryNode" />
433
           <select />
380
           <select />
434
         </subPane>
381
         </subPane>
435
       </pane>
382
       </pane>
436
-      <pane id="PackagesPane" />
437
       <pane id="AndroidView" />
383
       <pane id="AndroidView" />
438
-      <pane id="Scope" />
439
     </panes>
384
     </panes>
440
   </component>
385
   </component>
441
   <component name="PropertiesComponent">
386
   <component name="PropertiesComponent">
498
           <option name="ENABLED" value="true" />
443
           <option name="ENABLED" value="true" />
499
         </pattern>
444
         </pattern>
500
       </extension>
445
       </extension>
446
+      <method v="2">
447
+        <option name="Make" enabled="true" />
448
+      </method>
501
     </configuration>
449
     </configuration>
502
     <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
450
     <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
503
       <option name="MAIN_CLASS_NAME" value="Main" />
451
       <option name="MAIN_CLASS_NAME" value="Main" />
504
       <module name="hardware" />
452
       <module name="hardware" />
505
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
453
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
454
+      <method v="2">
455
+        <option name="Make" enabled="true" />
456
+      </method>
506
     </configuration>
457
     </configuration>
507
     <configuration default="true" type="Application" factoryName="Application">
458
     <configuration default="true" type="Application" factoryName="Application">
508
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
459
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
509
-      <method>
460
+      <method v="2">
510
         <option name="Make" enabled="true" />
461
         <option name="Make" enabled="true" />
511
       </method>
462
       </method>
512
     </configuration>
463
     </configuration>
513
     <configuration default="true" type="JUnit" factoryName="JUnit">
464
     <configuration default="true" type="JUnit" factoryName="JUnit">
514
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
515
-      <option name="ALTERNATIVE_JRE_PATH" />
516
-      <option name="PACKAGE_NAME" />
517
-      <option name="MAIN_CLASS_NAME" />
518
-      <option name="METHOD_NAME" />
519
-      <option name="TEST_OBJECT" value="class" />
520
       <option name="VM_PARAMETERS" />
465
       <option name="VM_PARAMETERS" />
521
-      <option name="PARAMETERS" />
522
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
466
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
523
-      <option name="PASS_PARENT_ENVS" value="true" />
524
-      <option name="TEST_SEARCH_SCOPE">
525
-        <value defaultName="singleModule" />
526
-      </option>
527
-      <patterns />
528
-      <method>
467
+      <method v="2">
529
         <option name="Make" enabled="true" />
468
         <option name="Make" enabled="true" />
530
       </method>
469
       </method>
531
     </configuration>
470
     </configuration>
532
     <configuration name="HardwareApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
471
     <configuration name="HardwareApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
533
       <module name="hardware" />
472
       <module name="hardware" />
534
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.huiju.welcome.hardware.HardwareApplication" />
473
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.huiju.welcome.hardware.HardwareApplication" />
474
+      <method v="2">
475
+        <option name="Make" enabled="true" />
476
+      </method>
535
     </configuration>
477
     </configuration>
536
     <configuration default="true" type="TestNG" factoryName="TestNG">
478
     <configuration default="true" type="TestNG" factoryName="TestNG">
537
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
538
-      <option name="ALTERNATIVE_JRE_PATH" />
539
-      <option name="SUITE_NAME" />
540
-      <option name="PACKAGE_NAME" />
541
-      <option name="MAIN_CLASS_NAME" />
542
-      <option name="METHOD_NAME" />
543
-      <option name="GROUP_NAME" />
544
-      <option name="TEST_OBJECT" value="CLASS" />
545
       <option name="VM_PARAMETERS" />
479
       <option name="VM_PARAMETERS" />
546
-      <option name="PARAMETERS" />
547
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
480
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
548
-      <option name="OUTPUT_DIRECTORY" />
549
-      <option name="PASS_PARENT_ENVS" value="true" />
550
-      <option name="TEST_SEARCH_SCOPE">
551
-        <value defaultName="singleModule" />
552
-      </option>
553
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
554
-      <option name="PROPERTIES_FILE" />
555
       <properties />
481
       <properties />
556
       <listeners />
482
       <listeners />
557
-      <method>
483
+      <method v="2">
558
         <option name="Make" enabled="true" />
484
         <option name="Make" enabled="true" />
559
       </method>
485
       </method>
560
     </configuration>
486
     </configuration>
602
       <workItem from="1561343515369" duration="21976000" />
528
       <workItem from="1561343515369" duration="21976000" />
603
       <workItem from="1561451112799" duration="21614000" />
529
       <workItem from="1561451112799" duration="21614000" />
604
       <workItem from="1561692194101" duration="15054000" />
530
       <workItem from="1561692194101" duration="15054000" />
531
+      <workItem from="1561966477428" duration="1871000" />
605
     </task>
532
     </task>
606
     <servers />
533
     <servers />
607
   </component>
534
   </component>
608
   <component name="TimeTrackingManager">
535
   <component name="TimeTrackingManager">
609
-    <option name="totallyTimeSpent" value="262225000" />
536
+    <option name="totallyTimeSpent" value="264096000" />
610
   </component>
537
   </component>
611
   <component name="ToolWindowManager">
538
   <component name="ToolWindowManager">
612
-    <frame x="-8" y="-8" width="1936" height="1015" extended-state="7" />
613
-    <editor active="true" />
539
+    <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
614
     <layout>
540
     <layout>
615
-      <window_info anchor="right" id="Palette" order="3" />
616
-      <window_info anchor="bottom" id="Event Log" order="8" sideWeight="0.500998" side_tool="true" weight="0.35500515" />
617
-      <window_info anchor="right" id="Maven Projects" order="7" weight="0.04424307" />
618
-      <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
619
-      <window_info id="Capture Tool" order="6" />
620
-      <window_info id="Designer" order="2" />
621
-      <window_info anchor="right" id="Database" order="8" weight="0.3291506" />
541
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49918962" visible="true" weight="0.31769437" />
622
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
542
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
623
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
624
-      <window_info id="UI Designer" order="4" />
625
-      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.499002" visible="true" weight="0.5461802" />
626
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32920536" />
627
-      <window_info anchor="bottom" id="Messages" order="9" sideWeight="0.499501" weight="0.336374" />
628
-      <window_info anchor="right" id="Palette&#9;" order="9" />
543
+      <window_info id="Designer" order="2" />
629
       <window_info id="Image Layers" order="3" />
544
       <window_info id="Image Layers" order="3" />
630
-      <window_info anchor="bottom" id="Java Enterprise" order="13" weight="0.32920536" />
631
-      <window_info anchor="right" id="Capture Analysis" order="6" />
632
-      <window_info anchor="bottom" id="Run" order="2" weight="0.22234891" />
633
-      <window_info anchor="bottom" id="Version Control" order="11" weight="0.32920536" />
634
-      <window_info anchor="bottom" id="Spring" order="12" />
635
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.22234891" />
636
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49918962" visible="true" weight="0.23614073" />
637
-      <window_info anchor="right" id="Bean Validation" order="12" weight="0.32995737" />
638
-      <window_info id="Web" order="7" sideWeight="0.5008104" side_tool="true" weight="0.23353294" />
639
-      <window_info anchor="right" id="Theme Preview" order="10" />
545
+      <window_info id="UI Designer" order="4" />
640
       <window_info id="Favorites" order="5" side_tool="true" />
546
       <window_info id="Favorites" order="5" side_tool="true" />
641
-      <window_info anchor="right" id="Flutter Inspector" order="4" />
642
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
643
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
644
-      <window_info anchor="bottom" id="Flutter Performance" order="7" side_tool="true" />
547
+      <window_info id="Capture Tool" order="6" />
548
+      <window_info id="Web" order="7" sideWeight="0.5008104" side_tool="true" weight="0.23353294" />
645
       <window_info anchor="bottom" id="Message" order="0" />
549
       <window_info anchor="bottom" id="Message" order="0" />
550
+      <window_info anchor="bottom" id="Find" order="1" weight="0.3295325" />
551
+      <window_info anchor="bottom" id="Run" order="2" weight="0.22234891" />
552
+      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.499002" visible="true" weight="0.54545456" />
646
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
553
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
647
-      <window_info anchor="right" id="Flutter Outline" order="5" />
554
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
555
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.32920536" />
556
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.22234891" />
557
+      <window_info anchor="bottom" id="Flutter Performance" order="8" side_tool="true" />
558
+      <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.500998" side_tool="true" weight="0.35500515" />
559
+      <window_info anchor="bottom" id="Messages" order="10" sideWeight="0.499501" weight="0.33577713" />
560
+      <window_info anchor="bottom" id="Database Changes" order="11" show_stripe_button="false" />
561
+      <window_info anchor="bottom" id="Version Control" order="12" weight="0.32920536" />
562
+      <window_info anchor="bottom" id="Spring" order="13" />
563
+      <window_info anchor="bottom" id="Java Enterprise" order="14" weight="0.32920536" />
564
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
565
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
648
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
566
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
649
-      <window_info anchor="bottom" id="Find" order="1" weight="0.3295325" />
567
+      <window_info anchor="right" id="Palette" order="3" />
568
+      <window_info anchor="right" id="Flutter Inspector" order="4" />
569
+      <window_info anchor="right" id="Flutter Outline" order="5" />
570
+      <window_info anchor="right" id="Capture Analysis" order="6" />
571
+      <window_info anchor="right" id="Maven Projects" order="7" weight="0.04424307" />
572
+      <window_info anchor="right" id="Database" order="8" weight="0.3291506" />
573
+      <window_info anchor="right" id="Palette&#9;" order="9" />
574
+      <window_info anchor="right" id="Theme Preview" order="10" />
650
       <window_info anchor="right" id="Coverage" order="11" side_tool="true" weight="0.32995737" />
575
       <window_info anchor="right" id="Coverage" order="11" side_tool="true" weight="0.32995737" />
576
+      <window_info anchor="right" id="Bean Validation" order="12" weight="0.32995737" />
651
     </layout>
577
     </layout>
652
     <layout-to-restore>
578
     <layout-to-restore>
579
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17377399" />
580
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
653
       <window_info id="Designer" order="2" />
581
       <window_info id="Designer" order="2" />
654
-      <window_info anchor="right" id="Palette" order="3" />
655
-      <window_info anchor="bottom" id="Spring" order="12" />
656
       <window_info id="Image Layers" order="3" />
582
       <window_info id="Image Layers" order="3" />
657
-      <window_info anchor="bottom" id="Run" order="2" weight="0.22234891" />
658
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
659
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
660
       <window_info id="UI Designer" order="4" />
583
       <window_info id="UI Designer" order="4" />
661
       <window_info id="Favorites" order="5" side_tool="true" />
584
       <window_info id="Favorites" order="5" side_tool="true" />
662
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.22348917" />
663
       <window_info id="Capture Tool" order="6" />
585
       <window_info id="Capture Tool" order="6" />
664
-      <window_info anchor="right" id="Capture Analysis" order="4" />
665
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
666
-      <window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
667
-      <window_info anchor="bottom" id="Messages" order="11" />
586
+      <window_info id="Web" order="7" side_tool="true" />
587
+      <window_info anchor="bottom" id="Message" order="0" />
588
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32964474" />
589
+      <window_info anchor="bottom" id="Run" order="2" weight="0.22234891" />
590
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.41619155" />
591
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
592
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
668
       <window_info anchor="bottom" id="TODO" order="6" />
593
       <window_info anchor="bottom" id="TODO" order="6" />
669
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
670
-      <window_info anchor="bottom" id="Java Enterprise" order="13" />
594
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.22348917" />
595
+      <window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
671
       <window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
596
       <window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
672
       <window_info anchor="bottom" id="Version Control" order="10" />
597
       <window_info anchor="bottom" id="Version Control" order="10" />
673
-      <window_info anchor="right" id="Maven Projects" order="6" visible="true" weight="0.04424307" />
674
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17377399" />
598
+      <window_info anchor="bottom" id="Messages" order="11" />
599
+      <window_info anchor="bottom" id="Spring" order="12" />
600
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
601
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
602
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
603
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
604
+      <window_info anchor="right" id="Palette" order="3" />
605
+      <window_info anchor="right" id="Capture Analysis" order="4" />
675
       <window_info anchor="right" id="Database" order="5" weight="0.3291506" />
606
       <window_info anchor="right" id="Database" order="5" weight="0.3291506" />
676
-      <window_info anchor="bottom" id="Message" order="0" />
677
-      <window_info id="Web" order="7" side_tool="true" />
607
+      <window_info anchor="right" id="Maven Projects" order="6" visible="true" weight="0.04424307" />
678
       <window_info anchor="right" id="Palette&#9;" order="7" />
608
       <window_info anchor="right" id="Palette&#9;" order="7" />
679
       <window_info anchor="right" id="Theme Preview" order="8" />
609
       <window_info anchor="right" id="Theme Preview" order="8" />
680
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
681
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
682
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32964474" />
683
       <window_info anchor="right" id="Bean Validation" order="9" />
610
       <window_info anchor="right" id="Bean Validation" order="9" />
684
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.41619155" />
685
     </layout-to-restore>
611
     </layout-to-restore>
686
   </component>
612
   </component>
687
   <component name="TypeScriptGeneratedFilesManager">
613
   <component name="TypeScriptGeneratedFilesManager">
690
   <component name="VcsContentAnnotationSettings">
616
   <component name="VcsContentAnnotationSettings">
691
     <option name="myLimit" value="2678400000" />
617
     <option name="myLimit" value="2678400000" />
692
   </component>
618
   </component>
693
-  <component name="XDebuggerManager">
694
-    <breakpoint-manager>
695
-      <option name="time" value="17" />
696
-    </breakpoint-manager>
697
-  </component>
698
   <component name="antWorkspaceConfiguration">
619
   <component name="antWorkspaceConfiguration">
699
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
620
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
700
     <option name="FILTER_TARGETS" value="false" />
621
     <option name="FILTER_TARGETS" value="false" />
728
         </state>
649
         </state>
729
       </provider>
650
       </provider>
730
     </entry>
651
     </entry>
731
-    <entry file="jar://D:/REPO/org/springframework/spring-web/5.1.6.RELEASE/spring-web-5.1.6.RELEASE.jar!/org/springframework/http/HttpStatus.class">
732
-      <provider selected="true" editor-type-id="text-editor">
733
-        <state relative-caret-position="609">
734
-          <caret line="98" column="5" selection-start-line="98" selection-start-column="5" selection-end-line="98" selection-end-column="5" />
735
-        </state>
736
-      </provider>
737
-    </entry>
738
-    <entry file="jar://D:/Application/jdk1.8.0_161/src.zip!/java/io/FileInputStream.java">
739
-      <provider selected="true" editor-type-id="text-editor">
740
-        <state relative-caret-position="163">
741
-          <caret line="254" selection-start-line="254" selection-end-line="254" />
742
-        </state>
743
-      </provider>
744
-    </entry>
745
-    <entry file="jar://D:/Application/jdk1.8.0_161/src.zip!/java/util/concurrent/CountDownLatch.java">
746
-      <provider selected="true" editor-type-id="text-editor">
747
-        <state relative-caret-position="330">
748
-          <caret line="229" column="16" selection-start-line="229" selection-start-column="16" selection-end-line="229" selection-end-column="16" />
749
-        </state>
750
-      </provider>
751
-    </entry>
652
+    <entry file="jar://D:/REPO/org/springframework/spring-web/5.1.6.RELEASE/spring-web-5.1.6.RELEASE.jar!/org/springframework/http/HttpStatus.class" />
653
+    <entry file="jar://D:/Application/jdk1.8.0_161/src.zip!/java/io/FileInputStream.java" />
654
+    <entry file="jar://D:/Application/jdk1.8.0_161/src.zip!/java/util/concurrent/CountDownLatch.java" />
752
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/ISubcriber.java">
655
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/ISubcriber.java">
753
       <provider selected="true" editor-type-id="text-editor">
656
       <provider selected="true" editor-type-id="text-editor">
754
         <state relative-caret-position="84">
657
         <state relative-caret-position="84">
768
       <provider selected="true" editor-type-id="text-editor">
671
       <provider selected="true" editor-type-id="text-editor">
769
         <state relative-caret-position="756">
672
         <state relative-caret-position="756">
770
           <caret line="40" selection-start-line="40" selection-end-line="40" />
673
           <caret line="40" selection-start-line="40" selection-end-line="40" />
771
-          <folding>
772
-            <element signature="imports" expanded="true" />
773
-          </folding>
774
         </state>
674
         </state>
775
       </provider>
675
       </provider>
776
     </entry>
676
     </entry>
785
         </state>
685
         </state>
786
       </provider>
686
       </provider>
787
     </entry>
687
     </entry>
788
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/CarDetect.java">
789
-      <provider selected="true" editor-type-id="text-editor">
790
-        <state relative-caret-position="93">
791
-          <caret line="35" lean-forward="true" selection-start-line="35" selection-end-line="35" />
792
-        </state>
793
-      </provider>
794
-    </entry>
795
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/Ping.java">
796
-      <provider selected="true" editor-type-id="text-editor">
797
-        <state relative-caret-position="127">
798
-          <caret line="12" column="25" selection-start-line="12" selection-start-column="18" selection-end-line="12" selection-end-column="25" />
799
-        </state>
800
-      </provider>
801
-    </entry>
802
-    <entry file="jar://D:/REPO/com/alibaba/fastjson/1.2.56/fastjson-1.2.56.jar!/com/alibaba/fastjson/JSON.class">
803
-      <provider selected="true" editor-type-id="text-editor">
804
-        <state relative-caret-position="-1520">
805
-          <caret line="168" column="40" selection-start-line="168" selection-start-column="29" selection-end-line="168" selection-end-column="40" />
806
-        </state>
807
-      </provider>
808
-    </entry>
809
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HIKSupplement.java">
810
-      <provider selected="true" editor-type-id="text-editor">
811
-        <state relative-caret-position="147">
812
-          <caret line="7" column="28" selection-start-line="7" selection-start-column="28" selection-end-line="7" selection-end-column="28" />
813
-          <folding>
814
-            <element signature="imports" expanded="true" />
815
-          </folding>
816
-        </state>
817
-      </provider>
818
-    </entry>
819
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/HardwareApplication.java">
688
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/HardwareApplication.java">
820
       <provider selected="true" editor-type-id="text-editor">
689
       <provider selected="true" editor-type-id="text-editor">
821
         <state relative-caret-position="357">
690
         <state relative-caret-position="357">
823
         </state>
692
         </state>
824
       </provider>
693
       </provider>
825
     </entry>
694
     </entry>
826
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java">
827
-      <provider selected="true" editor-type-id="text-editor">
828
-        <state relative-caret-position="231">
829
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
830
-        </state>
831
-      </provider>
832
-    </entry>
833
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/Ping.java">
695
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/Ping.java">
834
       <provider selected="true" editor-type-id="text-editor">
696
       <provider selected="true" editor-type-id="text-editor">
835
         <state relative-caret-position="108">
697
         <state relative-caret-position="108">
837
         </state>
699
         </state>
838
       </provider>
700
       </provider>
839
     </entry>
701
     </entry>
840
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/config/InitService.java">
841
-      <provider selected="true" editor-type-id="text-editor">
842
-        <state relative-caret-position="-210">
843
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
844
-          <folding>
845
-            <element signature="imports" expanded="true" />
846
-          </folding>
847
-        </state>
848
-      </provider>
849
-    </entry>
850
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/config/WebSocketConfig.java">
702
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/config/WebSocketConfig.java">
851
       <provider selected="true" editor-type-id="text-editor">
703
       <provider selected="true" editor-type-id="text-editor">
852
         <state relative-caret-position="189">
704
         <state relative-caret-position="189">
895
         </state>
747
         </state>
896
       </provider>
748
       </provider>
897
     </entry>
749
     </entry>
750
+    <entry file="jar://D:/Application/jdk1.8.0_161/jre/lib/ext/nashorn.jar!/jdk/nashorn/internal/objects/NativeString.class" />
751
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.6.RELEASE/spring-web-5.1.6.RELEASE.jar!/org/springframework/web/method/support/InvocableHandlerMethod.class" />
898
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/PersonDetect.java">
752
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/PersonDetect.java">
899
       <provider selected="true" editor-type-id="text-editor">
753
       <provider selected="true" editor-type-id="text-editor">
900
-        <state relative-caret-position="840">
754
+        <state relative-caret-position="760">
901
           <caret line="51" column="132" selection-start-line="51" selection-start-column="132" selection-end-line="51" selection-end-column="132" />
755
           <caret line="51" column="132" selection-start-line="51" selection-start-column="132" selection-end-line="51" selection-end-column="132" />
902
         </state>
756
         </state>
903
       </provider>
757
       </provider>
904
     </entry>
758
     </entry>
905
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/WSServer.java">
906
-      <provider selected="true" editor-type-id="text-editor">
907
-        <state relative-caret-position="2079">
908
-          <caret line="109" column="30" selection-start-line="109" selection-start-column="18" selection-end-line="109" selection-end-column="30" />
909
-        </state>
910
-      </provider>
911
-    </entry>
912
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/Configer.java">
913
-      <provider selected="true" editor-type-id="text-editor">
914
-        <state relative-caret-position="147">
915
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
916
-        </state>
917
-      </provider>
918
-    </entry>
919
-    <entry file="jar://D:/Application/jdk1.8.0_161/jre/lib/ext/nashorn.jar!/jdk/nashorn/internal/objects/NativeString.class">
759
+    <entry file="file://$PROJECT_DIR$/pom.xml">
920
       <provider selected="true" editor-type-id="text-editor">
760
       <provider selected="true" editor-type-id="text-editor">
921
-        <state relative-caret-position="861">
922
-          <caret line="46" column="4" selection-start-line="46" selection-start-column="4" selection-end-line="46" selection-end-column="4" />
761
+        <state relative-caret-position="1615">
762
+          <caret line="85" selection-start-line="85" selection-end-line="85" />
923
         </state>
763
         </state>
924
       </provider>
764
       </provider>
925
     </entry>
765
     </entry>
926
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
766
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java">
927
       <provider selected="true" editor-type-id="text-editor">
767
       <provider selected="true" editor-type-id="text-editor">
928
-        <state relative-caret-position="252">
929
-          <caret line="12" column="12" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="12" />
768
+        <state relative-caret-position="63137">
769
+          <caret line="3354" column="34" selection-start-line="3354" selection-start-column="23" selection-end-line="3354" selection-end-column="34" />
930
         </state>
770
         </state>
931
       </provider>
771
       </provider>
932
     </entry>
772
     </entry>
933
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/NativeString.java">
773
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/NativeString.java">
934
       <provider selected="true" editor-type-id="text-editor">
774
       <provider selected="true" editor-type-id="text-editor">
935
-        <state relative-caret-position="504">
775
+        <state relative-caret-position="1159">
936
           <caret line="65" selection-start-line="65" selection-end-line="65" />
776
           <caret line="65" selection-start-line="65" selection-end-line="65" />
937
           <folding>
777
           <folding>
938
             <element signature="imports" expanded="true" />
778
             <element signature="imports" expanded="true" />
940
         </state>
780
         </state>
941
       </provider>
781
       </provider>
942
     </entry>
782
     </entry>
943
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java">
944
-      <provider selected="true" editor-type-id="text-editor">
945
-        <state relative-caret-position="269">
946
-          <caret line="3354" column="34" selection-start-line="3354" selection-start-column="23" selection-end-line="3354" selection-end-column="34" />
947
-        </state>
948
-      </provider>
949
-    </entry>
950
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.6.RELEASE/spring-web-5.1.6.RELEASE.jar!/org/springframework/web/method/support/InvocableHandlerMethod.class">
783
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/Configer.java">
951
       <provider selected="true" editor-type-id="text-editor">
784
       <provider selected="true" editor-type-id="text-editor">
952
-        <state relative-caret-position="65">
953
-          <caret line="108" selection-start-line="108" selection-end-line="108" />
785
+        <state relative-caret-position="133">
786
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
954
         </state>
787
         </state>
955
       </provider>
788
       </provider>
956
     </entry>
789
     </entry>
957
-    <entry file="file://$PROJECT_DIR$/pom.xml">
790
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/WSServer.java">
958
       <provider selected="true" editor-type-id="text-editor">
791
       <provider selected="true" editor-type-id="text-editor">
959
-        <state relative-caret-position="273">
960
-          <caret line="85" selection-start-line="85" selection-end-line="85" />
792
+        <state relative-caret-position="1881">
793
+          <caret line="109" column="30" selection-start-line="109" selection-start-column="18" selection-end-line="109" selection-end-column="30" />
961
         </state>
794
         </state>
962
       </provider>
795
       </provider>
963
     </entry>
796
     </entry>
964
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/controller/CommController.java">
797
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/controller/CommController.java">
965
       <provider selected="true" editor-type-id="text-editor">
798
       <provider selected="true" editor-type-id="text-editor">
966
-        <state relative-caret-position="189">
799
+        <state relative-caret-position="1140">
967
           <caret line="60" selection-start-line="60" selection-end-line="60" />
800
           <caret line="60" selection-start-line="60" selection-end-line="60" />
968
           <folding>
801
           <folding>
969
             <element signature="imports" expanded="true" />
802
             <element signature="imports" expanded="true" />
973
     </entry>
806
     </entry>
974
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/HikService.java">
807
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/HikService.java">
975
       <provider selected="true" editor-type-id="text-editor">
808
       <provider selected="true" editor-type-id="text-editor">
976
-        <state relative-caret-position="455">
977
-          <caret line="313" column="60" lean-forward="true" selection-start-line="313" selection-start-column="60" selection-end-line="313" selection-end-column="60" />
978
-          <folding>
979
-            <element signature="imports" expanded="true" />
980
-          </folding>
809
+        <state relative-caret-position="362">
810
+          <caret line="28" selection-start-line="28" selection-end-line="28" />
811
+        </state>
812
+      </provider>
813
+    </entry>
814
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
815
+      <provider selected="true" editor-type-id="text-editor">
816
+        <state relative-caret-position="469">
817
+          <caret line="27" column="37" selection-start-line="27" selection-start-column="37" selection-end-line="27" selection-end-column="37" />
981
         </state>
818
         </state>
982
       </provider>
819
       </provider>
983
     </entry>
820
     </entry>
984
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/APIUtil.java">
821
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/APIUtil.java">
985
       <provider selected="true" editor-type-id="text-editor">
822
       <provider selected="true" editor-type-id="text-editor">
986
-        <state relative-caret-position="340">
987
-          <caret line="173" lean-forward="true" selection-start-line="173" selection-end-line="173" />
823
+        <state relative-caret-position="85">
824
+          <caret line="67" selection-start-line="67" selection-end-line="67" />
988
         </state>
825
         </state>
989
       </provider>
826
       </provider>
990
     </entry>
827
     </entry>

+ 5
- 5
src/main/resources/application.properties View File

3
 server.port=8081
3
 server.port=8081
4
 
4
 
5
 # 设备信息
5
 # 设备信息
6
-device.id=98
6
+device.id=200
7
 device.name=车辆
7
 device.name=车辆
8
 device.loginUser=admin
8
 device.loginUser=admin
9
 device.password=huiju999
9
 device.password=huiju999
10
-device.ip=192.168.0.99
10
+device.ip=10.168.1.200
11
 device.port=8000
11
 device.port=8000
12
 # 支持人脸识别 1 支持, 0 不支持
12
 # 支持人脸识别 1 支持, 0 不支持
13
-device.afr=1
13
+device.afr=0
14
 # 1-人脸识别相机,  2-车辆识别相机
14
 # 1-人脸识别相机,  2-车辆识别相机
15
-device.type=1
15
+device.type=2
16
 
16
 
17
 # 静态文件
17
 # 静态文件
18
 assets.images=
18
 assets.images=
25
 api.websocket=ws://127.0.0.1:8080/ws
25
 api.websocket=ws://127.0.0.1:8080/ws
26
 
26
 
27
 # 海康相关
27
 # 海康相关
28
-hik.dlldir=E:\\JavaProjects\\welcome3.0\\hardware\\hklib
28
+hik.dlldir=E:\\CODE\\hdware-welcome3\\hklib