From 0ab1f3b5091716f633ebe3805508d2e72e65722c Mon Sep 17 00:00:00 2001
From: iotcat <i@iotcat.me>
Date: Tue, 4 Feb 2020 12:31:18 +0000
Subject: [PATCH] city bug fixed

---
 README.md    | 43 +++++++++++++++++++++++++++++++------------
 index.js     |  6 +++++-
 package.json |  2 +-
 3 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 3f28ed4..5eabf7c 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,27 @@
 # coro-api
-新型冠状病毒 api
+新型冠状病毒 实时数据 api
 
-## 快速开始
+## API示例
+
+### 获取全部
+
+[https://api.yimian.xyz/coro](https://api.yimian.xyz/coro)
+
+### 根据省份
+
+[https://api.yimian.xyz/coro?province=山东](https://api.yimian.xyz/coro?province=山东)  
+
+### 根据城市
+
+[https://api.yimian.xyz/coro?city=泰安](https://api.yimian.xyz/coro?city=泰安)
+
+### 根据省和城(推荐)
+
+[https://api.yimian.xyz/coro?province=山东&city=泰安](https://api.yimian.xyz/coro?province=山东&city=泰安`) 
+
+
+
+## 快速部署
 
 ### 环境要求
  - `nodeJS`支持`express`任意版本
@@ -22,30 +42,29 @@ $ npm install
 $ node index.js
 ```
 
-## 访问
+### 访问
 ```
 http://localhost:17676
 ```
 
-## GET参数
+
+## 进阶
+
+### GET参数
  参数 | 描述 | 示例 
  :--: | :--: | :--:
  province | 省份(国家) | 山东
  city | 城市 | 泰安
 
-```
-http://localhost:17676/?province=山东
-```
-```
-http://localhost:17676/?city=泰安
-```
-
-## 进阶
 
 ### 修改端口
 
 从`index.js`第9行修改默认端口。
 
+### 禁止跨域
+
+注释掉`index.js`第13行。
+
 ### 使用pm2守护进程
 
 ```shell
diff --git a/index.js b/index.js
index c9eaee1..56aef69 100644
--- a/index.js
+++ b/index.js
@@ -9,6 +9,10 @@ var app = require('express')();
 app.listen(17676 /*default port*/, () => console.log('Coro API listening on port 17676!'));
 
 app.get('/', async (req, res) => {
+	/* corss domain */
+	res.header("Access-Control-Allow-Origin", "*");
+
+	/* get info from coro-py */
 	var o = await coro();
 
 	/* req province & city */
@@ -54,7 +58,7 @@ app.get('/', async (req, res) => {
 						if(city.cityName == req.query.city){
 							resolve(city);
 						}else{
-							if(city_index == item.cities.length-1){
+							if(city_index == item.cities.length-1 && index == o.length-1){
 								resolve({});
 							}
 						}
diff --git a/package.json b/package.json
index 6bbe4e2..857dc26 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coro-api",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "新型冠状病毒 API",
   "main": "index.js",
   "scripts": {