Merge branch 'master' into 'master'

统一标签融合到博客，扩展版本更新

See merge request csdn/csdn-tags!15

README.md

@@ -10,9 +10,9 @@ CSDN 在长期发展中，各个业务发展出各有特色的标签定义和用
 论坛中，不同的子论坛，也是一种标签
 下载业务有很多资源标签
 mobile App 中用户发blink，也可以自带标签
-... 
+...
 
-# 出发点
+## 出发点
 
 这是一个初稿，设计的出发点：
 
@@ -20,14 +20,20 @@ mobile App 中用户发blink，也可以自带标签
 - 只有二级结构，可以允许标签在各种类型中重复
 - 都是小写，如果有通用的中文词汇， 使用中文词汇而不是英文。 
 
-## Q&A
-<!-->
-1. 是否会影响现在的标签使用？比如用户还可以继续在博客、问答等产品中自由使用标签吗？
+## 名词解释
 
-    > 现在标签是用户自由生成的，基于用户的需要随意创建
+* 一级标签命名为`频道`, 单词使用： `category`
+* 二级标签，单词使用：`tag`
 
-2. 是否会有一套统一的标签体系？如果有的话我如何去贡献？
+## 版本
 
-    > 比如一个 CSDN Tags 的 wiki ？需要新增一个 Tag 就是类似去创建一个 wiki 页？
+每个版本基于前一个版本扩展+根据一组策略修订，1.0开始之后，保持向下兼容
 
-<--!>
+* [0.1: 初始版本](./versions/category_tag_v_0.1.toml)
+* [1.0: 融合到问答版本](./versions/category_tag_v_1.0_expand_with_ask.json)
+    * category_id >= 1000 为新分配
+    * tag_id >= 200000 为新分配
+* [1.1: 融合到博客版本](./versions/category_tag_v_1.1_expand_with_blog.json)
+    * category_id >= 2000 为新分配
+    * tag_id >= 300000 为新分配
+    * [变动，不包含"其他"频道](./versions/category_tag_diff_1.0_and_1.1.json)
\ No newline at end of file

versions/category_tag_diff_1.0_and_1.1.json

