Merge branch 'DoNET' into 'master'

DotNET See merge request !20

Merge branch 'DoNET' into 'master'
DotNET See merge request !20
6db77e9e · Miykael_xxm · ecb3c2e3 · 3f00eea2 · 6db77e9e · 6db77e9e
5 changed file
--- a/lives/2020-12-19/.gitkeep
+++ b/lives/2020-12-19/.gitkeep
--- a/lives/2020-12-19/day.yml
+++ b/lives/2020-12-19/day.yml
+# 日期时间戳标志
+timestamp: '2020-12-19'
+title: '2020 中国 .NET 开发者大会 第一天'
+items:
+# 数组需要根据 start-point 排序
+#1 
+  - start_time: '9:30'
+    end_time: '12:00'
+    title: '主会场'
+    namespace_path: ' '
+    description: '2020 中国 .NET 开发者大会 主会场'
+    live_link: 'https://live.csdn.net/room/dotnetconf/vsSvMjB9'
+#2 
+  - start_time: '13:00'
+    end_time: '17:30'
+    title: 'A会场'
+    namespace_path: ' '
+    description: '2020 中国 .NET 开发者大会 A会场'
+    live_link: 'https://live.csdn.net/room/dotnetconf/uKxekbk8'
+#3   
+  - start_time: '13:00'
+    end_time: '17:30'
+    title: 'B会场'
+    namespace_path: ' '
+    description: '2020 中国 .NET 开发者大会 B会场'
+    live_link: 'https://live.csdn.net/room/weixin_41960540/0qprIByz'
+#4   
+  - start_time: '13:00'
+    end_time: '17:30'
+    title: 'C会场'
+    namespace_path: ' '
+    description: '2020 中国 .NET 开发者大会 C会场'
+    live_link: 'https://live.csdn.net/room/weixin_41960540/0qprIByz'
+#5   
+  - start_time: '13:00'
+    end_time: '17:30'
+    title: 'D会场'
+    namespace_path: ' '
+    description: '2020 中国 .NET 开发者大会 D会场'
+    live_link: 'https://live.csdn.net/room/weixin_41960540/0qprIByz'
+#6   
+  - start_time: '13:00'
+    end_time: '17:30'
+    title: 'E会场'
+    namespace_path: ' '
+    description: '2020 中国 .NET 开发者大会 E会场'
+    live_link: 'https://live.csdn.net/room/weixin_41960540/0qprIByz'
+#7   
+  - start_time: '9:30'
+    end_time: '17:30'
+    title: 'Dev Speak'
+    namespace_path: ' '
+    description: '2020 中国 .NET 开发者大会 Dev Speak'
+    live_link: 'https://live.csdn.net/room/MicrosoftReactor/ShT8y1Us'
+
+relations:
+  - url: ''
+    timestamp: '2020-12-20'
+    title: '2020 中国 .NET 开发者大会 第二天'
+#  - url: ''
+#    timestamp: '2020-12-10'
+#    title: 'GitHub Universe 2020 (12月10日)'
+#  - url: ''
+#    timestamp: '2020-12-11'
+#    title: 'GitHub Universe 2020 (12月11日)'
\ No newline at end of file
--- a/lives/2020-12-20/.gitkeep
+++ b/lives/2020-12-20/.gitkeep
--- a/lives/2020-12-20/day.yml
+++ b/lives/2020-12-20/day.yml
+# 日期时间戳标志
+timestamp: '2020-12-20'
+title: '2020 中国 .NET 开发者大会 第二天'
+items:
+# 数组需要根据 start-point 排序
+#1 
+  - start_time: '9:30'
+    end_time: '17:30'
+    title: '工作坊1'
+    namespace_path: ' '
+    description: '2020 中国 .NET 开发者大会 工作坊1'
+    live_link: 'https://live.csdn.net/room/dotnetconf/GicfPMqm'
+#2 
+  - start_time: '9:30'
+    end_time: '17:30'
+    title: '工作坊2'
+    namespace_path: ' '
+    description: '2020 中国 .NET 开发者大会 工作坊2'
+    live_link: 'https://live.csdn.net/room/weixin_41960540/fGnzuLu5'
+relations:
+  - url: ''
+    timestamp: '2020-12-19'
+    title: '2020 中国 .NET 开发者大会 第一天'
+#  - url: ''
+#    timestamp: '2020-12-10'
+#    title: 'GitHub Universe 2020 (12月10日)'
+#  - url: ''
+#    timestamp: '2020-12-11'
+#    title: 'GitHub Universe 2020 (12月11日)'
\ No newline at end of file
--- a/lives/index.yml
+++ b/lives/index.yml
 banner: 
