freewifi 0.1.8 → 0.1.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.idea/freewifi.iml +2 -2
- data/.idea/workspace.xml +337 -152
- data/lib/freewifi/additional/additional_functions.rb +19 -0
- data/lib/freewifi/database/mongo/mongoconnector.rb +1 -1
- data/lib/freewifi/version.rb +1 -1
- data/lib/freewifi.rb +52 -21
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 7ccfed2575d31871127438ba592d6875f3a4beb4
|
|
4
|
+
data.tar.gz: 92f34f8669d80688a628d2c2db2bbd02ed3f3558
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 40373f41bc28352a37b0846a6e46bbb69276028a6a90978c52d286033221d5a9cee23394a0e237e53e9daa0712f1b820f5f50d694e38b76593ef89246402a008
|
|
7
|
+
data.tar.gz: 9b9e0ae1a47fb4334c9296e766d26dd088cc38f43ca7451f395c86d2383bd1a78d94f45a6e510b290632370819d0c65ef4fe11733b6f510c4669300c603dc051
|
data/.idea/freewifi.iml
CHANGED
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
<RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
|
|
59
59
|
<method />
|
|
60
60
|
</configuration>
|
|
61
|
-
<configuration default="false" name="additional_functions" type="RubyRunConfigurationType" factoryName="Ruby"
|
|
61
|
+
<configuration default="false" name="additional_functions" type="RubyRunConfigurationType" factoryName="Ruby">
|
|
62
62
|
<module name="freewifi" />
|
|
63
63
|
<RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
|
|
64
64
|
<RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="$MODULE_DIR$/lib/freewifi/additional" />
|
|
@@ -77,7 +77,7 @@
|
|
|
77
77
|
<RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
|
|
78
78
|
<method />
|
|
79
79
|
</configuration>
|
|
80
|
-
<configuration default="false" name="wifi_portal_procedures" type="RubyRunConfigurationType" factoryName="Ruby"
|
|
80
|
+
<configuration default="false" name="wifi_portal_procedures" type="RubyRunConfigurationType" factoryName="Ruby">
|
|
81
81
|
<module name="freewifi" />
|
|
82
82
|
<RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
|
|
83
83
|
<RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="$MODULE_DIR$/lib/freewifi/general" />
|
data/.idea/workspace.xml
CHANGED
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
<component name="ChangesViewManager" flattened_view="false" />
|
|
47
47
|
<component name="CoverageDataManager">
|
|
48
48
|
<SUITE FILE_PATH="coverage/freewifi@additional_functions.coverage" NAME="additional_functions Coverage Results" MODIFIED="1588023723762" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/lib/freewifi/additional" MODULE_NAME="freewifi" />
|
|
49
|
-
<SUITE FILE_PATH="coverage/freewifi@test_helper.coverage" NAME="test_helper Coverage Results" MODIFIED="
|
|
49
|
+
<SUITE FILE_PATH="coverage/freewifi@test_helper.coverage" NAME="test_helper Coverage Results" MODIFIED="1588152130983" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test" MODULE_NAME="freewifi" />
|
|
50
50
|
<SUITE FILE_PATH="coverage/freewifi@test.coverage" NAME="test Coverage Results" MODIFIED="1587924491650" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test" MODULE_NAME="freewifi" />
|
|
51
51
|
<SUITE FILE_PATH="coverage/freewifi@wifi_portal_procedures.coverage" NAME="wifi_portal_procedures Coverage Results" MODIFIED="1588069407762" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/lib/freewifi/general" MODULE_NAME="freewifi" />
|
|
52
52
|
<SUITE FILE_PATH="coverage/freewifi@hewhub_mtik_ssh.coverage" NAME="hewhub_mtik_ssh Coverage Results" MODIFIED="1587796347972" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/lib/freewifi/mikrotik" MODULE_NAME="freewifi" />
|
|
@@ -54,21 +54,91 @@
|
|
|
54
54
|
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
|
|
55
55
|
<component name="FileEditorManager">
|
|
56
56
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
57
|
+
<file leaf-file-name="freewifi.rb" pinned="false" current-in-tab="true">
|
|
58
|
+
<entry file="file://$PROJECT_DIR$/lib/freewifi.rb">
|
|
59
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
60
|
+
<state relative-caret-position="812">
|
|
61
|
+
<caret line="355" column="41" lean-forward="true" selection-start-line="355" selection-start-column="33" selection-end-line="355" selection-end-column="46" />
|
|
62
|
+
<folding />
|
|
63
|
+
</state>
|
|
64
|
+
</provider>
|
|
65
|
+
</entry>
|
|
66
|
+
</file>
|
|
57
67
|
<file leaf-file-name="test_helper.rb" pinned="false" current-in-tab="false">
|
|
58
68
|
<entry file="file://$PROJECT_DIR$/test/test_helper.rb">
|
|
59
69
|
<provider selected="true" editor-type-id="text-editor">
|
|
60
|
-
<state relative-caret-position="
|
|
61
|
-
<caret line="
|
|
70
|
+
<state relative-caret-position="421">
|
|
71
|
+
<caret line="73" column="2" lean-forward="false" selection-start-line="73" selection-start-column="2" selection-end-line="73" selection-end-column="2" />
|
|
62
72
|
<folding />
|
|
63
73
|
</state>
|
|
64
74
|
</provider>
|
|
65
75
|
</entry>
|
|
66
76
|
</file>
|
|
67
|
-
<file leaf-file-name="
|
|
68
|
-
<entry file="file://$PROJECT_DIR$/lib/freewifi.rb">
|
|
77
|
+
<file leaf-file-name="additional_functions.rb" pinned="false" current-in-tab="false">
|
|
78
|
+
<entry file="file://$PROJECT_DIR$/lib/freewifi/additional/additional_functions.rb">
|
|
79
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
80
|
+
<state relative-caret-position="-242">
|
|
81
|
+
<caret line="38" column="9" lean-forward="true" selection-start-line="38" selection-start-column="9" selection-end-line="38" selection-end-column="9" />
|
|
82
|
+
<folding />
|
|
83
|
+
</state>
|
|
84
|
+
</provider>
|
|
85
|
+
</entry>
|
|
86
|
+
</file>
|
|
87
|
+
<file leaf-file-name="version.rb" pinned="false" current-in-tab="false">
|
|
88
|
+
<entry file="file://$PROJECT_DIR$/lib/freewifi/version.rb">
|
|
89
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
90
|
+
<state relative-caret-position="15">
|
|
91
|
+
<caret line="1" column="18" lean-forward="false" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
|
|
92
|
+
<folding />
|
|
93
|
+
</state>
|
|
94
|
+
</provider>
|
|
95
|
+
</entry>
|
|
96
|
+
</file>
|
|
97
|
+
<file leaf-file-name="mongoconnector.rb" pinned="false" current-in-tab="false">
|
|
98
|
+
<entry file="file://$PROJECT_DIR$/lib/freewifi/database/mongo/mongoconnector.rb">
|
|
99
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
100
|
+
<state relative-caret-position="300">
|
|
101
|
+
<caret line="35" column="28" lean-forward="false" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
|
|
102
|
+
<folding />
|
|
103
|
+
</state>
|
|
104
|
+
</provider>
|
|
105
|
+
</entry>
|
|
106
|
+
</file>
|
|
107
|
+
<file leaf-file-name="schemes_conf_gen.rb" pinned="false" current-in-tab="false">
|
|
108
|
+
<entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/schemes_conf_gen.rb">
|
|
109
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
110
|
+
<state relative-caret-position="15">
|
|
111
|
+
<caret line="30" column="5" lean-forward="false" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="5" />
|
|
112
|
+
<folding />
|
|
113
|
+
</state>
|
|
114
|
+
</provider>
|
|
115
|
+
</entry>
|
|
116
|
+
</file>
|
|
117
|
+
<file leaf-file-name="newhub_mtik_ssh.rb" pinned="false" current-in-tab="false">
|
|
118
|
+
<entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_ssh.rb">
|
|
119
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
120
|
+
<state relative-caret-position="2439">
|
|
121
|
+
<caret line="235" column="5" lean-forward="false" selection-start-line="235" selection-start-column="5" selection-end-line="235" selection-end-column="5" />
|
|
122
|
+
<folding />
|
|
123
|
+
</state>
|
|
124
|
+
</provider>
|
|
125
|
+
</entry>
|
|
126
|
+
</file>
|
|
127
|
+
<file leaf-file-name="newhub_mtik_api.rb" pinned="false" current-in-tab="false">
|
|
128
|
+
<entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_api.rb">
|
|
129
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
130
|
+
<state relative-caret-position="450">
|
|
131
|
+
<caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
|
|
132
|
+
<folding />
|
|
133
|
+
</state>
|
|
134
|
+
</provider>
|
|
135
|
+
</entry>
|
|
136
|
+
</file>
|
|
137
|
+
<file leaf-file-name="wifi_portal_procedures.rb" pinned="false" current-in-tab="false">
|
|
138
|
+
<entry file="file://$PROJECT_DIR$/lib/freewifi/general/wifi_portal_procedures.rb">
|
|
69
139
|
<provider selected="true" editor-type-id="text-editor">
|
|
70
|
-
<state relative-caret-position="
|
|
71
|
-
<caret line="
|
|
140
|
+
<state relative-caret-position="357">
|
|
141
|
+
<caret line="122" column="15" lean-forward="false" selection-start-line="122" selection-start-column="15" selection-end-line="122" selection-end-column="28" />
|
|
72
142
|
<folding />
|
|
73
143
|
</state>
|
|
74
144
|
</provider>
|
|
@@ -90,19 +160,19 @@
|
|
|
90
160
|
<option value="$PROJECT_DIR$/lib/freewifi/mikrotik/hewhub_mtik_ssh.rb" />
|
|
91
161
|
<option value="$PROJECT_DIR$/lib/freewifi/cisco/cisco_schemes_conf_gen.rb" />
|
|
92
162
|
<option value="$PROJECT_DIR$/lib/freewifi/params.rb" />
|
|
93
|
-
<option value="$PROJECT_DIR$/lib/freewifi/additional/additional_functions.rb" />
|
|
94
163
|
<option value="$PROJECT_DIR$/lib/freewifi/mikrotik/schemes_conf_gen.rb" />
|
|
95
164
|
<option value="$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_ssh.rb" />
|
|
96
165
|
<option value="$PROJECT_DIR$/freewifi.gemspec" />
|
|
97
166
|
<option value="$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_api.rb" />
|
|
98
|
-
<option value="$PROJECT_DIR$/lib/freewifi/database/mongo/mongoconnector.rb" />
|
|
99
167
|
<option value="$PROJECT_DIR$/lib/freewifi/cisco/iwag/iwag_telnet_connector.rb" />
|
|
100
168
|
<option value="$PROJECT_DIR$/lib/freewifi/general/wifi_portal_procedures.rb" />
|
|
101
|
-
<option value="$PROJECT_DIR$/test/test_helper.rb" />
|
|
102
169
|
<option value="$PROJECT_DIR$/lib/freewifi/huawei/hua_controller_class.rb" />
|
|
103
170
|
<option value="$PROJECT_DIR$/lib/freewifi/config.rb" />
|
|
104
|
-
<option value="$PROJECT_DIR$/lib/freewifi/
|
|
171
|
+
<option value="$PROJECT_DIR$/lib/freewifi/additional/additional_functions.rb" />
|
|
172
|
+
<option value="$PROJECT_DIR$/test/test_helper.rb" />
|
|
173
|
+
<option value="$PROJECT_DIR$/lib/freewifi/database/mongo/mongoconnector.rb" />
|
|
105
174
|
<option value="$PROJECT_DIR$/lib/freewifi.rb" />
|
|
175
|
+
<option value="$PROJECT_DIR$/lib/freewifi/version.rb" />
|
|
106
176
|
</list>
|
|
107
177
|
</option>
|
|
108
178
|
</component>
|
|
@@ -131,6 +201,7 @@
|
|
|
131
201
|
<foldersAlwaysOnTop value="true" />
|
|
132
202
|
</navigator>
|
|
133
203
|
<panes>
|
|
204
|
+
<pane id="Scope" />
|
|
134
205
|
<pane id="Scratches" />
|
|
135
206
|
<pane id="ProjectPane">
|
|
136
207
|
<subPane>
|
|
@@ -190,9 +261,200 @@
|
|
|
190
261
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
191
262
|
</PATH_ELEMENT>
|
|
192
263
|
</PATH>
|
|
264
|
+
<PATH>
|
|
265
|
+
<PATH_ELEMENT>
|
|
266
|
+
<option name="myItemId" value="freewifi" />
|
|
267
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
268
|
+
</PATH_ELEMENT>
|
|
269
|
+
<PATH_ELEMENT>
|
|
270
|
+
<option name="myItemId" value="freewifi" />
|
|
271
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
272
|
+
</PATH_ELEMENT>
|
|
273
|
+
<PATH_ELEMENT>
|
|
274
|
+
<option name="myItemId" value="lib" />
|
|
275
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
276
|
+
</PATH_ELEMENT>
|
|
277
|
+
<PATH_ELEMENT>
|
|
278
|
+
<option name="myItemId" value="freewifi" />
|
|
279
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
280
|
+
</PATH_ELEMENT>
|
|
281
|
+
<PATH_ELEMENT>
|
|
282
|
+
<option name="myItemId" value="mikrotik" />
|
|
283
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
284
|
+
</PATH_ELEMENT>
|
|
285
|
+
</PATH>
|
|
286
|
+
<PATH>
|
|
287
|
+
<PATH_ELEMENT>
|
|
288
|
+
<option name="myItemId" value="freewifi" />
|
|
289
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
290
|
+
</PATH_ELEMENT>
|
|
291
|
+
<PATH_ELEMENT>
|
|
292
|
+
<option name="myItemId" value="freewifi" />
|
|
293
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
294
|
+
</PATH_ELEMENT>
|
|
295
|
+
<PATH_ELEMENT>
|
|
296
|
+
<option name="myItemId" value="lib" />
|
|
297
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
298
|
+
</PATH_ELEMENT>
|
|
299
|
+
<PATH_ELEMENT>
|
|
300
|
+
<option name="myItemId" value="freewifi" />
|
|
301
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
302
|
+
</PATH_ELEMENT>
|
|
303
|
+
<PATH_ELEMENT>
|
|
304
|
+
<option name="myItemId" value="huawei" />
|
|
305
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
306
|
+
</PATH_ELEMENT>
|
|
307
|
+
</PATH>
|
|
308
|
+
<PATH>
|
|
309
|
+
<PATH_ELEMENT>
|
|
310
|
+
<option name="myItemId" value="freewifi" />
|
|
311
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
312
|
+
</PATH_ELEMENT>
|
|
313
|
+
<PATH_ELEMENT>
|
|
314
|
+
<option name="myItemId" value="freewifi" />
|
|
315
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
316
|
+
</PATH_ELEMENT>
|
|
317
|
+
<PATH_ELEMENT>
|
|
318
|
+
<option name="myItemId" value="lib" />
|
|
319
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
320
|
+
</PATH_ELEMENT>
|
|
321
|
+
<PATH_ELEMENT>
|
|
322
|
+
<option name="myItemId" value="freewifi" />
|
|
323
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
324
|
+
</PATH_ELEMENT>
|
|
325
|
+
<PATH_ELEMENT>
|
|
326
|
+
<option name="myItemId" value="general" />
|
|
327
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
328
|
+
</PATH_ELEMENT>
|
|
329
|
+
</PATH>
|
|
330
|
+
<PATH>
|
|
331
|
+
<PATH_ELEMENT>
|
|
332
|
+
<option name="myItemId" value="freewifi" />
|
|
333
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
334
|
+
</PATH_ELEMENT>
|
|
335
|
+
<PATH_ELEMENT>
|
|
336
|
+
<option name="myItemId" value="freewifi" />
|
|
337
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
338
|
+
</PATH_ELEMENT>
|
|
339
|
+
<PATH_ELEMENT>
|
|
340
|
+
<option name="myItemId" value="lib" />
|
|
341
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
342
|
+
</PATH_ELEMENT>
|
|
343
|
+
<PATH_ELEMENT>
|
|
344
|
+
<option name="myItemId" value="freewifi" />
|
|
345
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
346
|
+
</PATH_ELEMENT>
|
|
347
|
+
<PATH_ELEMENT>
|
|
348
|
+
<option name="myItemId" value="database" />
|
|
349
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
350
|
+
</PATH_ELEMENT>
|
|
351
|
+
<PATH_ELEMENT>
|
|
352
|
+
<option name="myItemId" value="mysql" />
|
|
353
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
354
|
+
</PATH_ELEMENT>
|
|
355
|
+
</PATH>
|
|
356
|
+
<PATH>
|
|
357
|
+
<PATH_ELEMENT>
|
|
358
|
+
<option name="myItemId" value="freewifi" />
|
|
359
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
360
|
+
</PATH_ELEMENT>
|
|
361
|
+
<PATH_ELEMENT>
|
|
362
|
+
<option name="myItemId" value="freewifi" />
|
|
363
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
364
|
+
</PATH_ELEMENT>
|
|
365
|
+
<PATH_ELEMENT>
|
|
366
|
+
<option name="myItemId" value="lib" />
|
|
367
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
368
|
+
</PATH_ELEMENT>
|
|
369
|
+
<PATH_ELEMENT>
|
|
370
|
+
<option name="myItemId" value="freewifi" />
|
|
371
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
372
|
+
</PATH_ELEMENT>
|
|
373
|
+
<PATH_ELEMENT>
|
|
374
|
+
<option name="myItemId" value="database" />
|
|
375
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
376
|
+
</PATH_ELEMENT>
|
|
377
|
+
<PATH_ELEMENT>
|
|
378
|
+
<option name="myItemId" value="mongo" />
|
|
379
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
380
|
+
</PATH_ELEMENT>
|
|
381
|
+
</PATH>
|
|
382
|
+
<PATH>
|
|
383
|
+
<PATH_ELEMENT>
|
|
384
|
+
<option name="myItemId" value="freewifi" />
|
|
385
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
386
|
+
</PATH_ELEMENT>
|
|
387
|
+
<PATH_ELEMENT>
|
|
388
|
+
<option name="myItemId" value="freewifi" />
|
|
389
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
390
|
+
</PATH_ELEMENT>
|
|
391
|
+
<PATH_ELEMENT>
|
|
392
|
+
<option name="myItemId" value="lib" />
|
|
393
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
394
|
+
</PATH_ELEMENT>
|
|
395
|
+
<PATH_ELEMENT>
|
|
396
|
+
<option name="myItemId" value="freewifi" />
|
|
397
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
398
|
+
</PATH_ELEMENT>
|
|
399
|
+
<PATH_ELEMENT>
|
|
400
|
+
<option name="myItemId" value="cisco" />
|
|
401
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
402
|
+
</PATH_ELEMENT>
|
|
403
|
+
<PATH_ELEMENT>
|
|
404
|
+
<option name="myItemId" value="iwag" />
|
|
405
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
406
|
+
</PATH_ELEMENT>
|
|
407
|
+
</PATH>
|
|
408
|
+
<PATH>
|
|
409
|
+
<PATH_ELEMENT>
|
|
410
|
+
<option name="myItemId" value="freewifi" />
|
|
411
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
412
|
+
</PATH_ELEMENT>
|
|
413
|
+
<PATH_ELEMENT>
|
|
414
|
+
<option name="myItemId" value="freewifi" />
|
|
415
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
416
|
+
</PATH_ELEMENT>
|
|
417
|
+
<PATH_ELEMENT>
|
|
418
|
+
<option name="myItemId" value="lib" />
|
|
419
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
420
|
+
</PATH_ELEMENT>
|
|
421
|
+
<PATH_ELEMENT>
|
|
422
|
+
<option name="myItemId" value="freewifi" />
|
|
423
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
424
|
+
</PATH_ELEMENT>
|
|
425
|
+
<PATH_ELEMENT>
|
|
426
|
+
<option name="myItemId" value="cisco" />
|
|
427
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
428
|
+
</PATH_ELEMENT>
|
|
429
|
+
<PATH_ELEMENT>
|
|
430
|
+
<option name="myItemId" value="any" />
|
|
431
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
432
|
+
</PATH_ELEMENT>
|
|
433
|
+
</PATH>
|
|
434
|
+
<PATH>
|
|
435
|
+
<PATH_ELEMENT>
|
|
436
|
+
<option name="myItemId" value="freewifi" />
|
|
437
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
438
|
+
</PATH_ELEMENT>
|
|
439
|
+
<PATH_ELEMENT>
|
|
440
|
+
<option name="myItemId" value="freewifi" />
|
|
441
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
442
|
+
</PATH_ELEMENT>
|
|
443
|
+
<PATH_ELEMENT>
|
|
444
|
+
<option name="myItemId" value="lib" />
|
|
445
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
446
|
+
</PATH_ELEMENT>
|
|
447
|
+
<PATH_ELEMENT>
|
|
448
|
+
<option name="myItemId" value="freewifi" />
|
|
449
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
450
|
+
</PATH_ELEMENT>
|
|
451
|
+
<PATH_ELEMENT>
|
|
452
|
+
<option name="myItemId" value="additional" />
|
|
453
|
+
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
454
|
+
</PATH_ELEMENT>
|
|
455
|
+
</PATH>
|
|
193
456
|
</subPane>
|
|
194
457
|
</pane>
|
|
195
|
-
<pane id="Scope" />
|
|
196
458
|
</panes>
|
|
197
459
|
</component>
|
|
198
460
|
<component name="PropertiesComponent">
|
|
@@ -221,44 +483,6 @@
|
|
|
221
483
|
</option>
|
|
222
484
|
</component>
|
|
223
485
|
<component name="RunManager" selected="Ruby.test_helper">
|
|
224
|
-
<configuration default="false" name="additional_functions" type="RubyRunConfigurationType" factoryName="Ruby" temporary="true">
|
|
225
|
-
<module name="freewifi" />
|
|
226
|
-
<RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
|
|
227
|
-
<RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="$MODULE_DIR$/lib/freewifi/additional" />
|
|
228
|
-
<RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
|
|
229
|
-
<RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
|
|
230
|
-
<RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
|
|
231
|
-
<envs />
|
|
232
|
-
<EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
|
|
233
|
-
<EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
|
|
234
|
-
<EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
|
|
235
|
-
<COVERAGE_PATTERN ENABLED="true">
|
|
236
|
-
<PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
|
|
237
|
-
</COVERAGE_PATTERN>
|
|
238
|
-
</EXTENSION>
|
|
239
|
-
<RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="$MODULE_DIR$/lib/freewifi/additional/additional_functions.rb" />
|
|
240
|
-
<RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
|
|
241
|
-
<method />
|
|
242
|
-
</configuration>
|
|
243
|
-
<configuration default="false" name="wifi_portal_procedures" type="RubyRunConfigurationType" factoryName="Ruby" temporary="true">
|
|
244
|
-
<module name="freewifi" />
|
|
245
|
-
<RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
|
|
246
|
-
<RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="$MODULE_DIR$/lib/freewifi/general" />
|
|
247
|
-
<RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
|
|
248
|
-
<RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
|
|
249
|
-
<RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
|
|
250
|
-
<envs />
|
|
251
|
-
<EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
|
|
252
|
-
<EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
|
|
253
|
-
<EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
|
|
254
|
-
<COVERAGE_PATTERN ENABLED="true">
|
|
255
|
-
<PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
|
|
256
|
-
</COVERAGE_PATTERN>
|
|
257
|
-
</EXTENSION>
|
|
258
|
-
<RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="$MODULE_DIR$/lib/freewifi/general/wifi_portal_procedures.rb" />
|
|
259
|
-
<RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
|
|
260
|
-
<method />
|
|
261
|
-
</configuration>
|
|
262
486
|
<configuration default="true" type="CucumberRunConfigurationType" factoryName="Cucumber">
|
|
263
487
|
<predefined_log_file id="RUBY_CUCUMBER" enabled="true" />
|
|
264
488
|
<module name="" />
|
|
@@ -402,25 +626,6 @@
|
|
|
402
626
|
<envs />
|
|
403
627
|
<method />
|
|
404
628
|
</configuration>
|
|
405
|
-
<configuration default="false" name="newhub_mtik_ssh" type="RubyRunConfigurationType" factoryName="Ruby">
|
|
406
|
-
<module name="freewifi" />
|
|
407
|
-
<RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
|
|
408
|
-
<RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="$MODULE_DIR$/lib/freewifi/mikrotik" />
|
|
409
|
-
<RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
|
|
410
|
-
<RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
|
|
411
|
-
<RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
|
|
412
|
-
<envs />
|
|
413
|
-
<EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
|
|
414
|
-
<EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
|
|
415
|
-
<EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
|
|
416
|
-
<COVERAGE_PATTERN ENABLED="true">
|
|
417
|
-
<PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
|
|
418
|
-
</COVERAGE_PATTERN>
|
|
419
|
-
</EXTENSION>
|
|
420
|
-
<RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="$MODULE_DIR$/lib/freewifi/mikrotik/newhub_mtik_ssh.rb" />
|
|
421
|
-
<RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
|
|
422
|
-
<method />
|
|
423
|
-
</configuration>
|
|
424
629
|
<list size="5">
|
|
425
630
|
<item index="0" class="java.lang.String" itemvalue="Ruby.test_helper" />
|
|
426
631
|
<item index="1" class="java.lang.String" itemvalue="Ruby.newhub_mtik_ssh" />
|
|
@@ -428,14 +633,6 @@
|
|
|
428
633
|
<item index="3" class="java.lang.String" itemvalue="Ruby.additional_functions" />
|
|
429
634
|
<item index="4" class="java.lang.String" itemvalue="Ruby.wifi_portal_procedures" />
|
|
430
635
|
</list>
|
|
431
|
-
<recent_temporary>
|
|
432
|
-
<list size="4">
|
|
433
|
-
<item index="0" class="java.lang.String" itemvalue="Ruby.wifi_portal_procedures" />
|
|
434
|
-
<item index="1" class="java.lang.String" itemvalue="Ruby.additional_functions" />
|
|
435
|
-
<item index="2" class="java.lang.String" itemvalue="Ruby.test" />
|
|
436
|
-
<item index="3" class="java.lang.String" itemvalue="Ruby.newhub_mtik_ssh" />
|
|
437
|
-
</list>
|
|
438
|
-
</recent_temporary>
|
|
439
636
|
</component>
|
|
440
637
|
<component name="ShelveChangesManager" show_recycled="false">
|
|
441
638
|
<option name="remove_strategy" value="false" />
|
|
@@ -467,23 +664,24 @@
|
|
|
467
664
|
<workItem from="1586354062505" duration="297000" />
|
|
468
665
|
<workItem from="1586463231468" duration="598000" />
|
|
469
666
|
<workItem from="1587794173933" duration="25602000" />
|
|
470
|
-
<workItem from="1588004674911" duration="
|
|
667
|
+
<workItem from="1588004674911" duration="36310000" />
|
|
668
|
+
<workItem from="1588102169957" duration="432000" />
|
|
669
|
+
<workItem from="1588146691256" duration="3148000" />
|
|
471
670
|
</task>
|
|
472
671
|
<servers />
|
|
473
672
|
</component>
|
|
474
673
|
<component name="TimeTrackingManager">
|
|
475
|
-
<option name="totallyTimeSpent" value="
|
|
674
|
+
<option name="totallyTimeSpent" value="77624000" />
|
|
476
675
|
</component>
|
|
477
676
|
<component name="ToolWindowManager">
|
|
478
|
-
<frame x="0" y="0" width="1440" height="900" extended-state="
|
|
677
|
+
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
|
|
479
678
|
<editor active="true" />
|
|
480
679
|
<layout>
|
|
481
|
-
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.
|
|
680
|
+
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24892704" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
482
681
|
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
|
483
682
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
|
484
683
|
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
485
|
-
<window_info id="
|
|
486
|
-
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3283582" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
684
|
+
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.44527364" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
487
685
|
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
488
686
|
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24964234" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
489
687
|
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
@@ -494,6 +692,7 @@
|
|
|
494
692
|
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
|
495
693
|
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
|
496
694
|
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
|
695
|
+
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329602" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
497
696
|
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
498
697
|
</layout>
|
|
499
698
|
</component>
|
|
@@ -508,14 +707,6 @@
|
|
|
508
707
|
<watches-manager />
|
|
509
708
|
</component>
|
|
510
709
|
<component name="editorHistoryManager">
|
|
511
|
-
<entry file="file://$PROJECT_DIR$/test/test_helper.rb">
|
|
512
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
513
|
-
<state relative-caret-position="270">
|
|
514
|
-
<caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
|
|
515
|
-
<folding />
|
|
516
|
-
</state>
|
|
517
|
-
</provider>
|
|
518
|
-
</entry>
|
|
519
710
|
<entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/getsubscribermikrotik.rb">
|
|
520
711
|
<provider selected="true" editor-type-id="text-editor">
|
|
521
712
|
<state relative-caret-position="0">
|
|
@@ -528,7 +719,6 @@
|
|
|
528
719
|
<provider selected="true" editor-type-id="text-editor">
|
|
529
720
|
<state relative-caret-position="405">
|
|
530
721
|
<caret line="27" column="5" lean-forward="false" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
|
|
531
|
-
<folding />
|
|
532
722
|
</state>
|
|
533
723
|
</provider>
|
|
534
724
|
</entry>
|
|
@@ -576,7 +766,6 @@
|
|
|
576
766
|
<provider selected="true" editor-type-id="text-editor">
|
|
577
767
|
<state relative-caret-position="405">
|
|
578
768
|
<caret line="27" column="5" lean-forward="false" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
|
|
579
|
-
<folding />
|
|
580
769
|
</state>
|
|
581
770
|
</provider>
|
|
582
771
|
</entry>
|
|
@@ -624,7 +813,6 @@
|
|
|
624
813
|
<provider selected="true" editor-type-id="text-editor">
|
|
625
814
|
<state relative-caret-position="405">
|
|
626
815
|
<caret line="27" column="5" lean-forward="false" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
|
|
627
|
-
<folding />
|
|
628
816
|
</state>
|
|
629
817
|
</provider>
|
|
630
818
|
</entry>
|
|
@@ -664,7 +852,6 @@
|
|
|
664
852
|
<provider selected="true" editor-type-id="text-editor">
|
|
665
853
|
<state relative-caret-position="405">
|
|
666
854
|
<caret line="27" column="5" lean-forward="true" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
|
|
667
|
-
<folding />
|
|
668
855
|
</state>
|
|
669
856
|
</provider>
|
|
670
857
|
</entry>
|
|
@@ -704,7 +891,6 @@
|
|
|
704
891
|
<provider selected="true" editor-type-id="text-editor">
|
|
705
892
|
<state relative-caret-position="0">
|
|
706
893
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
707
|
-
<folding />
|
|
708
894
|
</state>
|
|
709
895
|
</provider>
|
|
710
896
|
</entry>
|
|
@@ -712,7 +898,6 @@
|
|
|
712
898
|
<provider selected="true" editor-type-id="text-editor">
|
|
713
899
|
<state relative-caret-position="0">
|
|
714
900
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
715
|
-
<folding />
|
|
716
901
|
</state>
|
|
717
902
|
</provider>
|
|
718
903
|
</entry>
|
|
@@ -720,7 +905,6 @@
|
|
|
720
905
|
<provider selected="true" editor-type-id="text-editor">
|
|
721
906
|
<state relative-caret-position="0">
|
|
722
907
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
723
|
-
<folding />
|
|
724
908
|
</state>
|
|
725
909
|
</provider>
|
|
726
910
|
</entry>
|
|
@@ -749,7 +933,6 @@
|
|
|
749
933
|
<provider selected="true" editor-type-id="text-editor">
|
|
750
934
|
<state relative-caret-position="0">
|
|
751
935
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
752
|
-
<folding />
|
|
753
936
|
</state>
|
|
754
937
|
</provider>
|
|
755
938
|
</entry>
|
|
@@ -757,15 +940,6 @@
|
|
|
757
940
|
<provider selected="true" editor-type-id="text-editor">
|
|
758
941
|
<state relative-caret-position="170">
|
|
759
942
|
<caret line="43" column="0" lean-forward="false" selection-start-line="43" selection-start-column="0" selection-end-line="43" selection-end-column="0" />
|
|
760
|
-
<folding />
|
|
761
|
-
</state>
|
|
762
|
-
</provider>
|
|
763
|
-
</entry>
|
|
764
|
-
<entry file="file://$PROJECT_DIR$/lib/freewifi/additional/additional_functions.rb">
|
|
765
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
766
|
-
<state relative-caret-position="362">
|
|
767
|
-
<caret line="53" column="47" lean-forward="false" selection-start-line="53" selection-start-column="6" selection-end-line="53" selection-end-column="47" />
|
|
768
|
-
<folding />
|
|
769
943
|
</state>
|
|
770
944
|
</provider>
|
|
771
945
|
</entry>
|
|
@@ -781,30 +955,41 @@
|
|
|
781
955
|
<provider selected="true" editor-type-id="text-editor">
|
|
782
956
|
<state relative-caret-position="407">
|
|
783
957
|
<caret line="44" column="48" lean-forward="false" selection-start-line="44" selection-start-column="48" selection-end-line="44" selection-end-column="48" />
|
|
784
|
-
<folding />
|
|
785
958
|
</state>
|
|
786
959
|
</provider>
|
|
787
960
|
</entry>
|
|
788
|
-
<entry file="file://$PROJECT_DIR$/lib/freewifi/
|
|
961
|
+
<entry file="file://$PROJECT_DIR$/lib/freewifi/config.rb">
|
|
789
962
|
<provider selected="true" editor-type-id="text-editor">
|
|
790
|
-
<state relative-caret-position="
|
|
791
|
-
<caret line="
|
|
792
|
-
<folding />
|
|
963
|
+
<state relative-caret-position="15">
|
|
964
|
+
<caret line="1" column="22" lean-forward="false" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
|
|
793
965
|
</state>
|
|
794
966
|
</provider>
|
|
795
967
|
</entry>
|
|
796
|
-
<entry file="file://$PROJECT_DIR$/lib/freewifi/
|
|
968
|
+
<entry file="file://$PROJECT_DIR$/lib/freewifi/params.rb">
|
|
797
969
|
<provider selected="true" editor-type-id="text-editor">
|
|
798
|
-
<state relative-caret-position="
|
|
799
|
-
<caret line="
|
|
800
|
-
|
|
970
|
+
<state relative-caret-position="482">
|
|
971
|
+
<caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
|
|
972
|
+
</state>
|
|
973
|
+
</provider>
|
|
974
|
+
</entry>
|
|
975
|
+
<entry file="file://$PROJECT_DIR$/test/freewifi_test.rb">
|
|
976
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
977
|
+
<state relative-caret-position="0">
|
|
978
|
+
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
979
|
+
</state>
|
|
980
|
+
</provider>
|
|
981
|
+
</entry>
|
|
982
|
+
<entry file="file://$PROJECT_DIR$/lib/freewifi/huawei/hua_controller_class.rb">
|
|
983
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
984
|
+
<state relative-caret-position="1560">
|
|
985
|
+
<caret line="104" column="78" lean-forward="false" selection-start-line="104" selection-start-column="78" selection-end-line="104" selection-end-column="78" />
|
|
801
986
|
</state>
|
|
802
987
|
</provider>
|
|
803
988
|
</entry>
|
|
804
989
|
<entry file="file://$PROJECT_DIR$/lib/freewifi/database/mysql/database_methods_wifi.rb">
|
|
805
990
|
<provider selected="true" editor-type-id="text-editor">
|
|
806
991
|
<state relative-caret-position="195">
|
|
807
|
-
<caret line="13" column="0" lean-forward="
|
|
992
|
+
<caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
|
|
808
993
|
<folding />
|
|
809
994
|
</state>
|
|
810
995
|
</provider>
|
|
@@ -817,98 +1002,98 @@
|
|
|
817
1002
|
</state>
|
|
818
1003
|
</provider>
|
|
819
1004
|
</entry>
|
|
820
|
-
<entry file="file://$PROJECT_DIR$/lib/freewifi/
|
|
1005
|
+
<entry file="file://$PROJECT_DIR$/lib/freewifi/cisco/any/cisco_schemes_conf_gen.rb">
|
|
821
1006
|
<provider selected="true" editor-type-id="text-editor">
|
|
822
|
-
<state relative-caret-position="
|
|
823
|
-
<caret line="
|
|
1007
|
+
<state relative-caret-position="120">
|
|
1008
|
+
<caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
|
|
824
1009
|
<folding />
|
|
825
1010
|
</state>
|
|
826
1011
|
</provider>
|
|
827
1012
|
</entry>
|
|
828
|
-
<entry file="file://$PROJECT_DIR$/lib/freewifi/
|
|
1013
|
+
<entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/getsubscribermikrotik.rb">
|
|
829
1014
|
<provider selected="true" editor-type-id="text-editor">
|
|
830
|
-
<state relative-caret-position="
|
|
831
|
-
<caret line="
|
|
1015
|
+
<state relative-caret-position="0">
|
|
1016
|
+
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
832
1017
|
<folding />
|
|
833
1018
|
</state>
|
|
834
1019
|
</provider>
|
|
835
1020
|
</entry>
|
|
836
|
-
<entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/
|
|
1021
|
+
<entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_ssh.rb">
|
|
837
1022
|
<provider selected="true" editor-type-id="text-editor">
|
|
838
|
-
<state relative-caret-position="
|
|
839
|
-
<caret line="
|
|
1023
|
+
<state relative-caret-position="2439">
|
|
1024
|
+
<caret line="235" column="5" lean-forward="false" selection-start-line="235" selection-start-column="5" selection-end-line="235" selection-end-column="5" />
|
|
840
1025
|
<folding />
|
|
841
1026
|
</state>
|
|
842
1027
|
</provider>
|
|
843
1028
|
</entry>
|
|
844
|
-
<entry file="file://$PROJECT_DIR$/lib/freewifi/
|
|
1029
|
+
<entry file="file://$PROJECT_DIR$/lib/freewifi/general/wifi_portal_procedures.rb">
|
|
845
1030
|
<provider selected="true" editor-type-id="text-editor">
|
|
846
|
-
<state relative-caret-position="
|
|
847
|
-
<caret line="
|
|
1031
|
+
<state relative-caret-position="357">
|
|
1032
|
+
<caret line="122" column="15" lean-forward="false" selection-start-line="122" selection-start-column="15" selection-end-line="122" selection-end-column="28" />
|
|
848
1033
|
<folding />
|
|
849
1034
|
</state>
|
|
850
1035
|
</provider>
|
|
851
1036
|
</entry>
|
|
852
|
-
<entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/
|
|
1037
|
+
<entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_api.rb">
|
|
853
1038
|
<provider selected="true" editor-type-id="text-editor">
|
|
854
|
-
<state relative-caret-position="
|
|
855
|
-
<caret line="
|
|
1039
|
+
<state relative-caret-position="450">
|
|
1040
|
+
<caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
|
|
856
1041
|
<folding />
|
|
857
1042
|
</state>
|
|
858
1043
|
</provider>
|
|
859
1044
|
</entry>
|
|
860
|
-
<entry file="file://$PROJECT_DIR$/lib/freewifi/
|
|
1045
|
+
<entry file="file://$PROJECT_DIR$/lib/freewifi/version.rb">
|
|
861
1046
|
<provider selected="true" editor-type-id="text-editor">
|
|
862
|
-
<state relative-caret-position="
|
|
863
|
-
<caret line="
|
|
1047
|
+
<state relative-caret-position="15">
|
|
1048
|
+
<caret line="1" column="18" lean-forward="false" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
|
|
864
1049
|
<folding />
|
|
865
1050
|
</state>
|
|
866
1051
|
</provider>
|
|
867
1052
|
</entry>
|
|
868
|
-
<entry file="file://$
|
|
1053
|
+
<entry file="file://$USER_HOME$/.rvm/gems/ruby-2.4.1/gems/mongo-2.11.4/lib/mongo/client.rb">
|
|
869
1054
|
<provider selected="true" editor-type-id="text-editor">
|
|
870
|
-
<state relative-caret-position="
|
|
871
|
-
<caret line="
|
|
1055
|
+
<state relative-caret-position="243">
|
|
1056
|
+
<caret line="58" column="8" lean-forward="true" selection-start-line="58" selection-start-column="6" selection-end-line="58" selection-end-column="22" />
|
|
872
1057
|
<folding />
|
|
873
1058
|
</state>
|
|
874
1059
|
</provider>
|
|
875
1060
|
</entry>
|
|
876
|
-
<entry file="file://$PROJECT_DIR$/lib/freewifi/
|
|
1061
|
+
<entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/schemes_conf_gen.rb">
|
|
877
1062
|
<provider selected="true" editor-type-id="text-editor">
|
|
878
|
-
<state relative-caret-position="
|
|
879
|
-
<caret line="
|
|
1063
|
+
<state relative-caret-position="15">
|
|
1064
|
+
<caret line="30" column="5" lean-forward="false" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="5" />
|
|
880
1065
|
<folding />
|
|
881
1066
|
</state>
|
|
882
1067
|
</provider>
|
|
883
1068
|
</entry>
|
|
884
|
-
<entry file="file://$PROJECT_DIR$/lib/freewifi/
|
|
1069
|
+
<entry file="file://$PROJECT_DIR$/lib/freewifi/additional/additional_functions.rb">
|
|
885
1070
|
<provider selected="true" editor-type-id="text-editor">
|
|
886
|
-
<state relative-caret-position="
|
|
887
|
-
<caret line="
|
|
1071
|
+
<state relative-caret-position="-242">
|
|
1072
|
+
<caret line="38" column="9" lean-forward="true" selection-start-line="38" selection-start-column="9" selection-end-line="38" selection-end-column="9" />
|
|
888
1073
|
<folding />
|
|
889
1074
|
</state>
|
|
890
1075
|
</provider>
|
|
891
1076
|
</entry>
|
|
892
|
-
<entry file="file://$PROJECT_DIR$/
|
|
1077
|
+
<entry file="file://$PROJECT_DIR$/lib/freewifi/database/mongo/mongoconnector.rb">
|
|
893
1078
|
<provider selected="true" editor-type-id="text-editor">
|
|
894
|
-
<state relative-caret-position="
|
|
895
|
-
<caret line="
|
|
1079
|
+
<state relative-caret-position="300">
|
|
1080
|
+
<caret line="35" column="28" lean-forward="false" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
|
|
896
1081
|
<folding />
|
|
897
1082
|
</state>
|
|
898
1083
|
</provider>
|
|
899
1084
|
</entry>
|
|
900
1085
|
<entry file="file://$PROJECT_DIR$/test/test_helper.rb">
|
|
901
1086
|
<provider selected="true" editor-type-id="text-editor">
|
|
902
|
-
<state relative-caret-position="
|
|
903
|
-
<caret line="
|
|
1087
|
+
<state relative-caret-position="421">
|
|
1088
|
+
<caret line="73" column="2" lean-forward="false" selection-start-line="73" selection-start-column="2" selection-end-line="73" selection-end-column="2" />
|
|
904
1089
|
<folding />
|
|
905
1090
|
</state>
|
|
906
1091
|
</provider>
|
|
907
1092
|
</entry>
|
|
908
1093
|
<entry file="file://$PROJECT_DIR$/lib/freewifi.rb">
|
|
909
1094
|
<provider selected="true" editor-type-id="text-editor">
|
|
910
|
-
<state relative-caret-position="
|
|
911
|
-
<caret line="
|
|
1095
|
+
<state relative-caret-position="812">
|
|
1096
|
+
<caret line="355" column="41" lean-forward="true" selection-start-line="355" selection-start-column="33" selection-end-line="355" selection-end-column="46" />
|
|
912
1097
|
<folding />
|
|
913
1098
|
</state>
|
|
914
1099
|
</provider>
|
|
@@ -12,6 +12,25 @@ class InternalFunc_1
|
|
|
12
12
|
d_curr.to_s
|
|
13
13
|
end
|
|
14
14
|
|
|
15
|
+
def telegram_message_1(message, telegram_api_url, telegram_chat_id)
|
|
16
|
+
begin
|
|
17
|
+
uri = URI.parse(telegram_api_url)
|
|
18
|
+
https_connector = Net::HTTP.new(uri.host, uri.port)
|
|
19
|
+
https_connector.use_ssl = true
|
|
20
|
+
data = {chat_id: telegram_chat_id, text: message}
|
|
21
|
+
request_mess = Net::HTTP::Post.new(uri.request_uri, {'Content-Type' => 'application/json'})
|
|
22
|
+
request_mess.body = data.to_json
|
|
23
|
+
response_mess = https_connector.request(request_mess)
|
|
24
|
+
body = response_mess.body
|
|
25
|
+
return {:code => 200,
|
|
26
|
+
:result => "Request completed successfully",
|
|
27
|
+
:body => {:telegram_resp => JSON.parse(body.to_s),
|
|
28
|
+
:description => "Telegram message to telegram_chat_id: #{telegram_chat_id.to_s}"}}
|
|
29
|
+
rescue
|
|
30
|
+
return {:code => 507, :result => "Unknown SDK error"}
|
|
31
|
+
end
|
|
32
|
+
end
|
|
33
|
+
|
|
15
34
|
def printer_texter_wifi_1(text, log_level)
|
|
16
35
|
begin
|
|
17
36
|
if log_level == "debug" && Freewifi_1::LOGLEVEL_1 == "debug"
|
|
@@ -14,7 +14,7 @@ class MongoWifiCl_1
|
|
|
14
14
|
@mongo_ip = mongo_ip
|
|
15
15
|
@mongo_port = mongo_port
|
|
16
16
|
client_host = [mongo_ip + ":" + mongo_port]
|
|
17
|
-
@client = Mongo::Client.new(client_host, :database => mongo_database)
|
|
17
|
+
@client = Mongo::Client.new(client_host, :database => mongo_database, :connect_timeout => 2)
|
|
18
18
|
|
|
19
19
|
@additional_func_1 = InternalFunc_1.new
|
|
20
20
|
end
|
data/lib/freewifi/version.rb
CHANGED
data/lib/freewifi.rb
CHANGED
|
@@ -268,18 +268,19 @@ end
|
|
|
268
268
|
|
|
269
269
|
class PortalFwifi_1
|
|
270
270
|
|
|
271
|
-
attr_accessor :
|
|
272
|
-
:apigw_endpoint,
|
|
273
|
-
:apigw_namespace,
|
|
274
|
-
:apigw_wsse_aut_log,
|
|
275
|
-
:apigw_wsse_aut_pass,
|
|
276
|
-
:general_procedures,
|
|
271
|
+
attr_accessor :general_procedures,
|
|
277
272
|
:mtik_control_ips_get,
|
|
278
273
|
:mtik_user,
|
|
279
274
|
:mtik_password,
|
|
280
275
|
:mongo_connector_wifi_1,
|
|
281
276
|
:remote_ip,
|
|
282
|
-
:real_ip
|
|
277
|
+
:real_ip,
|
|
278
|
+
:telegram_api_url,
|
|
279
|
+
:telegram_chat_id,
|
|
280
|
+
:mongo_ip,
|
|
281
|
+
:mongo_port,
|
|
282
|
+
:mongo_database,
|
|
283
|
+
:additional_func_wifi_1
|
|
283
284
|
|
|
284
285
|
|
|
285
286
|
def initialize(apigw_wsdl,
|
|
@@ -301,21 +302,38 @@ class PortalFwifi_1
|
|
|
301
302
|
hua_wlc_1_ip,
|
|
302
303
|
hua_wlc_2_ip,
|
|
303
304
|
hua_wlc_login,
|
|
304
|
-
hua_wlc_password
|
|
305
|
+
hua_wlc_password,
|
|
306
|
+
telegram_api_url,
|
|
307
|
+
telegram_chat_id
|
|
305
308
|
)
|
|
306
309
|
|
|
307
|
-
@
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
310
|
+
@general_procedures = WiFiPortal_1.new(apigw_wsdl,
|
|
311
|
+
apigw_endpoint,
|
|
312
|
+
apigw_namespace,
|
|
313
|
+
apigw_wsse_aut_log,
|
|
314
|
+
apigw_wsse_aut_pass,
|
|
315
|
+
iwag1_host,
|
|
316
|
+
iwag_username,
|
|
317
|
+
iwag_password,
|
|
318
|
+
mtik_control_ips_get,
|
|
319
|
+
mtik_user,
|
|
320
|
+
mtik_password,
|
|
321
|
+
hua_wlc_1_ip,
|
|
322
|
+
hua_wlc_2_ip,
|
|
323
|
+
hua_wlc_login,
|
|
324
|
+
hua_wlc_password
|
|
325
|
+
)
|
|
313
326
|
@mtik_control_ips_get = mtik_control_ips_get
|
|
314
327
|
@mtik_user = mtik_user
|
|
315
328
|
@mtik_password = mtik_password
|
|
316
|
-
@mongo_connector_wifi_1 = MongoWifiCl_1.new(mongo_ip, mongo_port, mongo_database)
|
|
317
329
|
@remote_ip = remote_ip
|
|
318
330
|
@real_ip = real_ip
|
|
331
|
+
@additional_func_wifi_1 = InternalFunc_1.new
|
|
332
|
+
@telegram_api_url = telegram_api_url
|
|
333
|
+
@telegram_chat_id = telegram_chat_id
|
|
334
|
+
@mongo_ip = mongo_ip
|
|
335
|
+
@mongo_port = mongo_port
|
|
336
|
+
@mongo_database = mongo_database
|
|
319
337
|
end
|
|
320
338
|
|
|
321
339
|
|
|
@@ -323,14 +341,27 @@ class PortalFwifi_1
|
|
|
323
341
|
input_params = {:ipaddress => ipaddress}
|
|
324
342
|
output_params = {}
|
|
325
343
|
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
344
|
+
subs_info_ret_1_thr1 = Thread.new do
|
|
345
|
+
begin
|
|
346
|
+
resp_procedure = general_procedures.get_subs_info_return_1(ipaddress)
|
|
347
|
+
output_params = resp_procedure
|
|
348
|
+
rescue
|
|
349
|
+
output_params = {:code => 507, :result => "Unknown SDK error"}
|
|
350
|
+
end
|
|
351
|
+
end
|
|
352
|
+
subs_info_ret_1_thr1.join
|
|
353
|
+
|
|
354
|
+
subs_info_ret_1_thr2 = Thread.new do
|
|
355
|
+
begin
|
|
356
|
+
mongo_connector_wifi_1 = MongoWifiCl_1.new(mongo_ip, mongo_port, mongo_database)
|
|
357
|
+
mongo_connector_wifi_1.audit_logger_wifi_portal_1("wifi_get_subs_info_return_1", remote_ip, input_params, output_params, real_ip)
|
|
358
|
+
rescue
|
|
359
|
+
additional_func_wifi_1.printer_texter_wifi_1({:input_params => input_params, :output_params => {:result => "mongo failed"}, :procedure => "wifi_get_subs_info_return_1", :file => "freewifi.rb"}, "debug")
|
|
360
|
+
additional_func_wifi_1.telegram_message_1("{:function => \"wifi_get_subs_info_return_1\", :result => \"failed communicate with mongo database\", :sdk => \"freewifi\"}", telegram_api_url, telegram_chat_id)
|
|
361
|
+
end
|
|
331
362
|
end
|
|
363
|
+
subs_info_ret_1_thr2.join
|
|
332
364
|
|
|
333
|
-
mongo_connector_wifi_1.audit_logger_wifi_portal_1("wifi_get_subs_info_return_1", remote_ip, input_params, output_params, real_ip)
|
|
334
365
|
output_params
|
|
335
366
|
end
|
|
336
367
|
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: freewifi
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.9
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Dzmitry Buynovskiy
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-04-
|
|
11
|
+
date: 2020-04-29 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|