+[
+  {
+    "id": 21,
+    "name": "开发工具",
+    "tags": [
+      {
+        "tag_id": 300003,
+        "tag_name": "visual studio code"
+      },
+      {
+        "tag_id": 300004,
+        "tag_name": "sublime text"
+      },
+      {
+        "tag_id": 300005,
+        "tag_name": "intellij idea"
+      },
+      {
+        "tag_id": 300006,
+        "tag_name": "webstorm"
+      },
+      {
+        "tag_id": 300007,
+        "tag_name": "编辑器"
+      }
+    ]
+  },
+  {
+    "id": 20,
+    "name": "大数据",
+    "tags": [
+      {
+        "tag_id": 300001,
+        "tag_name": "数据库"
+      },
+      {
+        "tag_id": 300002,
+        "tag_name": "mariadb"
+      },
+      {
+        "tag_id": 300050,
+        "tag_name": "talkingdata"
+      },
+      {
+        "tag_id": 300051,
+        "tag_name": "涛思数据"
+      },
+      {
+        "tag_id": 300052,
+        "tag_name": "kylin"
+      },
+      {
+        "tag_id": 300053,
+        "tag_name": "hdfs"
+      },
+      {
+        "tag_id": 300054,
+        "tag_name": "mapreduce"
+      },
+      {
+        "tag_id": 300055,
+        "tag_name": "cloudera"
+      },
+      {
+        "tag_id": 300056,
+        "tag_name": "ambari"
+      },
+      {
+        "tag_id": 300057,
+        "tag_name": "sqoop"
+      },
+      {
+        "tag_id": 300058,
+        "tag_name": "odps"
+      },
+      {
+        "tag_id": 300059,
+        "tag_name": "大数据"
+      }
+    ]
+  },
+  {
+    "id": 11,
+    "name": "前端",
+    "tags": [
+      {
+        "tag_id": 300025,
+        "tag_name": "html"
+      },
+      {
+        "tag_id": 300026,
+        "tag_name": "reactjs"
+      },
+      {
+        "tag_id": 300027,
+        "tag_name": "es6"
+      },
+      {
+        "tag_id": 300028,
+        "tag_name": "npm"
+      },
+      {
+        "tag_id": 300029,
+        "tag_name": "sass"
+      },
+      {
+        "tag_id": 300030,
+        "tag_name": "chrome devtools"
+      },
+      {
+        "tag_id": 300031,
+        "tag_name": "angular"
+      },
+      {
+        "tag_id": 300032,
+        "tag_name": "coffeescript"
+      },
+      {
+        "tag_id": 300033,
+        "tag_name": "postcss"
+      },
+      {
+        "tag_id": 300034,
+        "tag_name": "fiddler"
+      },
+      {
+        "tag_id": 300035,
+        "tag_name": "webkit"
+      },
+      {
+        "tag_id": 300036,
+        "tag_name": "yarn"
+      },
+      {
+        "tag_id": 300037,
+        "tag_name": "firebug"
+      },
+      {
+        "tag_id": 300038,
+        "tag_name": "edge"
+      },
+      {
+        "tag_id": 300039,
+        "tag_name": "webpack"
+      },
+      {
+        "tag_id": 300040,
+        "tag_name": "前端"
+      },
+      {
+        "tag_id": 300064,
+        "tag_name": "xss"
+      },
+      {
+        "tag_id": 300065,
+        "tag_name": "csrf"
+      }
+    ]
+  },
+  {
+    "id": 2001,
+    "name": "后端",
+    "tags": [
+      {
+        "tag_id": 13,
+        "tag_name": "java"
+      },
+      {
+        "tag_id": 45,
+        "tag_name": "php"
+      },
+      {
+        "tag_id": 87999,
+        "tag_name": "node.js"
+      },
+      {
+        "tag_id": 8,
+        "tag_name": "python"
+      },
+      {
+        "tag_id": 83,
+        "tag_name": "c++"
+      },
+      {
+        "tag_id": 95,
+        "tag_name": "c语言"
+      },
+      {
+        "tag_id": 288,
+        "tag_name": "c#"
+      },
+      {
+        "tag_id": 133891,
+        "tag_name": "golang"
+      },
+      {
+        "tag_id": 932,
+        "tag_name": "spring"
+      },
+      {
+        "tag_id": 6361,
+        "tag_name": "django"
+      },
+      {
+        "tag_id": 81020,
+        "tag_name": "flask"
+      },
+      {
+        "tag_id": 300008,
+        "tag_name": "spring boot"
+      },
+      {
+        "tag_id": 300009,
+        "tag_name": "swoole"
+      },
+      {
+        "tag_id": 300,
+        "tag_name": "ruby"
+      },
+      {
+        "tag_id": 5152,
+        "tag_name": "asp.net"
+      },
+      {
+        "tag_id": 300010,
+        "tag_name": "ruby on rails"
+      },
+      {
+        "tag_id": 73819,
+        "tag_name": "scala"
+      },
+      {
+        "tag_id": 200024,
+        "tag_name": "rust"
+      },
+      {
+        "tag_id": 300011,
+        "tag_name": "lavarel"
+      },
+      {
+        "tag_id": 300012,
+        "tag_name": "爬虫"
+      },
+      {
+        "tag_id": 300013,
+        "tag_name": "后端"
+      },
+      {
+        "tag_id": 300063,
+        "tag_name": "restful"
+      },
+      {
+        "tag_id": 300066,
+        "tag_name": "graphql"
+      }
+    ]
+  },
+  {
+    "id": 1011,
+    "name": "移动开发",
+    "tags": [
+      {
+        "tag_id": 300014,
+        "tag_name": "react native"
+      },
+      {
+        "tag_id": 300015,
+        "tag_name": "android studio"
+      },
+      {
+        "tag_id": 300016,
+        "tag_name": "web app"
+      }
+    ]
+  },
+  {
+    "id": 14,
+    "name": "人工智能",
+    "tags": [
+      {
+        "tag_id": 300073,
+        "tag_name": "openvino"
+      },
+      {
+        "tag_id": 300074,
+        "tag_name": "边缘计算"
+      },
+      {
+        "tag_id": 300075,
+        "tag_name": "超分辨率重建"
+      },
+      {
+        "tag_id": 300076,
+        "tag_name": "智慧城市"
+      },
+      {
+        "tag_id": 300077,
+        "tag_name": "视觉检测"
+      }
+    ]
+  },
+  {
+    "id": 1008,
+    "name": "网络",
+    "tags": [
+      {
+        "tag_id": 300067,
+        "tag_name": "rpc"
+      }
+    ]
+  },
+  {
+    "id": 6,
+    "name": "开放平台",
+    "tags": [
+      {
+        "tag_id": 300060,
+        "tag_name": "oneapi"
+      }
+    ]
+  },
+  {
+    "id": 2002,
+    "name": "数学",
+    "tags": [
+      {
+        "tag_id": 300017,
+        "tag_name": "线性代数"
+      },
+      {
+        "tag_id": 300018,
+        "tag_name": "矩阵"
+      },
+      {
+        "tag_id": 300019,
+        "tag_name": "概率论"
+      },
+      {
+        "tag_id": 300020,
+        "tag_name": "拓扑学"
+      },
+      {
+        "tag_id": 300021,
+        "tag_name": "抽象代数"
+      },
+      {
+        "tag_id": 300022,
+        "tag_name": "几何学"
+      },
+      {
+        "tag_id": 68,
+        "tag_name": "算法"
+      },
+      {
+        "tag_id": 10398,
+        "tag_name": "动态规划"
+      },
+      {
+        "tag_id": 300023,
+        "tag_name": "图论"
+      },
+      {
+        "tag_id": 300024,
+        "tag_name": "傅立叶分析"
+      }
+    ]
+  },
+  {
+    "id": 2003,
+    "name": "运维",
+    "tags": [
+      {
+        "tag_id": 479,
+        "tag_name": "linux"
+      },
+      {
+        "tag_id": 3458,
+        "tag_name": "nginx"
+      },
+      {
+        "tag_id": 76601,
+        "tag_name": "docker"
+      },
+      {
+        "tag_id": 661,
+        "tag_name": "apache"
+      },
+      {
+        "tag_id": 587,
+        "tag_name": "ubuntu"
+      },
+      {
+        "tag_id": 2367,
+        "tag_name": "centos"
+      },
+      {
+        "tag_id": 300041,
+        "tag_name": "服务器"
+      },
+      {
+        "tag_id": 1512,
+        "tag_name": "负载均衡"
+      },
+      {
+        "tag_id": 300042,
+        "tag_name": "运维"
+      },
+      {
+        "tag_id": 300043,
+        "tag_name": "ssh"
+      },
+      {
+        "tag_id": 300044,
+        "tag_name": "vagrant"
+      },
+      {
+        "tag_id": 300045,
+        "tag_name": "容器"
+      },
+      {
+        "tag_id": 300046,
+        "tag_name": "jenkins"
+      },
+      {
+        "tag_id": 300047,
+        "tag_name": "devops"
+      },
+      {
+        "tag_id": 300048,
+        "tag_name": "debian"
+      },
+      {
+        "tag_id": 300049,
+        "tag_name": "fabric"
+      }
+    ]
+  },
+  {
+    "id": 26,
+    "name": "职场和发展",
+    "tags": [
+      {
+        "tag_id": 300068,
+        "tag_name": "面试"
+      },
+      {
+        "tag_id": 300069,
+        "tag_name": "程序人生"
+      }
+    ]
+  }
+]
\ No newline at end of file