Merge branch 'openatom' into 'master'

openatom See merge request !23

Merge branch 'openatom' into 'master'
openatom See merge request !23
8664ddd9 · Miykael_xxm · d2c653a0 · b289bbea · 8664ddd9 · 8664ddd9
显示空白变更内容
内联并排

Showing with 90 addition and 51 deletion

lives/2020-12-27/.gitkeep lives/2020-12-27/.gitkeep +0 -0

lives/2020-12-27/day.yml lives/2020-12-27/day.yml +57 -0

lives/index.yml lives/index.yml +33 -51

未找到文件。
--- a/lives/2020-12-27/.gitkeep
+++ b/lives/2020-12-27/.gitkeep
--- a/lives/2020-12-27/day.yml
+++ b/lives/2020-12-27/day.yml
+# 日期时间戳标志
+timestamp: '2020-12-27'
+title: '开放原子开源基金会2020年度峰会'
+items:
+# 数组需要根据 start-point 排序
+#1 
+  - start_time: '09：00'
+    end_time: '12：00'
+    title: '开源运营治理分论坛-上午场'
+    namespace_path: ' '
+    description: '2020 中国 .NET 开发者大会 工作坊1'
+    live_link: 'https://live.csdn.net/room/weixin_53846948/AVvnOhsA'
+#2 
+  - start_time: '09：00'
+    end_time: '12：00'
+    title: '开放原子可信账本项目组工作汇报路演'
+    namespace_path: ' '
+    description: '2020 中国 .NET 开发者大会 工作坊1'
+    live_link: 'https://live.csdn.net/room/Beckyame/fVe471xF'
+#3
+  - start_time: '09：00'
+    end_time: '12：00'
+    title: '开源教育与公益分论坛'
+    namespace_path: ' '
+    description: '2020 中国 .NET 开发者大会 工作坊1'
+    live_link: 'https://live.csdn.net/room/wl5875/9RfLz9mN'
+#4
+  - start_time: '14：00'
+    end_time: '18：00'
+    title: '技术监督委员会专场'
+    namespace_path: ' '
+    description: '2020 中国 .NET 开发者大会 工作坊1'
+    live_link: 'https://live.csdn.net/room/weixin_53846948/XBdIrud1'
+#5
+  - start_time: '14：00'
+    end_time: '18：00'
+    title: '开源运营治理分论坛-下午场'
+    namespace_path: ' '
+    description: '2020 中国 .NET 开发者大会 工作坊1'
+    live_link: 'https://live.csdn.net/room/Beckyame/mkYmt3L6'
+#6
+  - start_time: '14：00'
+    end_time: '18：00'
+    title: '开源项目和基金会实践及经验分享'
+    namespace_path: ' '
+    description: '2020 中国 .NET 开发者大会 工作坊1'
+    live_link: 'https://live.csdn.net/room/wl5875/ZxqRHYaM'
+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/f7f6f0ae9e87aa4c0836f9162a143f44/375X211.jpg'
+  mobile_url: 'https://codechina.csdn.net/codechina/operation-work/uploads/5c11e08d8f14f0cf761c4e7b520950cd/375x211.jpg'
-  pc_url: 'https://codechina.csdn.net/codechina/operation-work/uploads/1bfa0eacc4e4269a72eee7e46706c824/1920X480.jpg'
+  pc_url: 'https://codechina.csdn.net/codechina/operation-work/uploads/10ab3c59a7bc6e84de72cb0aa6e3e6da/1920x480.jpg'
  link:  'https://codechina.csdn.net/lives'
 # 日期时间戳标志
-current: '2020-12-19'
+current: '2020-12-27'
 # 描述 富文本
-description: "2020 中国 .NET 开发者大会"
+description: "开放原子开源基金会2020年度峰会"
 lives:
 #1 
-  - url: 'https://live.csdn.net/room-iframe/dotnetconf/vsSvMjB9'
+  - url: 'https://live.csdn.net/room-iframe/weixin_53846948/AVvnOhsA'
-    wap_url: 'https://live.csdn.net/room/dotnetconf/vsSvMjB9'
+    wap_url: 'https://live.csdn.net/room/weixin_53846948/AVvnOhsA'
-    title: '.NET Conf China 2020 主会场'
+    title: '开源运营治理分论坛-上午场'
-    image: 'https://codechina.csdn.net/uploads/-/system/project/avatar/8723/dotnet.jpeg?width=90'
+    image: 'https://codechina.csdn.net/codechina/operation-work/uploads/cffa02abcd30f80ca7ff76f520315f23/logo.png'
-    live_id: 'vsSvMjB9'
+    live_id: 'AVvnOhsA'
 #2 
