Merge branch 'master' into 'master'

Master

See merge request csdn/csdn-tags!17

.gitignore

 __pycache__
-test.html
\ No newline at end of file
+test.html
+.DS_Store
\ No newline at end of file

README.md

@@ -36,4 +36,8 @@ mobile App 中用户发blink，也可以自带标签
 * [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)
+* [1.2: 融合到用户中心版本](./versions/category_tag_v_1.2_expand_with_uc.json)
+    * category_id >= 3000 为新分配
+    * tag_id >= 400000 为新分配
+    * [变动，不包含"其他"频道](./versions/category_tag_diff_1.1_and_1.2.json)
\ No newline at end of file

versions/category_tag_diff_1.1_and_1.2.json

+[
+  {
+    "id": 2001,
+    "name": "后端",
+    "tags": [
+      {
+        "tag_id": 400001,
+        "tag_name": "架构",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400002,
+        "tag_name": "分布式",
+        "insert_new_tag": true
+      }
+    ]
+  },
+  {
+    "id": 3001,
+    "name": "安全",
+    "tags": [
+      {
+        "tag_id": 400003,
+        "tag_name": "系统安全",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400004,
+        "tag_name": "web安全",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400005,
+        "tag_name": "安全架构",
+        "insert_new_tag": true
+      }
+    ],
+    "insert_new_category": true
+  },
+  {
+    "id": 1,
+    "name": "Android",
+    "tags": [
+      {
+        "tag_id": 400006,
+        "tag_name": "gradle",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400007,
+        "tag_name": "android jetpack",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400009,
+        "tag_name": "rxjava",
+        "insert_new_tag": true
+      }
+    ]
+  },
+  {
+    "id": 15,
+    "name": "iOS",
+    "tags": [
+      {
+        "tag_id": 400010,
+        "tag_name": "swiftui",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400011,
+        "tag_name": "cocoapods",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400012,
+        "tag_name": "wwdc",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400013,
+        "tag_name": "rxswift",
+        "insert_new_tag": true
+      }
+    ]
+  },
+  {
+    "id": 11,
+    "name": "前端",
+    "tags": [
+      {
+        "tag_id": 400014,
+        "tag_name": "xhtml",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400015,
+        "tag_name": "前端框架",
+        "insert_new_tag": true
+      }
+    ]
+  },
+  {
+    "id": 14,
+    "name": "人工智能",
+    "tags": [
+      {
+        "tag_id": 400016,
+        "tag_name": "图像处理",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400017,
+        "tag_name": "nlp",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400018,
+        "tag_name": "数据分析",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400021,
+        "tag_name": "scikit-learn",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400022,
+        "tag_name": "聚类",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400023,
+        "tag_name": "集成学习",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400024,
+        "tag_name": "迁移学习",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400025,
+        "tag_name": "分类",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400026,
+        "tag_name": "回归",
+        "insert_new_tag": true
+      }
+    ]
+  },
+  {
+    "id": 20,
+    "name": "大数据",
+    "tags": [
+      {
+        "tag_id": 400019,
+        "tag_name": "数据仓库",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400020,
+        "tag_name": "etl",
+        "insert_new_tag": true
+      }
+    ]
+  },
+  {
+    "id": 2003,
+    "name": "运维",
+    "tags": [
+      {
+        "tag_id": 400027,
+        "tag_name": "自动化",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400028,
+        "tag_name": "kubernetes",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400029,
+        "tag_name": "系统架构",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400030,
+        "tag_name": "网络",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400031,
+        "tag_name": "运维开发",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400032,
+        "tag_name": "graylog",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400033,
+        "tag_name": "elk",
+        "insert_new_tag": true
+      }
+    ]
+  },
+  {
+    "id": 3002,
+    "name": "数据库管理",
+    "tags": [
+      {
+        "tag_id": 400034,
+        "tag_name": "数据库架构",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400035,
+        "tag_name": "dba",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400036,
+        "tag_name": "etl工程师",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400019,
+        "tag_name": "数据仓库",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400037,
+        "tag_name": "数据库开发",
+        "insert_new_tag": true
+      }
+    ],
+    "insert_new_category": true
+  },
+  {
+    "id": 3003,
+    "name": "硬件开发",
+    "tags": [
+      {
+        "tag_id": 400038,
+        "tag_name": "硬件工程",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400039,
+        "tag_name": "驱动开发",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400040,
+        "tag_name": "fpga开发",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400041,
+        "tag_name": "dsp开发",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400042,
+        "tag_name": "arm开发",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400043,
+        "tag_name": "材料工程",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400044,
+        "tag_name": "精益工程",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400045,
+        "tag_name": "射频工程",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400046,
+        "tag_name": "基带工程",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400047,
+        "tag_name": "硬件架构",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400048,
+        "tag_name": "pcb工艺",
+        "insert_new_tag": true
+      }
+    ],
+    "insert_new_category": true
+  },
+  {
+    "id": 3004,
+    "name": "产品/运营",
+    "tags": [
+      {
+        "tag_id": 400049,
+        "tag_name": "新媒体运营",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400050,
+        "tag_name": "内容运营",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400051,
+        "tag_name": "用户运营",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400052,
+        "tag_name": "产品运营",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400053,
+        "tag_name": "axure",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400054,
+        "tag_name": "墨刀",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400055,
+        "tag_name": "流量运营",
+        "insert_new_tag": true
+      }
+    ],
+    "insert_new_category": true
+  },
+  {
+    "id": 3005,
+    "name": "设计",
+    "tags": [
+      {
+        "tag_id": 400056,
+        "tag_name": "交互",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400057,
+        "tag_name": "ux",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400058,
+        "tag_name": "ui",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400059,
+        "tag_name": "illustrator",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400060,
+        "tag_name": "平面",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400061,
+        "tag_name": "photoshop",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400062,
+        "tag_name": "sketch",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400063,
+        "tag_name": "3d",
+        "insert_new_tag": true
+      }
+    ],
+    "insert_new_category": true
+  },
+  {
+    "id": 1014,
+    "name": "软件工程",
+    "tags": [
+      {
+        "tag_id": 400008,
+        "tag_name": "性能优化",
+        "insert_new_tag": true
+      }
+    ]
+  },
+  {
+    "id": 3006,
+    "name": "云原生",
+    "tags": [
+      {
+        "tag_id": 400064,
+        "tag_name": "云原生",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400002,
+        "tag_name": "分布式",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400065,
+        "tag_name": "中间件",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400066,
+        "tag_name": "微服务",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400067,
+        "tag_name": "服务发现",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400068,
+        "tag_name": "无服务器",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400069,
+        "tag_name": "阿里云",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400070,
+        "tag_name": "aws",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400071,
+        "tag_name": "cloud native",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400072,
+        "tag_name": "paas",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400073,
+        "tag_name": "serverless",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400074,
+        "tag_name": "microservices",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400075,
+        "tag_name": "mesh",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400076,
+        "tag_name": "CNCF",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400077,
+        "tag_name": "dashboard",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400078,
+        "tag_name": "gateway",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400079,
+        "tag_name": "kubeless",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400028,
+        "tag_name": "kubernetes",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400080,
+        "tag_name": "ribbon",
+        "insert_new_tag": true
+      },
+      {
+        "tag_id": 400081,
+        "tag_name": "spring cloud",
+        "insert_new_tag": true
+      }
+    ],
+    "insert_new_category": true
+  }
+]
\ No newline at end of file