Repository navigation
Expand file tree
/
Copy pathindex.html
More file actions
994 lines (400 loc) · 29.8 KB
/
Copy pathindex.html
File metadata and controls
994 lines (400 loc) · 29.8 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
<html class="">
<head>
<meta charset="UTF-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
<meta http-equiv="Cache-Control" content="no-transform" />
<meta http-equiv="Cache-Control" content="no-siteapp" />
<link href="/vendors/fancybox/source/jquery.fancybox.css?v=2.1.5" rel="stylesheet" type="text/css" />
<link href="//fonts.googleapis.com/css?family=Lato:300,300italic,400,400italic,700,700italic|Roboto Slab:300,300italic,400,400italic,700,700italic|PT Mono:300,300italic,400,400italic,700,700italic|PT Mono:300,300italic,400,400italic,700,700italic&subset=latin,latin-ext" rel="stylesheet" type="text/css">
<link href="/vendors/font-awesome/css/font-awesome.min.css?v=4.4.0" rel="stylesheet" type="text/css" />
<link href="/css/main.css?v=5.0.1" rel="stylesheet" type="text/css" />
<meta name="keywords" content="echo,python,selenuim,echoocking" />
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico?v=5.0.1" />
<meta name="description" content="天下事有难易乎?为之,则难者亦易矣;不为,则易者亦难矣。">
<meta property="og:type" content="website">
<meta property="og:title" content="echoocking’s blog">
<meta property="og:url" content="http://yoursite.com/index.html">
<meta property="og:site_name" content="echoocking’s blog">
<meta property="og:description" content="天下事有难易乎?为之,则难者亦易矣;不为,则易者亦难矣。">
<meta name="twitter:card" content="summary">
<meta name="twitter:title" content="echoocking’s blog">
<meta name="twitter:description" content="天下事有难易乎?为之,则难者亦易矣;不为,则易者亦难矣。">
<script type="text/javascript" id="hexo.configuration">
var NexT = window.NexT || {};
var CONFIG = {
scheme: 'Mist',
sidebar: {"position":"left","display":"post"},
fancybox: true,
motion: true,
duoshuo: {
userId: 0,
author: '作者'
}
};
</script>
<link rel="canonical" href="http://yoursite.com/"/>
<title> echoocking’s blog </title>
</head>
<body itemscope itemtype="http://schema.org/WebPage" lang="zh-Hans">
<div class="container one-collumn sidebar-position-left
page-home
">
<div class="headband"></div>
<header id="header" class="header" itemscope itemtype="http://schema.org/WPHeader">
<div class="header-inner"><div class="site-meta ">
<div class="custom-logo-site-title">
<a href="/" class="brand" rel="start">
<span class="logo-line-before"><i></i></span>
<span class="site-title">echoocking’s blog</span>
<span class="logo-line-after"><i></i></span>
</a>
</div>
<p class="site-subtitle">天下事有难易乎?为之,则难者亦易矣;不为,则易者亦难矣。</p>
</div>
<div class="site-nav-toggle">
<button>
<span class="btn-bar"></span>
<span class="btn-bar"></span>
<span class="btn-bar"></span>
</button>
</div>
<nav class="site-nav">
<ul id="menu" class="menu">
<li class="menu-item menu-item-home">
<a href="/" rel="section">
<i class="menu-item-icon fa fa-fw fa-home"></i> <br />
❤ 主页
</a>
</li>
<li class="menu-item menu-item-categories">
<a href="/categories" rel="section">
<i class="menu-item-icon fa fa-fw fa-th"></i> <br />
分类
</a>
</li>
<li class="menu-item menu-item-about">
<a href="/about" rel="section">
<i class="menu-item-icon fa fa-fw fa-user"></i> <br />
关于
</a>
</li>
<li class="menu-item menu-item-archives">
<a href="/archives" rel="section">
<i class="menu-item-icon fa fa-fw fa-archive"></i> <br />
归档
</a>
</li>
<li class="menu-item menu-item-tags">
<a href="/tags" rel="section">
<i class="menu-item-icon fa fa-fw fa-tags"></i> <br />
标签
</a>
</li>
</ul>
</nav>
</div>
</header>
<main id="main" class="main">
<div class="main-inner">
<div class="content-wrap">
<div id="content" class="content">
<section id="posts" class="posts-expand">
<article class="post post-type-normal " itemscope itemtype="http://schema.org/Article">
<header class="post-header">
<h1 class="post-title" itemprop="name headline">
<a class="post-title-link" href="/2017/03/31/正则表达式填坑/" itemprop="url">
正则表达式填坑
</a>
</h1>
<div class="post-meta">
<span class="post-time">
<span class="post-meta-item-icon">
<i class="fa fa-calendar-o"></i>
</span>
<span class="post-meta-item-text">Veröffentlicht am</span>
<time itemprop="dateCreated" datetime="2017-03-31T21:44:46+08:00" content="2017-03-31">
2017-03-31
</time>
</span>
<span class="post-updated">
| 更新于
<time itemprop="dateUpdated" datetime="2017-04-03T15:52:12+08:00" content="2017-04-03">
2017-04-03
</time>
</span>
</div>
</header>
<div class="post-body" itemprop="articleBody">
<p>之前学过正则,然后比较久没有用,记忆产生了混乱。<br>开一篇记录一下正则的概念,然后日后遇到其他比较有意思的正则,会继续写入。</p>
<p>Python正则主要使用re。<br>基础的流程:<br>1.rule = re.compile(regex) 经常被使用的正则表达式的表达可以用compile编译成一个对象,好调用,提高效率<br>2.re.findall(rule, txt)<br>这里需要注意的是 regex的写法,有固定的规则。<br>‘item.abc[0-9]+[a-z]’<br>  这个regex的匹配顺序是先逐字匹配item和被转义的’.’符号,然后继续逐字匹配abc然后匹配一个或多个数字然后匹配一个a-z范围内的字符<br>匹配完成后,会返回包含所有匹配成功的字符串的数组。<br>  使用中需要注意[]与()的区别<br>例子:<br><figure class="highlight python"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br><span class="line">3</span><br><span class="line">4</span><br><span class="line">5</span><br><span class="line">6</span><br><span class="line">7</span><br><span class="line">8</span><br><span class="line">9</span><br></pre></td><td class="code"><pre><span class="line">In [<span class="number">10</span>]: p3=re.compile(<span class="string">'//item.jd/content/(0-9)+/\.html'</span>)</span><br><span class="line"></span><br><span class="line">In [<span class="number">11</span>]: re.findall(p3,s)</span><br><span class="line">Out[<span class="number">11</span>]: []</span><br><span class="line"></span><br><span class="line">In [<span class="number">12</span>]: p4=re.compile(<span class="string">'/item.jd/content/[0-9]+/\.html'</span>)</span><br><span class="line"></span><br><span class="line">In [<span class="number">13</span>]: re.findall(p4,s)</span><br><span class="line">Out[<span class="number">13</span>]: [<span class="string">'/item.jd/content/19939293/.html'</span>]</span><br></pre></td></tr></table></figure></p>
<p>[]表示的是一种范围,用于进行正则匹配 例如[0-9]* 关于[]内就是表示0-9的一个字符<br>()是组的概念。一个正则表达式中有一个主组以及可以存在0-99个子组,通过自组可以取出匹配主组成功后的自组的内容,findall以后多个子组使用元组保存在列表中<br>例子:<br><figure class="highlight python"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br><span class="line">3</span><br><span class="line">4</span><br><span class="line">5</span><br><span class="line">6</span><br><span class="line">7</span><br></pre></td><td class="code"><pre><span class="line">In [<span class="number">4</span>]: p1 = re.compile(<span class="string">'id\.com/([0-9]+)/([0-9a-zA-Z]+)\.com'</span>)</span><br><span class="line">In [<span class="number">6</span>]: re.findall(p1,s)</span><br><span class="line">Out[<span class="number">6</span>]: [(<span class="string">'890890'</span>, <span class="string">'fd8f9u9d908789'</span>)]</span><br><span class="line">In [<span class="number">11</span>]: s2=<span class="string">'* this is http://item.jd.943434.com * fdjifo f d 6668**#6 ^&(!^#(3'</span></span><br><span class="line">In [<span class="number">12</span>]: patten2 = <span class="string">'http://item\.jd\.([0-9]*)\.com'</span></span><br><span class="line">In [<span class="number">13</span>]: re.findall(patten2, s2)</span><br><span class="line">Out[<span class="number">13</span>]: [<span class="string">'943434'</span>]</span><br></pre></td></tr></table></figure></p>
<p>今天得到公司给配MacBook的消息啦~~~开心///转圈</p>
</div>
<div>
</div>
<div>
</div>
<footer class="post-footer">
<div class="post-eof"></div>
</footer>
</article>
<article class="post post-type-normal " itemscope itemtype="http://schema.org/Article">
<header class="post-header">
<h1 class="post-title" itemprop="name headline">
<a class="post-title-link" href="/2017/03/28/BloomFilter之0/" itemprop="url">
BloomFilter 初始零
</a>
</h1>
<div class="post-meta">
<span class="post-time">
<span class="post-meta-item-icon">
<i class="fa fa-calendar-o"></i>
</span>
<span class="post-meta-item-text">Veröffentlicht am</span>
<time itemprop="dateCreated" datetime="2017-03-28T14:49:32+08:00" content="2017-03-28">
2017-03-28
</time>
</span>
<span class="post-updated">
| 更新于
<time itemprop="dateUpdated" datetime="2017-03-28T15:12:18+08:00" content="2017-03-28">
2017-03-28
</time>
</span>
</div>
</header>
<div class="post-body" itemprop="articleBody">
<p>  爬虫爬取过程中,对于url的去重是较为重要的。爬虫脚本的每一次运行,都需要判断是否这个url以及这个url中的数据曾被获取过。所以研究了一下关于url去重,大致的想法是使用BloomFilter。由于每一个url的地址长度较长,将所有url的信息全部读入到内存中效率太低,BloomFilter的原理是找到K个适合的hash函数,每个高效的hash函数可以将url映射到内存的一位上,为了避免hash冲突,所以使用多个hash函数进行运算。每个hash函数加密得到一个位数值,数值可以在一个bit数组进行映射,在bit数组中找到该数值对应的位置,并把该位置的值设置为1(默认为零)。K个hash函数就将K位设置为零。需要判断url是否被爬取过,则只需将url使用K个hash函数加密,得到K个值,判断K个值在Bit数组中的映射位置是否全部为1,全部为1的话,那么为了避免误判,可以继续去硬盘中的数据库去找,或者直接认定该url存在。但只要映射的位置,有不为1的情况,那么该数据一定不存在。<br>  原理很简单,具体的实现有几大困难。1.确定hash函数 2.确定bit集合大小 其实想想也不难,毕竟都是有具体的公式的<br>  有空实现一下!!!(好多个有空哎<del>,但是一定会哦</del>)<br>I will keep following~ mua~</p>
<p>贴一个更加优化的:<br>  上面说到的BloomFilter还紧紧是单机内存的,在淘宝这个环境下,显然是不适用的。那么我们如何把他变成分布式的呢?看了标题我想你已经知道了,对了,那就是redis。<br>  BloomFilter需要的bit数组与redis的bit操作真是完美契合啊。利用redis的高性能以及通过pipeline将多条bit操作命令批量提交,实现了多机BloomFilter的bit数据共享。唯一需要注意的是redis的bitmap只支持2^32大小,对应到内存也就是512MB,数组的下标最大只能是2^32-1。不过这个限制我们可以通过构建多个redis的bitmap通过hash取模的方式分散一下即可。同时利用上面的公式计算一下:万分之一的误判率,512MB可以放下2亿左右的数据,而目前全网的uv也就8千万,所以,你懂的。<a href="http://it.taocms.org/05/3427.htm" target="_blank" rel="external">链接戳我</a></p>
</div>
<div>
</div>
<div>
</div>
<footer class="post-footer">
<div class="post-eof"></div>
</footer>
</article>
<article class="post post-type-normal " itemscope itemtype="http://schema.org/Article">
<header class="post-header">
<h1 class="post-title" itemprop="name headline">
<a class="post-title-link" href="/2017/03/28/tip/" itemprop="url">
BloomFilter 初始零
</a>
</h1>
<div class="post-meta">
<span class="post-time">
<span class="post-meta-item-icon">
<i class="fa fa-calendar-o"></i>
</span>
<span class="post-meta-item-text">Veröffentlicht am</span>
<time itemprop="dateCreated" datetime="2017-03-28T14:49:32+08:00" content="2017-03-28">
2017-03-28
</time>
</span>
<span class="post-updated">
| 更新于
<time itemprop="dateUpdated" datetime="2017-04-18T14:39:40+08:00" content="2017-04-18">
2017-04-18
</time>
</span>
</div>
</header>
<div class="post-body" itemprop="articleBody">
<p>因为毕业论文查重的问题。所以有些文章先暂时被下掉。等查完再放上来啦。</p>
</div>
<div>
</div>
<div>
</div>
<footer class="post-footer">
<div class="post-eof"></div>
</footer>
</article>
<article class="post post-type-normal " itemscope itemtype="http://schema.org/Article">
<header class="post-header">
<h1 class="post-title" itemprop="name headline">
<a class="post-title-link" href="/2017/03/25/进程_线程_flag/" itemprop="url">
进程、线程 -- flag篇
</a>
</h1>
<div class="post-meta">
<span class="post-time">
<span class="post-meta-item-icon">
<i class="fa fa-calendar-o"></i>
</span>
<span class="post-meta-item-text">Veröffentlicht am</span>
<time itemprop="dateCreated" datetime="2017-03-25T23:06:00+08:00" content="2017-03-25">
2017-03-25
</time>
</span>
<span class="post-updated">
| 更新于
<time itemprop="dateUpdated" datetime="2017-03-27T17:51:13+08:00" content="2017-03-27">
2017-03-27
</time>
</span>
</div>
</header>
<div class="post-body" itemprop="articleBody">
<p>  立一个新的flag,也算为自己开一个新坑。打算由浅入深的比较系统的学习一下进程和线程的相关知识。这是该系列的第一篇,主要介绍概念性的东西,以后慢慢的(也许快快的~)会加入更经典的关于进程、线程处理的代码。<br>    进程 – 程序的一次执行<br>    线程 – CPU调度的最小单位<br>  看到这里,这个定义下的其实我有点奇怪。根据这个定义的话,那么网上关于mutilprocessing的很多的例子看起来就比较的没有内涵。</p>
<figure class="highlight python"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br><span class="line">3</span><br><span class="line">4</span><br><span class="line">5</span><br><span class="line">6</span><br><span class="line">7</span><br><span class="line">8</span><br><span class="line">9</span><br><span class="line">10</span><br><span class="line">11</span><br><span class="line">12</span><br><span class="line">13</span><br><span class="line">14</span><br><span class="line">15</span><br><span class="line">16</span><br><span class="line">17</span><br><span class="line">18</span><br><span class="line">19</span><br></pre></td><td class="code"><pre><span class="line"><span class="keyword">import</span> os</span><br><span class="line"><span class="keyword">from</span> multiprocessing <span class="keyword">import</span> Process</span><br><span class="line"></span><br><span class="line"><span class="function"><span class="keyword">def</span> <span class="title">doubler</span><span class="params">(number)</span>:</span></span><br><span class="line"> result = number * <span class="number">2</span></span><br><span class="line"> pid = os.getpid()</span><br><span class="line"> <span class="keyword">return</span> result</span><br><span class="line"></span><br><span class="line"><span class="keyword">if</span> __name__ == <span class="string">'__main__'</span>:</span><br><span class="line"> nums = [<span class="number">5</span>, <span class="number">10</span>, <span class="number">20</span>]</span><br><span class="line"> procs = []</span><br><span class="line"> </span><br><span class="line"> <span class="keyword">for</span> num <span class="keyword">in</span> nums:</span><br><span class="line"> process = Process(target=double, args=(num))</span><br><span class="line"> procs.append(process)</span><br><span class="line"> process.start</span><br><span class="line"> </span><br><span class="line"> <span class="keyword">for</span> process <span class="keyword">in</span> procs:</span><br><span class="line"> process.join()</span><br></pre></td></tr></table></figure>
<pre><code>这代码写的, 基本上就是只有告诉我os.getpid能获取pid的作用了。
这个完全换成线程也一样好不好。
</code></pre><p>进程和线程的主要功能,是提高cpu的利用的效率,缩短程序运行的时间。<br>  每个进程,应该负责一个较为独立的功能或者根本就是一个独立的程序的。进程是有自己的独立的区域的,进程间需要通信的话,一般使用Queue或者Pipes(Queue是进程、线程安全的。Pipes双工通信。一个安全,一个快。)。Chrome就是一个典型的多进程程序,里面每个标签页、扩展、插件都是单独的进程,各自独占资源,相互隔离,一个进程出错死掉只会影响一个页面或者插件,再也不会出现Flash插件出错崩溃导致整个浏览器崩溃的情况了。<br>  线程的话,一般多个线程被包含在一个进程里,cpu调度的基本单位是线程,所以拥有多个线程的话,就近似于程序跑在多个cpu上,并且程序的各个线程都在并行的执行。线程的资源是共享的,父进程的资源由所有线程共享,但是各个线程可以独自拥有自己的变量。由于线程间共享进程中的全局变量,所以当其他线程改变了共享的变量时,可能会对本线程产生影响。所谓线程安全的约束是指一个函数被多个并发线程反复调用时,要一直产生正确的结果。要保证线程安全,主要是通过加锁的方式保证共享变量的正确访问。<br>
<div class="post-more-link text-center">
<a class="btn" href="/2017/03/25/进程_线程_flag/#more" rel="contents">
More »
</a>
</div>
</div>
<div>
</div>
<div>
</div>
<footer class="post-footer">
<div class="post-eof"></div>
</footer>
</article>
<article class="post post-type-normal " itemscope itemtype="http://schema.org/Article">
<header class="post-header">
<h1 class="post-title" itemprop="name headline">
<a class="post-title-link" href="/2017/03/25/git/" itemprop="url">
git使用技巧之大壹
</a>
</h1>
<div class="post-meta">
<span class="post-time">
<span class="post-meta-item-icon">
<i class="fa fa-calendar-o"></i>
</span>
<span class="post-meta-item-text">Veröffentlicht am</span>
<time itemprop="dateCreated" datetime="2017-03-25T22:22:16+08:00" content="2017-03-25">
2017-03-25
</time>
</span>
<span class="post-updated">
| 更新于
<time itemprop="dateUpdated" datetime="2017-03-25T22:44:40+08:00" content="2017-03-25">
2017-03-25
</time>
</span>
</div>
</header>
<div class="post-body" itemprop="articleBody">
<p>git流程操作以及git补救操作。是初零的续篇。<br>1.git init<br> 创建一个git本地库,现在暂时是空的。<br>2.vi .gitignore<br> 在项目根目录下创建一个git的忽略目录。<br> 不然git就是 你写啥,敢传啥,pyc一大把。说多了都是泪呀。<br>2.git add<br> 如果你没有创gitignore的前车之鉴,那么恭喜你。<br> 你可能要翻车了。😄喜闻乐见。<br> 然而善(翻)良(车)如(无)我(数),git rm -r –cached,这个可以将之前add的文件删除,重新变为untracked。<br>3.gst<br> 看看现在库里的状态,有哪些添加了的。那些改变的 blablabla的。。<br>4.git diff (HEAD)<br> 不放心的话,可以用这个命令 看到具体的语句的更改<br> 反正从来对自己保持怀疑态度<br> 杜绝自己走上 从删库到跑路的 不归路<br>5.git commit -m ‘bbb’<br> 提交到本地代码库<br> 如果提交了,错了 呵呵,很正常。<br> 重新修改后<br> git commit -amend<br> 只会产生一次提交。<br>6.git add origin ‘url’<br>7.git push origin</p>
<p>提交代码的时候,一定要确认没有问题的话再提交。要淡定。<br>合作的话,先从远端pull代码下来,然后merge,有冲突解决冲突(解决冲突不要改远端的代码,可以对照着github上面调整自己的代码)。然后再进行代码的编写,然后重复2-7</p>
<p>遇到坑,再更,I will keep following。</p>
</div>
<div>
</div>
<div>
</div>
<footer class="post-footer">
<div class="post-eof"></div>
</footer>
</article>
</section>
<nav class="pagination">
<span class="page-number current">1</span><a class="page-number" href="/page/2/">2</a><a class="page-number" href="/page/3/">3</a><a class="extend next" rel="next" href="/page/2/"><i class="fa fa-angle-right"></i></a>
</nav>
</div>
</div>
<div class="sidebar-toggle">
<div class="sidebar-toggle-line-wrap">
<span class="sidebar-toggle-line sidebar-toggle-line-first"></span>
<span class="sidebar-toggle-line sidebar-toggle-line-middle"></span>
<span class="sidebar-toggle-line sidebar-toggle-line-last"></span>
</div>
</div>
<aside id="sidebar" class="sidebar">
<div class="sidebar-inner">
<section class="site-overview sidebar-panel sidebar-panel-active ">
<div class="site-author motion-element" itemprop="author" itemscope itemtype="http://schema.org/Person">
<img class="site-author-image" itemprop="image"
src="/images/avatar.gif"
alt="echoocking" />
<p class="site-author-name" itemprop="name">echoocking</p>
<p class="site-description motion-element" itemprop="description">天下事有难易乎?为之,则难者亦易矣;不为,则易者亦难矣。</p>
</div>
<nav class="site-state motion-element">
<div class="site-state-item site-state-posts">
<a href="/archives">
<span class="site-state-item-count">15</span>
<span class="site-state-item-name">日志</span>
</a>
</div>
<div class="site-state-item site-state-tags">
<a href="/tags">
<span class="site-state-item-count">13</span>
<span class="site-state-item-name">标签</span>
</a>
</div>
</nav>
<div class="links-of-author motion-element">
<span class="links-of-author-item">
<a href="http://weibo.com/5197848518/profile?rightmod=1&wvr=6&mod=personinfo&is_all=1" target="_blank" title="Weibo">
<i class="fa fa-fw fa-weibo"></i>
Weibo
</a>
</span>
<span class="links-of-author-item">
<a href="https://github.com/echoocking" target="_blank" title="GitHub">
<i class="fa fa-fw fa-github"></i>
GitHub
</a>
</span>
</div>
</section>
</div>
</aside>
</div>
</main>
<footer id="footer" class="footer">
<div class="footer-inner">
<div class="copyright" >
© 2015 -
<span itemprop="copyrightYear">2017</span>
<span class="with-love">
<i class="fa fa-heart"></i>
</span>
<span class="author" itemprop="copyrightHolder">echoocking</span>
</div>
<div class="powered-by">
嗨呀!~
</div>
<div class="theme-info">
很多想法 总在路上
</br>
<script async src="https://dn-lbstatics.qbox.me/busuanzi/2.3/busuanzi.pure.mini.js"></script>
访问量 <span id="busuanzi_value_site_pv"></span>    
访客数<span id="busuanzi_value_site_uv"></span>
</a>
</div>
</div>
</footer>
<div class="back-to-top">
<i class="fa fa-arrow-up"></i>
</div>
</div>
<script type="text/javascript">
if (Object.prototype.toString.call(window.Promise) !== '[object Function]') {
window.Promise = null;
}
</script>
<script type="text/javascript" src="/vendors/jquery/index.js?v=2.1.3"></script>
<script type="text/javascript" src="/vendors/fastclick/lib/fastclick.min.js?v=1.0.6"></script>
<script type="text/javascript" src="/vendors/jquery_lazyload/jquery.lazyload.js?v=1.9.7"></script>
<script type="text/javascript" src="/vendors/velocity/velocity.min.js?v=1.2.1"></script>
<script type="text/javascript" src="/vendors/velocity/velocity.ui.min.js?v=1.2.1"></script>
<script type="text/javascript" src="/vendors/fancybox/source/jquery.fancybox.pack.js?v=2.1.5"></script>
<script type="text/javascript" src="/js/src/utils.js?v=5.0.1"></script>
<script type="text/javascript" src="/js/src/motion.js?v=5.0.1"></script>
<script type="text/javascript" src="/js/src/bootstrap.js?v=5.0.1"></script>
<!-- 背景动画 -->
<script type="text/javascript" src="/js/src/particle.js"></script>
<!-- 页面点击小红心 -->
<script type="text/javascript" src="/js/src/love.js"></script>:
</body>
</html>