更新版本逻辑

matyhtf · matyhtf · commit bce4f9ff653c · 2017-01-09T14:55:31.000+08:00
diff --git a/script/templates/index.php b/script/templates/index.php
@@ -62,7 +62,6 @@
                     <li><a target="_self" href="http://wiki.swoole.com/wiki/page/p-case.html">用户案例</a></li>
                     <li><a href="http://wiki.swoole.com/wiki/page/p-donate.html">捐赠</a></li>
 					<li><a href="https://github.com/swoole/swoole-src/releases">下载</a></li>
-					<li><a href="http://git.oschina.net/matyhtf/swoole">国内镜像</a></li>
                     <li><a href="https://rawgit.com/tchiotludo/swoole-ide-helper/english/docs/index.html">English Document</a></li>
                 </ul>
             </div>
@@ -75,16 +74,22 @@
         <p>
 		<span><img src="/static/images/swoole.png" width="160" style="float:left; margin-right: 25px; margin-top: 15px;" />
         </span>
-        PHP的异步、并行、高性能网络通信引擎，使用纯C语言编写，提供了PHP语言的异步多线程服务器，异步TCP/UDP网络客户端，异步MySQL，异步Redis，数据库连接池，AsyncTask，消息队列，毫秒定时器，异步文件读写，异步DNS查询。
-            Swoole内置了Http/WebSocket服务器端/客户端、Http2.0服务器端。<br />
+         <p>PHP的异步、并行、高性能网络通信引擎，使用纯C语言编写，提供了<a href="/wiki/page/p-server.html">PHP语言的异步多线程服务器</a>，<a href="/wiki/page/p-client.html">异步TCP/UDP网络客户端</a>，<a href="/wiki/page/517.html">异步MySQL</a>，<a href="/wiki/page/p-redis.html">异步Redis</a>，<a href="https://github.com/swoole/framework/blob/master/tests/async_mysql.php" target="_blank">数据库连接池</a>，<a href="/wiki/page/134.html">AsyncTask</a>，<a href="http://wiki.swoole.com/wiki/page/289.html">消息队列</a>，<a href="/wiki/page/244.html">毫秒定时器</a>，<a href="/wiki/page/183.html">异步文件读写</a>，<a href="/wiki/page/186.html">异步DNS查询</a>。 Swoole内置了<a href="/wiki/page/326.html">Http/WebSocket服务器端</a>/<a href="/wiki/page/p-http_client.html">客户端</a>、<a href="/wiki/page/326.html">Http2.0服务器端</a>。</p>
+        <p>除了异步IO的支持之外，Swoole为PHP多进程的模式设计了多个并发数据结构和IPC通信机制，可以大大简化多进程并发编程的工作。其中包括了<a href="/wiki/page/p-atomic.html">并发原子计数器</a>，<a href="/wiki/page/p-table.html">并发HashTable</a>，<a href="/wiki/page/p-channel.html">Channel</a>，<a href="/wiki/page/p-lock.html">Lock</a>，<a href="/wiki/page/363.html">进程间通信IPC</a>等丰富的功能特性。</p>
+        
+<p><a href="https://git.oschina.net/matyhtf/swoole/tree/2.0.1">Swoole2.0</a>支持了类似Go语言的<strong><a href="http://wiki.swoole.com/wiki/page/p-coroutine.html">协程</a></strong>，可以使用完全同步的代码实现异步程序。PHP代码无需额外增加任何关键词，底层自动进行协程调度，实现异步。</p>
+
         Swoole可以广泛应用于互联网、移动通信、企业软件、云计算、网络游戏、物联网（IOT）、车联网、智能家居等领域。
         使用PHP+Swoole作为网络通信框架，可以使企业IT研发团队的效率大大提升，更加专注于开发创新产品。
-        <p style="margin-top: 25px;"><a href="https://github.com/swoole/swoole-src" class="btn btn-primary">源代码(Github)</a>&nbsp;&nbsp;
-           <a href="https://github.com/swoole/swoole-src/issues/new" class="btn btn-danger">提交Bug</a>&nbsp;&nbsp;
-           <a href="https://github.com/swoole/swoole-src/issues/new" class="btn">提建议</a>&nbsp;&nbsp;
-           <a class="btn btn-sm btn-success" href="https://github.com/swoole/swoole-src/releases/tag/v<?=$version?>-stable">
+        <p style="margin-top: 25px;"><a href="https://git.oschina.net/matyhtf/swoole" class="btn btn-primary">源代码(开源中国-码云)</a>&nbsp;&nbsp;
+           <a href="http://git.oschina.net/matyhtf/swoole/issues/new" class="btn btn-danger">提交Bug</a>&nbsp;&nbsp;
+           <a href="http://git.oschina.net/matyhtf/swoole/issues/new" class="btn">提建议</a>&nbsp;&nbsp;
+           <a class="btn btn-sm btn-success" href="https://git.oschina.net/matyhtf/swoole/tree/v<?=$version?>">
              <i class="glyphicon glyphicon-download"></i> &nbsp; 下载 <span style="font-size: 60%;">(<?=$version?>)</span> &nbsp;
 		   </a>
+          <a class="btn btn-sm btn-success" href="https://git.oschina.net/matyhtf/swoole/tree/v2.0.5">
+             <i class="glyphicon glyphicon-download"></i> &nbsp; 下载 <span style="font-size: 60%;">(2.0.5)</span> &nbsp;
+		   </a>
         <a href="http://edu.csdn.net/course/detail/2800" class="btn btn-warning">视频教学课程</a>&nbsp;&nbsp;
         </p>
     </div>
