Browse Source

2017-12-22 ok

jtahstu 1 year ago
parent
commit
f3b2871dd5

BIN
.DS_Store


+ 1 - 2
.gitignore

@@ -58,6 +58,5 @@ docs/_build/
58 58
 # PyBuilder
59 59
 target/
60 60
 
61
-.idea
62
-*.idea
61
+.idea/
63 62
 

+ 65 - 31
.idea/workspace.xml

@@ -1,19 +1,9 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4
-    <list default="true" id="28855cfc-f511-4773-979a-c721c4e672b8" name="Default" comment="2017-12-18 拉">
5
-      <change beforePath="" afterPath="$PROJECT_DIR$/www_zhipin_com/analyse/analyse_salary.py" />
6
-      <change beforePath="" afterPath="$PROJECT_DIR$/www_zhipin_com/analyse/analyse_tool.py" />
7
-      <change beforePath="" afterPath="$PROJECT_DIR$/www_zhipin_com/analyse/analyse_workyear.py" />
8
-      <change beforePath="" afterPath="$PROJECT_DIR$/www_zhipin_com/spiders/lagou_list.py" />
4
+    <list default="true" id="28855cfc-f511-4773-979a-c721c4e672b8" name="Default" comment="2017-12-21 数据分析">
5
+      <change beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
9 6
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
10
-      <change beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
11
-      <change beforePath="$PROJECT_DIR$/www_zhipin_com/analyse/analyse_education.py" afterPath="$PROJECT_DIR$/www_zhipin_com/analyse/analyse_education.py" />
12
-      <change beforePath="$PROJECT_DIR$/www_zhipin_com/analyse/analyse_industry.py" afterPath="$PROJECT_DIR$/www_zhipin_com/analyse/analyse_industry.py" />
13
-      <change beforePath="$PROJECT_DIR$/www_zhipin_com/analyse/analyse_tag.py" afterPath="$PROJECT_DIR$/www_zhipin_com/analyse/analyse_tag.py" />
14
-      <change beforePath="$PROJECT_DIR$/www_zhipin_com/analyse/clear_data.py" afterPath="$PROJECT_DIR$/www_zhipin_com/analyse/clear_data.py" />
15
-      <change beforePath="$PROJECT_DIR$/www_zhipin_com/analyse/tool.py" afterPath="$PROJECT_DIR$/www_zhipin_com/analyse/tool.py" />
16
-      <change beforePath="$PROJECT_DIR$/www_zhipin_com/spiders/detail.py" afterPath="$PROJECT_DIR$/www_zhipin_com/spiders/detail.py" />
17 7
     </list>
18 8
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
19 9
     <option name="TRACKING_ENABLED" value="true" />
@@ -68,11 +58,31 @@
68 58
           </provider>
69 59
         </entry>
70 60
       </file>
71
-      <file leaf-file-name="analyse_salary.py" pinned="false" current-in-tab="true">
61
+      <file leaf-file-name="analyse_salary.py" pinned="false" current-in-tab="false">
72 62
         <entry file="file://$PROJECT_DIR$/www_zhipin_com/analyse/analyse_salary.py">
73 63
           <provider selected="true" editor-type-id="text-editor">
74
-            <state relative-caret-position="432">
75
-              <caret line="21" column="0" lean-forward="true" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
64
+            <state relative-caret-position="240">
65
+              <caret line="13" column="17" lean-forward="true" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
66
+              <folding />
67
+            </state>
68
+          </provider>
69
+        </entry>
70
+      </file>
71
+      <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
72
+        <entry file="file://$PROJECT_DIR$/.gitignore">
73
+          <provider selected="true" editor-type-id="text-editor">
74
+            <state relative-caret-position="144">
75
+              <caret line="9" column="26" lean-forward="true" selection-start-line="9" selection-start-column="26" selection-end-line="9" selection-end-column="26" />
76
+              <folding />
77
+            </state>
78
+          </provider>
79
+        </entry>
80
+      </file>
81
+      <file leaf-file-name="workspace.xml" pinned="false" current-in-tab="false">
82
+        <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
83
+          <provider selected="true" editor-type-id="text-editor">
84
+            <state relative-caret-position="240">
85
+              <caret line="10" column="54" lean-forward="true" selection-start-line="10" selection-start-column="54" selection-end-line="10" selection-end-column="54" />
76 86
               <folding />