-  mobile_url: 'https://codechina.csdn.net/codechina/operation-work/uploads/887d32b0ed4719c3fb66b2c47f56bd8f/375x211.jpg'
-  pc_url: 'https://codechina.csdn.net/codechina/operation-work/uploads/ddbc3d36134053423eb6f0692645b045/1920x480.jpg'
+  mobile_url: 'https://codechina.csdn.net/codechina/operation-work/uploads/f7f6f0ae9e87aa4c0836f9162a143f44/375X211.jpg'
+  pc_url: 'https://codechina.csdn.net/codechina/operation-work/uploads/1bfa0eacc4e4269a72eee7e46706c824/1920X480.jpg'
  link:  'https://codechina.csdn.net/lives'
 # 日期时间戳标志
-current: '2020-12-11'
+current: '2020-12-19'
 # 描述 富文本
-description: "Github Universe 2020"
+description: "2020 中国 .NET 开发者大会"
 lives:
 #1 
-  - url: 'https://live.csdn.net/room-iframe/MicrosoftReactor/4IT1R01O'
-    wap_url: 'https://live.csdn.net/room/MicrosoftReactor/4IT1R01O'
-    title: '安全开发 for Developer	美洲与欧洲'
-    image: 'https://codechina.csdn.net/uploads/-/system/group/avatar/9733/GitHub-Mark-120px-plus.png?width=72'
-    live_id: '4IT1R01O'
+  - url: 'https://live.csdn.net/room-iframe/dotnetconf/vsSvMjB9'
+    wap_url: 'https://live.csdn.net/room/dotnetconf/vsSvMjB9'
+    title: '.NET Conf China 2020 主会场'
+    image: 'https://codechina.csdn.net/uploads/-/system/project/avatar/8723/dotnet.jpeg?width=90'
+    live_id: 'vsSvMjB9'
 #2 
-  - url: 'https://live.csdn.net/room-iframe/weixin_41960540/k0nZhRfw'
-    wap_url: 'https://live.csdn.net/room/weixin_41960540/k0nZhRfw'
-    title: '安全开发 for Enterprise	美洲与欧洲'
-    image: 'https://codechina.csdn.net/uploads/-/system/group/avatar/9733/GitHub-Mark-120px-plus.png?width=72'
-    live_id: 'k0nZhRfw'
+  - url: 'https://live.csdn.net/room-iframe/dotnetconf/uKxekbk8'
+    wap_url: 'https://live.csdn.net/room/dotnetconf/uKxekbk8'
+    title: '.NET Conf China 2020 A会场'
+    image: 'https://codechina.csdn.net/uploads/-/system/project/avatar/8723/dotnet.jpeg?width=90'
+    live_id: 'uKxekbk8'
 #3 
-  - url: 'https://live.csdn.net/room-iframe/MicrosoftReactor/gefwy6Tw'
-    wap_url: 'https://live.csdn.net/room/MicrosoftReactor/gefwy6Tw'
-    title: '安全开发 for Developer	亚太地区'
-    image: 'https://codechina.csdn.net/uploads/-/system/group/avatar/9733/GitHub-Mark-120px-plus.png?width=72'
-    live_id: 'gefwy6Tw'
+  - url: 'https://live.csdn.net/room-iframe/weixin_41960540/0qprIByz'
+    wap_url: 'https://live.csdn.net/room/weixin_41960540/0qprIByz'
+    title: '.NET Conf China 2020 B会场'
+    image: 'https://codechina.csdn.net/uploads/-/system/project/avatar/8723/dotnet.jpeg?width=90'
+    live_id: '0qprIByz'
 #4 
-  - url: 'https://live.csdn.net/room-iframe/weixin_41960540/z3UWJhdm'
-    wap_url: 'https://live.csdn.net/room/weixin_41960540/z3UWJhdm'
-    title: '安全开发 for Enterprise	亚太地区'
-    image: 'https://codechina.csdn.net/uploads/-/system/group/avatar/9733/GitHub-Mark-120px-plus.png?width=72'
-    live_id: 'z3UWJhdm'
+  - url: 'https://live.csdn.net/room-iframe/sD7O95O/y5BBhpoL'
+    wap_url: 'https://live.csdn.net/room/sD7O95O/y5BBhpoL'
+    title: '.NET Conf China 2020 C会场'
+    image: 'https://codechina.csdn.net/uploads/-/system/project/avatar/8723/dotnet.jpeg?width=90'
+    live_id: 'y5BBhpoL'
 #5 
-  - url: 'https://live.csdn.net/room-iframe/MicrosoftReactor/H3IXntxk'
-    wap_url: 'https://live.csdn.net/room/MicrosoftReactor/H3IXntxk'
-    title: 'DevOps for Developer	美洲与欧洲'
-    image: 'https://codechina.csdn.net/uploads/-/system/group/avatar/9733/GitHub-Mark-120px-plus.png?width=72'
-    live_id: 'H3IXntxk'    
+  - url: 'https://live.csdn.net/room-iframe/shanyou/1abV7F6t'
+    wap_url: 'https://live.csdn.net/room/shanyou/1abV7F6t'
+    title: '.NET Conf China 2020 D会场'
+    image: 'https://codechina.csdn.net/uploads/-/system/project/avatar/8723/dotnet.jpeg?width=90'
+    live_id: '1abV7F6t'    
 #6 
