fix merge

wuhan2020 · Apr 6, 2020 · f30a33c · f30a33c
2 parents c114de2 + 2492a01
commit f30a33c
Show file tree

Hide file tree

Showing 22 changed files with 70 additions and 1,174 deletions.
diff --git a/.github/calibre/image-actions.yml b/.github/calibre/image-actions.yml
@@ -0,0 +1,9 @@
+# https://github.com/marketplace/actions/image-actions
+jpeg:
+  quality: 80
+png:
+  quality: 100
+webp:
+  quality: 80
+ignorePaths:
+  - "node_modules/**"
diff --git a/.github/workflows/image-action.yml b/.github/workflows/image-action.yml
@@ -0,0 +1,15 @@
+# https://github.com/marketplace/actions/image-actions
+name: Compress images
+
+on: pull_request
+
+jobs:
+  build:
+    name: calibreapp/image-actions
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: calibreapp/image-actions
+        uses: docker://calibreapp/github-image-actions
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -0,0 +1 @@
+* @wuhan2020/team-nav
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 2020 援助武汉
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# 2019-nCoV 疫情信息导航网站
+# Covid-19 疫情信息导航网站
 
 ## 前言
 
@@ -40,37 +40,37 @@
 ### 后端服务
 最新版本后端服务采用go语言编写，部署接口时需要安装go语言环境(1.10以上版本)及相关依赖，然后将项目目录放入GOPATH路径下，完成后进入项目目录后执行
 ```shell script
-go build 
+go build
 # 假设项目目录为nCov-API
 nohup ./nCov-API &
 ```
 也可直接使用部署好的开放接口： [开放接口文档]()
 > 注意：
 > 原有http接口已升级为https协议 使用go语言直接配置的https服务，实现http与https共存较为复杂，且会接口性能有一定影响，因此不做共存支持。
 > 同时，目前https证书是直接配置到代码中的，实测https对比http本地QPS下降90%以上，因此性能要求较高的最好还是走http
-> 
-> http接口端口为2020 https端口为2021 如需使用https请及时替换  
+>
+> http接口端口为2020 https端口为2021 如需使用https请及时替换
 ```
 # 企业维护更稳定
 ## 最新总数统计
-http://ncov-api.werty.cn:2020/latest/tx/  
+http://ncov-api.werty.cn:2020/latest/tx/
 ## 含省份数据 相关资讯
-http://ncov-api.werty.cn:2020/original/tx/  
+http://ncov-api.werty.cn:2020/original/tx/
 
 #源自github开源项目 个人维护 偶尔不稳定
-http://ncov-api.werty.cn:2020/latest/dxy/ 
-http://ncov-api.werty.cn:2020/original/dxy/  
+http://ncov-api.werty.cn:2020/latest/dxy/
+http://ncov-api.werty.cn:2020/original/dxy/
 
-#患者同行查询接口 结果数据分页  分页参数 page 页码， limit 每页条数    
-http://ncov-api.werty.cn:2020/together/  
+#患者同行查询接口 结果数据分页  分页参数 page 页码， limit 每页条数
+http://ncov-api.werty.cn:2020/together/
 
-#疫情信息导航数据接口 
-http://ncov-api.werty.cn:2020/nav/app  
+#疫情信息导航数据接口
+http://ncov-api.werty.cn:2020/nav/app
 
 ```
 
 
-### 
+###
 
 ## 线上入口：
 
@@ -92,4 +92,4 @@ http://ncov-api.werty.cn:2020/nav/app
 
 ## 其他
 