77 87
             </state>
78 88
           </provider>
@@ -144,6 +154,9 @@
144 154
   </component>
145 155
   <component name="Git.Settings">
146 156
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
157
+    <push-targets>
158
+      <push-target-info target-remote="igit" target-branch="master" repo="$PROJECT_DIR$" source="master" />
159
+    </push-targets>
147 160
     <favorite-branches>
148 161
       <branch-storage>
149 162
         <map>
@@ -182,7 +195,6 @@
182 195
         <option value="$PROJECT_DIR$/item.json" />
183 196
         <option value="$PROJECT_DIR$/items_java.json" />
184 197
         <option value="$PROJECT_DIR$/items_python.json" />
185
-        <option value="$PROJECT_DIR$/.gitignore" />
186 198
         <option value="$PROJECT_DIR$/www_zhipin_com/test/jieba_1.py" />
187 199
         <option value="$PROJECT_DIR$/www_zhipin_com/analyse/detail.py" />
188 200
         <option value="$PROJECT_DIR$/www_zhipin_com/test/jieba_test.py" />
@@ -216,6 +228,7 @@
216 228
         <option value="$PROJECT_DIR$/www_zhipin_com/analyse/analyse_industry.py" />
217 229
         <option value="$PROJECT_DIR$/www_zhipin_com/analyse/analyse_education.py" />
218 230
         <option value="$PROJECT_DIR$/www_zhipin_com/analyse/analyse_salary.py" />
231
+        <option value="$PROJECT_DIR$/.gitignore" />
219 232
       </list>
220 233
     </option>
221 234
   </component>
@@ -285,7 +298,7 @@
285 298
               <item name="www_zhipin_com" type="b2602c69:ProjectViewProjectNode" />
286 299
               <item name="www_zhipin_com" type="462c0819:PsiDirectoryNode" />
287 300
               <item name="www_zhipin_com" type="462c0819:PsiDirectoryNode" />
288
-              <item name="analyse" type="462c0819:PsiDirectoryNode" />
301
+              <item name="data" type="462c0819:PsiDirectoryNode" />
289 302
             </path>
290 303
             <path>
291 304
               <item name="www_zhipin_com" type="b2602c69:ProjectViewProjectNode" />
@@ -293,6 +306,12 @@
293 306
               <item name="www_zhipin_com" type="462c0819:PsiDirectoryNode" />
294 307
               <item name="spiders" type="462c0819:PsiDirectoryNode" />
295 308
             </path>
309
+            <path>
310
+              <item name="www_zhipin_com" type="b2602c69:ProjectViewProjectNode" />
311
+              <item name="www_zhipin_com" type="462c0819:PsiDirectoryNode" />
312
+              <item name="www_zhipin_com" type="462c0819:PsiDirectoryNode" />
313
+              <item name="test" type="462c0819:PsiDirectoryNode" />
314
+            </path>
296 315
           </expand>
297 316
           <select />
298 317
         </subPane>
@@ -468,12 +487,18 @@
468 487
       <option name="project" value="LOCAL" />
469 488
       <updated>1513512505665</updated>
470 489
     </task>
471
-    <option name="localTasksCounter" value="3" />
490
+    <task id="LOCAL-00003" summary="2017-12-21 数据分析">
491
+      <created>1513852276893</created>
492
+      <option name="number" value="00003" />
493
+      <option name="presentableId" value="LOCAL-00003" />
494
+      <option name="project" value="LOCAL" />
495
+      <updated>1513852276893</updated>
496
+    </task>
497
+    <option name="localTasksCounter" value="4" />
472 498
     <servers />
473 499
   </component>
474 500
   <component name="ToolWindowManager">
475 501
     <frame x="0" y="22" width="1680" height="983" extended-state="6" />
476
-    <editor active="true" />
477 502
     <layout>
478 503
       <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" />
479 504
       <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" />
@@ -483,7 +508,7 @@
483 508
       <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32979977" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
484 509
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24028268" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
485 510
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32979977" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
486
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23076923" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
511
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23076923" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
487 512
       <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