@@ -95,7 +100,7 @@
             <ul class="nav nav-list">
                 <?php foreach($news as $v): ?>
                 <li style="height: 30px;">
-                    <a href="https://www.oschina.net<?=$v['link']?>" title="<?=$v['title']?>">
+                    <a href="<?=$v['link']?>" title="<?=$v['title']?>">
                     <?php
                     if (mb_strlen($v['title']) > 24) echo mb_substr($v['title'], 0, 24).'...'; else echo $v['title'];
                     ?>
@@ -120,7 +125,7 @@
                 <li>并发百万TCP连接</li>
                 <li>TCP/UDP/UnixSock</li>
                 <li>服务器端/客户端</li>
-                <li>全异步/半异步半同步</li>
+                <li>支持异步/同步/协程</li>
                 <li>支持多进程/多线程</li>
                 <li>CPU亲和性/守护进程</li>
                 <li>支持IPv4/IPv6网络</li>
diff --git a/script/update.php b/script/update.php
@@ -7,12 +7,12 @@
 function getNews()
 {
     $curl = new \Swoole\Client\CURL();
-    $html = $curl->get('https://www.oschina.net/p/swoole-server/news');
-    preg_match('#location\.href\="\?fromerr\=([a-z0-9]+)";#i', $html, $match);
-
-    $html = $curl->get('https://www.oschina.net/p/swoole-server/news?fromerr='.$match[1]);
+    $curl->addHeaders(array(
+        'Referer' => 'https://www.oschina.net/p/swoole-server',
+    ));
+    $html = $curl->get('https://www.oschina.net/search?scope=news&q=swoole&sort_by_time=1');
     $dom = new Swoole\DOM\Tree($html);
-    $list = $dom->find('ul.List > h3 > a');
+    $list = $dom->find('ul#results > h3 > a');
 
     $news = array();
     foreach ($list as $li)
@@ -31,7 +31,7 @@ function getLastVersion()
 {
     $curl = new \Swoole\Client\CURL();
     $html = $curl->get('http://git.oschina.net/matyhtf/swoole/tags', null, 30);
-    if ($html and preg_match('#/matyhtf/swoole/tree/v(\d+\.\d+\.\d+)\-stable#i', $html, $match))
+    if ($html and preg_match('#/matyhtf/swoole/tree/v(1\.9\.\d+)#i', $html, $match))
     {
         return $match[1];
     }
diff --git a/web/index.en.html b/web/index.en.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <title>Swoole: Event-driven asynchronous & concurrent networking engine with high performance for PHP</title>
+    <title>Swoole: Event-driven asynchronous & concurrent & coroutine networking engine with high performance for PHP</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="Swoole: Asynchronous & concurrent networking framework for PHP. ">
     <meta name="keywords" content="PHP,Swoole,PHP Asynchronous,TCP,UDP,PHP Application Server,PHP RPC Server">
@@ -80,8 +80,11 @@ <h2 style="margin-bottom: 25px;">Swoole：Redefined PHP Program Language</h2>
         <p style="margin-top: 25px;">
         <iframe src="http://ghbtns.com/github-btn.html?user=swoole&repo=swoole-src&type=star&count=true&size=large" frameborder="0" scrolling="0" width="160px" height="30px"></iframe>
         <iframe src="http://ghbtns.com/github-btn.html?user=swoole&repo=swoole-src&type=fork&count=true&size=large" frameborder="0" scrolling="0" width="158px" height="30px"></iframe>
-        <a class="btn btn-sm btn-success" href="https://github.com/swoole/swoole-src/releases/tag/v1.9.0-stable" style="margin-top: -20px; height: 20px;">
-			<i class="glyphicon glyphicon-download"></i> &nbsp; Download <span style="font-size: 60%;">(1.9.0)</span> &nbsp;
+        <a class="btn btn-sm btn-success" href="https://github.com/swoole/swoole-src/releases/tag/v1.9.4" style="margin-top: -20px; height: 20px;">
+			<i class="glyphicon glyphicon-download"></i> &nbsp; Download <span style="font-size: 60%;">(1.9.4)</span> &nbsp; &nbsp;
+
+      <a class="btn btn-sm btn-success" href="https://github.com/swoole/swoole-src/releases/tag/v2.0.5" style="margin-top: -20px; margin-left: 20px; height: 20px;">
+        <i class="glyphicon glyphicon-download"></i> &nbsp; Download <span style="font-size: 60%;">(2.0.5)</span> &nbsp;
 		</a>
         </p>
     </div>
@@ -114,8 +117,8 @@ <h3>Features</h3>
             <h3>Case</h3>
             <p style="line-height: 180%">
            Now, <a href="https://github.com/swoole/swoole-src/">Swoole</a> has been utilized by a number of applications like mobile Internet, networking communication, online games, mobile games and enterprises, instead of using C++ or Java to develop network program. 
-By using <a href="http://php.net/">PHP</a> + Swoole, development efficiency can be improved greatly. 
-Our well-known some large customers in China, but not limited, are: <a href="http://www.tencent.com/">Tencent<a>, 
+By using <a href="http://php.net/">PHP</a> + Swoole, development efficiency can be improved greatly.
+Our well-known some large customers in China, but not limited, are: <a href="http://www.tencent.com/">Tencent<a>,
         <a href="http://www.alibaba.com/">Alibaba</a>, <a href="https://www.baidu.com/">Baidu</a>, <a href="http://www.yy.com/">YY</a>, etc.
 The PHP network programming <a href="https://github.com/matyhtf/swoole_framework">framework</a> is provided officially based on Swoole extension, which can support for Http, FastCGI, WebSocket, FTP, SMTP, SOA and other network protocols.
             </p>