-在疫情结束前，我会尽力添加更多的优质信息入口到疫情导航，如果你有优质的信息来源，或者其他建议，欢迎在[issue](https://github.com/wertycn/nCoV/issues)中反馈，也可联系邮箱[debugicu@163.com](mailto:debugicu@163.com)
+在疫情结束前，我会尽力添加更多的优质信息入口到疫情导航，如果你有优质的信息来源，或者其他建议，欢迎在[issue](https://github.com/wertycn/nCoV/issues)中反馈，也可联系邮箱[debugicu@163.com](mailto:debugicu@163.com)
diff --git a/public/assets/css/fonts/elusive/font/elusive.svg b/public/assets/css/fonts/elusive/font/elusive.svg
diff --git a/public/assets/css/fonts/fontawesome/fonts/fontawesome-webfont.svg b/public/assets/css/fonts/fontawesome/fonts/fontawesome-webfont.svg
diff --git a/public/assets/css/fonts/glyphicons/glyphicons-halflings-regular.svg b/public/assets/css/fonts/glyphicons/glyphicons-halflings-regular.svg
diff --git a/public/assets/css/fonts/linecons/font/linecons.svg b/public/assets/css/fonts/linecons/font/linecons.svg
diff --git a/public/assets/css/fonts/meteocons/font/meteocons.svg b/public/assets/css/fonts/meteocons/font/meteocons.svg
diff --git a/public/assets/images/flags/flag-cn.png b/public/assets/images/flags/flag-cn.png
diff --git a/public/assets/images/flags/flag-us.png b/public/assets/images/flags/flag-us.png
diff --git a/public/assets/images/logo@2x.png b/public/assets/images/logo@2x.png
diff --git a/public/assets/images/logo_dark@2x.png b/public/assets/images/logo_dark@2x.png
diff --git a/public/assets/images/preview.gif b/public/assets/images/preview.gif
diff --git a/public/assets/images/qqgroup_webstack.jpg b/public/assets/images/qqgroup_webstack.jpg
diff --git a/public/assets/images/qqgroup_webstack2.jpg b/public/assets/images/qqgroup_webstack2.jpg
diff --git a/public/assets/images/webstack_banner_cn.png b/public/assets/images/webstack_banner_cn.png
diff --git a/public/assets/images/webstack_icon_producthunt.png b/public/assets/images/webstack_icon_producthunt.png
diff --git a/public/assets/images/wechat_viggo.jpg b/public/assets/images/wechat_viggo.jpg
diff --git a/public/index.html b/public/index.html
@@ -6,10 +6,10 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <meta name="author" content="werty.cn"/>
-    <title>2019-nCoV疫情信息导航</title>
+    <title>Covid-19疫情信息导航</title>
     <meta name="keywords"
-          content="2019-nCov,疫情信息,疫情导航,疫情信息导航,疫情数据,nCoV导航,2019nCoV,疫情网站导航,武汉疫情导航,武汉疫情,新冠状病毒导航,疫情网址大全,疫情捐助,nCov.ink">
-    <meta name="description" content="2019-nCov 疫情信息导航 www.ncov.ink">
+          content="Covid-19,疫情信息,疫情导航,疫情信息导航,疫情数据,nCoV导航,2019nCoV,疫情网站导航,武汉疫情导航,武汉疫情,新冠状病毒导航,疫情网址大全,疫情捐助,nCov.ink">
+    <meta name="description" content="Covid-19 疫情信息导航 www.ncov.ink">
     <link rel="shortcut icon" href="./assets/images/favicon.png">
     <!--    <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Arimo:400,700,400italic">-->
     <link rel="stylesheet" href="./assets/css/fonts/linecons/css/linecons.css">
@@ -29,7 +29,7 @@
     <meta property="og:type" content="article">
     <meta property="og:url" content="http://www.nocv.ink/">
     <meta property="og:title" content="nCovNav - 收集实时疫情数据、防疫知识网站、求助及援助信息等 www.ncov.ink">
-    <meta property="og:description" content="2019-nCov 疫情信息导航 www.ncov.ink">
+    <meta property="og:description" content="Covid-19 疫情信息导航 www.ncov.ink">
     <!--    <meta property="og:image" content="http://webstack.cc/assets/images/webstack_banner_cn.png">-->
     <style>
         .focus-data {
@@ -91,7 +91,7 @@
 
 <body class="page-body">
 <div style="text-align: center;margin-top: 30px">
-    <h2>2019-nCoV 疫情信息导航</h2>
+    <h2>Covid-19 疫情信息导航</h2>
     <h3>武汉加油！中国加油！</h3>
 </div>
 <div>

diff --git a/public/nav.json b/public/nav.json
@@ -18,13 +18,6 @@
           "url": "https://mp.weixin.qq.com/s/an0e2ThJ1YHUE7T3Vrbsdw",
           "device": "all"
         },
-        {
-          "title": "确诊患者同行程查询工具",
-          "desc": "人民日报发布 确诊患者同行程查询工具 ",
-          "image": "http://image.werty.cn/source_blog/20200127132014.jfif",
-          "url": "https://h5.peopleapp.com/txcx/index.html",
-          "device": "all"
-        },
         {
           "title": "确诊小区查询",
           "desc": "患者小区查询工具 ",