488 513
       <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" />
489 514
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32839224" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -507,7 +532,8 @@
507 532
   </component>
508 533
   <component name="VcsManagerConfiguration">
509 534
     <MESSAGE value="2017-12-14 数据分析、爬虫完善等" />
510
-    <option name="LAST_COMMIT_MESSAGE" value="2017-12-14 数据分析、爬虫完善等" />
535
+    <MESSAGE value="2017-12-21 数据分析" />
536
+    <option name="LAST_COMMIT_MESSAGE" value="2017-12-21 数据分析" />
511 537
   </component>
512 538
   <component name="XDebuggerManager">
513 539
     <breakpoint-manager>
@@ -516,14 +542,6 @@
516 542
     <watches-manager />
517 543
   </component>
518 544
   <component name="editorHistoryManager">
519
-    <entry file="file://$PROJECT_DIR$/www_zhipin_com/analyse/words.txt" />
520
-    <entry file="file://$PROJECT_DIR$/www_zhipin_com/analyse/word_cloud.py">
521
-      <provider selected="true" editor-type-id="text-editor">
522
-        <state relative-caret-position="363">
523
-          <caret line="122" column="47" lean-forward="false" selection-start-line="122" selection-start-column="47" selection-end-line="122" selection-end-column="47" />
524
-        </state>
525
-      </provider>
526
-    </entry>
527 545
     <entry file="file://$PROJECT_DIR$/www_zhipin_com/analyse/test.png" />
528 546
     <entry file="file://$PROJECT_DIR$/www_zhipin_com/analyse/1.txt" />
529 547
     <entry file="file://$PROJECT_DIR$/www_zhipin_com/analyse/2.txt" />
@@ -764,8 +782,24 @@
764 782
     </entry>
765 783
     <entry file="file://$PROJECT_DIR$/www_zhipin_com/analyse/analyse_salary.py">
766 784
       <provider selected="true" editor-type-id="text-editor">
767
-        <state relative-caret-position="432">
768
-          <caret line="21" column="0" lean-forward="true" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
785
+        <state relative-caret-position="240">
786
+          <caret line="13" column="17" lean-forward="true" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
787
+          <folding />
788
+        </state>
789
+      </provider>
790
+    </entry>
791
+    <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
792
+      <provider selected="true" editor-type-id="text-editor">
793
+        <state relative-caret-position="240">
794
+          <caret line="10" column="54" lean-forward="true" selection-start-line="10" selection-start-column="54" selection-end-line="10" selection-end-column="54" />
795
+          <folding />
796
+        </state>
797
+      </provider>
798
+    </entry>
799
+    <entry file="file://$PROJECT_DIR$/.gitignore">
800
+      <provider selected="true" editor-type-id="text-editor">
801
+        <state relative-caret-position="144">
802
+          <caret line="9" column="26" lean-forward="true" selection-start-line="9" selection-start-column="26" selection-end-line="9" selection-end-column="26" />
769 803
           <folding />
770 804
         </state>
771 805
       </provider>

BIN
www_zhipin_com/.DS_Store


BIN
www_zhipin_com/__pycache__/__init__.cpython-36.pyc


BIN
www_zhipin_com/__pycache__/items.cpython-36.pyc


BIN
www_zhipin_com/__pycache__/settings.cpython-36.pyc


BIN
www_zhipin_com/data/.DS_Store


BIN
www_zhipin_com/spiders/__pycache__/__init__.cpython-36.pyc


BIN
www_zhipin_com/spiders/__pycache__/zhipin_spider.cpython-36.pyc


+ 8 - 0
www_zhipin_com/test/E:\ip_http.txt

@@ -0,0 +1,8 @@
1
+122.114.31.177:808
2
+61.135.217.7:80
3
+113.121.241.128:808
4
+115.55.158.113:8118
5
+222.242.106.142:63000
6
+58.60.255.82:8118
7
+106.81.230.50:8118
8
+112.114.93.79:8118

+ 2 - 0
www_zhipin_com/test/E:\ip_https.txt

@@ -0,0 +1,2 @@
1
+223.150.8.36:8888
2
+112.114.98.239:8118