-  - url: 'https://live.csdn.net/room-iframe/dotnetconf/1v1d3YbH'
+  - url: 'https://live.csdn.net/room-iframe/Beckyame/fVe471xF'
-    wap_url: 'https://live.csdn.net/room/dotnetconf/1v1d3YbH'
+    wap_url: 'https://live.csdn.net/room/Beckyame/fVe471xF'
-    title: '.NET Conf China 2020 A会场'
+    title: '开放原子可信账本项目组工作汇报路演'
-    image: 'https://codechina.csdn.net/uploads/-/system/project/avatar/8723/dotnet.jpeg?width=90'
+    image: 'https://codechina.csdn.net/codechina/operation-work/uploads/cffa02abcd30f80ca7ff76f520315f23/logo.png'
-    live_id: '1v1d3YbH'
+    live_id: 'fVe471xF'
 #3 
-  - url: 'https://live.csdn.net/room-iframe/weixin_41960540/0qprIByz'
+  - url: 'https://live.csdn.net/room-iframe/wl5875/9RfLz9mN'
-    wap_url: 'https://live.csdn.net/room/weixin_41960540/0qprIByz'
+    wap_url: 'https://live.csdn.net/room/wl5875/9RfLz9mN'
-    title: '.NET Conf China 2020 B会场'
+    title: '开源教育与公益分论坛'
-    image: 'https://codechina.csdn.net/uploads/-/system/project/avatar/8723/dotnet.jpeg?width=90'
+    image: 'https://codechina.csdn.net/codechina/operation-work/uploads/cffa02abcd30f80ca7ff76f520315f23/logo.png'
-    live_id: '0qprIByz'
+    live_id: '9RfLz9mN'
 #4 
-  - url: 'https://live.csdn.net/room-iframe/sD7O95O/y5BBhpoL'
+  - url: 'https://live.csdn.net/room-iframe/weixin_53846948/XBdIrud1'
-    wap_url: 'https://live.csdn.net/room/sD7O95O/y5BBhpoL'
+    wap_url: 'https://live.csdn.net/room/weixin_53846948/XBdIrud1'
-    title: '.NET Conf China 2020 C会场'
+    title: '技术监督委员会专场'
-    image: 'https://codechina.csdn.net/uploads/-/system/project/avatar/8723/dotnet.jpeg?width=90'
+    image: 'https://codechina.csdn.net/codechina/operation-work/uploads/cffa02abcd30f80ca7ff76f520315f23/logo.png'
-    live_id: 'y5BBhpoL'
+    live_id: 'XBdIrud1'
 #5 
-  - url: 'https://live.csdn.net/room-iframe/shanyou/1abV7F6t'
+  - url: 'https://live.csdn.net/room-iframe/Beckyame/mkYmt3L6'
-    wap_url: 'https://live.csdn.net/room/shanyou/1abV7F6t'
+    wap_url: 'https://live.csdn.net/room/Beckyame/mkYmt3L6'
-    title: '.NET Conf China 2020 D会场'
+    title: '开源运营治理分论坛-下午场'
-    image: 'https://codechina.csdn.net/uploads/-/system/project/avatar/8723/dotnet.jpeg?width=90'
+    image: 'https://codechina.csdn.net/codechina/operation-work/uploads/cffa02abcd30f80ca7ff76f520315f23/logo.png'
-    live_id: '1abV7F6t'    
+    live_id: 'mkYmt3L6'    
 #6 
-  - url: 'https://live.csdn.net/room-iframe/csdn_codechina/hJUomJAg'
+  - url: 'https://live.csdn.net/room-iframe/wl5875/ZxqRHYaM'
-    wap_url: 'https://live.csdn.net/room/csdn_codechina/hJUomJAg'
+    wap_url: 'https://live.csdn.net/room/wl5875/ZxqRHYaM'
-    title: '.NET Conf China 2020 E会场'
+    title: '开源项目和基金会实践及经验分享'
-    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/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/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/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'
+    live_id: 'ZxqRHYaM' 
\ No newline at end of file