-  - url: 'https://live.csdn.net/room-iframe/weixin_41960540/s6JIDQK3'
-    wap_url: 'https://live.csdn.net/room/weixin_41960540/s6JIDQK3'
-    title: 'DevOps for Enterprise	美洲与欧洲'
-    image: 'https://codechina.csdn.net/uploads/-/system/group/avatar/9733/GitHub-Mark-120px-plus.png?width=72'
-    live_id: 's6JIDQK3' 
+  - url: 'https://live.csdn.net/room-iframe/csdn_codechina/hJUomJAg'
+    wap_url: 'https://live.csdn.net/room/csdn_codechina/hJUomJAg'
+    title: '.NET Conf China 2020 E会场'
+    image: 'https://codechina.csdn.net/uploads/-/system/project/avatar/8723/dotnet.jpeg?width=90'
+    live_id: 'hJUomJAg' 
 #7 
-  - url: 'https://live.csdn.net/room-iframe/MicrosoftReactor/QW9IzD4p'
-    wap_url: 'https://live.csdn.net/room/MicrosoftReactor/QW9IzD4p'
-    title: 'DevOps for Developer	亚太地区'
-    image: 'https://codechina.csdn.net/uploads/-/system/group/avatar/9733/GitHub-Mark-120px-plus.png?width=72'
-    live_id: 'QW9IzD4p'
+  - url: 'https://live.csdn.net/room-iframe/MicrosoftReactor/ShT8y1Us'
+    wap_url: 'https://live.csdn.net/room/MicrosoftReactor/ShT8y1Us'
+    title: '.NET Conf China 2020 Dev Speak'
+    image: 'https://codechina.csdn.net/uploads/-/system/project/avatar/8723/dotnet.jpeg?width=90'
+    live_id: 'ShT8y1Us'
 #8 
-  - url: 'https://live.csdn.net/room-iframe/weixin_41960540/5pCIOUDd'
-    wap_url: 'https://live.csdn.net/room/weixin_41960540/5pCIOUDd'
-    title: 'DevOps for Enterprise	亚太地区'
-    image: 'https://codechina.csdn.net/uploads/-/system/group/avatar/9733/GitHub-Mark-120px-plus.png?width=72'
+  - url: 'https://live.csdn.net/room-iframe/dotnetconf/GicfPMqm'
+    wap_url: 'https://live.csdn.net/room/dotnetconf/GicfPMqm'
+    title: '.NET Conf China 2020 Dev Speak 工作坊1'
+    image: 'https://codechina.csdn.net/uploads/-/system/project/avatar/8723/dotnet.jpeg?width=90'
    live_id: '5pCIOUDd'
 #9 
-  - url: 'https://live.csdn.net/room-iframe/MicrosoftReactor/ctwduMmo'
-    wap_url: 'https://live.csdn.net/room/MicrosoftReactor/ctwduMmo'
-    title: '开源社区 for Developer	美洲与欧洲'
-    image: 'https://codechina.csdn.net/uploads/-/system/group/avatar/9733/GitHub-Mark-120px-plus.png?width=72'
-    live_id: 'ctwduMmo'
-#10 
-  - url: 'https://live.csdn.net/room-iframe/weixin_41960540/VQtTgrpb'
-    wap_url: 'https://live.csdn.net/room/weixin_41960540/VQtTgrpb'
-    title: '开发人员经验 for Enterprise	美洲与欧洲'
-    image: 'https://codechina.csdn.net/uploads/-/system/group/avatar/9733/GitHub-Mark-120px-plus.png?width=72'
-    live_id: 'VQtTgrpb'
-#11 
-  - url: 'https://live.csdn.net/room-iframe/MicrosoftReactor/xcGKnJpC'
-    wap_url: 'https://live.csdn.net/room/MicrosoftReactor/xcGKnJpC'
-    title: '开源社区 for Developer	亚太地区'
-    image: 'https://codechina.csdn.net/uploads/-/system/group/avatar/9733/GitHub-Mark-120px-plus.png?width=72'
-    live_id: 'xcGKnJpC'    
-#12 
-  - url: 'https://live.csdn.net/room-iframe/weixin_41960540/3V3xyBNF'
-    wap_url: 'https://live.csdn.net/room/weixin_41960540/3V3xyBNF'
-    title: '开发人员经验 for Enterprise	亚太地区'
-    image: 'https://codechina.csdn.net/uploads/-/system/group/avatar/9733/GitHub-Mark-120px-plus.png?width=72'
-    live_id: '3V3xyBNF' 
\ No newline at end of file
+  - url: 'https://live.csdn.net/room-iframe/weixin_41960540/fGnzuLu5'
+    wap_url: 'https://live.csdn.net/room/weixin_41960540/fGnzuLu5'
+    title: 'NET Conf China 2020 Dev Speak 工作坊2'
+    image: 'https://codechina.csdn.net/uploads/-/system/project/avatar/8723/dotnet.jpeg?width=90'
+    live_id: 'fGnzuLu5'
\ No newline at end of file