更新：README文件

.dockerignore

@@ -3,4 +3,7 @@ node_modules
 dist
 .history
 images
-docs
+docs
+Dockerfile
+README.md
+build.sh

README.md

@@ -5,7 +5,7 @@ StackEdit中文版
 </h1>
 <p align="center">
 	<strong>笔记利器，在线Markdown编辑器。</strong><br>
-  如果你喜欢该项目，请点一下Star，您的肯定是作者最大的动力！
+  项目clone自<a href="https://gitee.com/mafgwo/stackedit" target="_blank" title="豆萁">豆萁/stackedit</a>，如果你喜欢该项目，请过去点一下Star，您的肯定是作者最大的动力！
 </p>
 <p align="center">
 	<a href="https://stackedit.cn/">https://stackedit.cn</a>
@@ -22,18 +22,19 @@ StackEdit中文版
 	</a>
 </p>
 <br/>
-<p align="center">
-	<a target="_blank" href="https://jq.qq.com/?_wv=1027&k=wUSCNqmN">
-	<img src="https://img.shields.io/badge/QQ交流群-703187410-orange"/></a>
-</p>
 <hr />
 1 笔记支持Gitee、GitHub、Gitea等Git仓库存储。<br>
 2 支持直接上传图片，也支持多种外部图床（GitHub、Gitea、SM.MS、自定义图床）粘贴或拖拽上传。<br>
 3 编辑区域支持选择主题或自定义，总有你喜欢的主题。<br>
 4 支持历史版本管理，不用担心编辑覆盖后无法回滚。<br>
-5 支持KaTeX数学表达式、Mermaid UML图、乐谱等扩展。
+5 支持ChatGPT辅助写作。<br>
+6 支持KaTeX数学表达式、Mermaid UML图、乐谱等扩展。
 <hr />
 
+## 说明
+
+本项目为本人clone修改自用，如果你也喜欢，请至原作者处获取及交流。
+
 ## 截图
 
 **亮暗主题切换、编辑主题切换**
@@ -48,7 +49,11 @@ StackEdit中文版
 **支持文档搜索**
 ![](./images/search.gif)
 
+**ChatGPT集成协助写作**
+![](./images/chatgpt.gif)
+
 ## 相比国外开源版本的区别：
+
 - 修复了Github授权登录问题
 - 支持了Gitee仓库（2022-05-25）
 - 支持了Gitea仓库（2022-05-25）
@@ -72,14 +77,18 @@ StackEdit中文版
 - Gitlab的支持优化（2023-02-23）
 - 导出HTML、PDF支持带预览主题导出（2023-02-26）
 - 支持分享文档（2023-03-30）
+- 支持ChatGPT生成内容（2023-04-10）
+- GitLab授权接口调整（2023-08-26）
+- 主文档空间支持GitHub登录（2023-10-19）
 
 ## 国外开源版本弊端：
-- 作者已经不维护了
-- Github授权登录存在问题
+
+- 作者已经不维护了或很少维护了
 - 不支持国内常用Gitee
 - 强依赖GoogleDrive，而Google Drive在国内不能正常访问
 
 ## 部署说明
+
 > 建议docker-compose方式部署，其他部署方式如遇到问题欢迎提issue。
 
 docker官方仓库下载太慢可以使用阿里云的镜像仓库，镜像仓库地址：registry.cn-hangzhou.aliyuncs.com/mafgwo/stackedit:【版本号】
@@ -108,6 +117,7 @@ services:
       - GITEA_CLIENT_SECRET=【不需要支持则删掉】
       - GITEA_URL=【不需要支持则删掉】
       - GITLAB_CLIENT_ID=【不需要支持则删掉】
+      - GITLAB_CLIENT_SECRET=【不需要支持则删掉】
       - GITLAB_URL=【不需要支持则删掉】
     ports:
       - 8080:8080/tcp
@@ -116,6 +126,7 @@ services:
 ```
 
 docker-compose方式的启动或停止命令
+
 ```bash
 # 在 docker-compose.yml 文件目录下 启动命令 
 docker-compose up -d
@@ -144,25 +155,25 @@ docker run -itd --name stackedit \
   -e GITEA_CLIENT_SECRET=【不需要支持则删掉】 \
   -e GITEA_URL=【不需要支持则删掉】 \
   -e GITLAB_CLIENT_ID=【不需要支持则删掉】 \
+  -e GITLAB_CLIENT_SECRET=【不需要支持则删掉】 \
   -e GITLAB_URL=【不需要支持则删掉】 \
   mafgwo/stackedit:【docker中央仓库找到最新版本】
 
 ```
 
 ## 如何创建三方平台应用
+
 > 部署时，如果需要支持Gitee或GitHub，则需要自行到对应三方平台创建应用，获取到应用ID和秘钥，替换到以上的环境变量中，再启动应用。
 
 - Gitee的环境变量：GITEE_CLIENT_ID、GITEE_CLIENT_SECRET，**[如何创建Gitee应用](./docs/部署之Gitee应用创建.md)**
-
 - GitHub的环境变量：GITHUB_CLIENT_ID、GITEE_CLIENT_SECRET，**[如何创建GitHub应用](./docs/部署之GitHub应用创建.md)**
-
 - Gitea可选择性配置环境变量（未配置则在关联时前端指定，有配置则仅允许配置的应用信息）：GITEA_CLIENT_ID、GITEA_CLIENT_SECRET、GITEA_URL，**[如何创建Gitea应用](./docs/部署之Gitea应用创建.md)**
-
-- Gitlab可选择性配置环境变量（未配置则在关联时前端指定，有配置则仅允许配置的应用信息）：GITLAB_CLIENT_ID、GITLAB_URL **如何创建Gitlab应用(待补充文档)**
+- Gitlab可选择性配置环境变量（未配置则在关联时前端指定，有配置则仅允许配置的应用信息）：GITLAB_CLIENT_ID、GITLAB_CLIENT_SECRET、GITLAB_URL **如何创建Gitlab应用(待补充文档)**
 
 （特别说明：自建的Gitea、Gitlab要能接入stackedit必须支持跨域）
 
 ## 编译与运行
+
 > 编译运行的nodejs版本选择11.15.0版本
 
 ```bash
@@ -178,7 +189,3 @@ npm run build
 # build for production and view the bundle analyzer report
 npm run build --report
 ```
-
-## 欢迎加群交流
-关于StackEdit，如果你有想法，或者使用中遇到了问题，可以提Issue，如果需要快速得到反馈，可以加QQ群如下（加群后可直接@群主）：
-![](./images/qq.jpeg)

build.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# 检查参数是否提供版本号
+if [ -z "$1" ]; then
+  echo "请提供版本号作为参数"
+  exit 1
+fi
+
+# 定义版本号变量
+VERSION="$1"
+IMAGE_NAME="mafgwo/stackedit"
+
+# 构建 Docker 镜像
+build_image() {
+  docker build -t "$IMAGE_NAME" .
+}
+
+# 标记 Docker 镜像
+tag_image() {
+  docker tag "$IMAGE_NAME" "$IMAGE_NAME:$VERSION"
+  docker tag "$IMAGE_NAME" "registry.cn-hangzhou.aliyuncs.com/$IMAGE_NAME:$VERSION"
+}
+
+# 推送 Docker 镜像
+push_image() {
+  docker push "$IMAGE_NAME"
+  docker push "registry.cn-hangzhou.aliyuncs.com/$IMAGE_NAME"
+  docker push "$IMAGE_NAME:$VERSION"
+  docker push "registry.cn-hangzhou.aliyuncs.com/$IMAGE_NAME:$VERSION"
+}
+
+# 执行构建、标记和推送
+build_image
+tag_image
+push_image
+
+echo "操作完成"

chrome-app/manifest.json

@@ -1,28 +1,28 @@
 {
-  "name": "StackEdit中文版",
-  "description": "支持Gitee仓库/粘贴图片自动上传的浏览器内 Markdown 编辑器",
-  "version": "5.15.17",
-  "manifest_version": 2,
-  "container" : "GITEE",
-  "api_console_project_id" : "241271498917",
-  "icons": {
-    "16": "icon-16.png",
-    "32": "icon-32.png",
-    "64": "icon-64.png",
-    "128": "icon-128.png",
-    "256": "icon-256.png",
-    "512": "icon-512.png"
-  },
-  "app": {
-    "urls": [
-      "https://stackedit.cn/"
-    ],
-    "launch": {
-      "web_url": "https://stackedit.cn/app"
-    }
-  },
-  "offline_enabled": true,
-  "permissions": [
-    "unlimitedStorage"
-  ]
-}
+    "name": "StackEdit中文版",
+    "description": "支持Gitee仓库/粘贴图片自动上传的浏览器内 Markdown 编辑器",
+    "version": "5.15.17",
+    "manifest_version": 2,
+    "container": "GITEE",
+    "api_console_project_id": "241271498917",
+    "icons": {
+        "16": "icon-16.png",
+        "32": "icon-32.png",
+        "64": "icon-64.png",
+        "128": "icon-128.png",
+        "256": "icon-256.png",
+        "512": "icon-512.png"
+    },
+    "app": {
+        "urls": [
+            "https://md.jonylee.top/"
+        ],
+        "launch": {
+            "web_url": "https://md.jonylee.top/app"
+        }
+    },
+    "offline_enabled": true,
+    "permissions": [
+        "unlimitedStorage"
+    ]
+}

config/dev.env.js

@@ -12,6 +12,7 @@ module.exports = merge(prodEnv, {
   // GITEA_CLIENT_ID: '"fe30f8f9-b1e8-4531-8f72-c1a5d3912805"',
   // GITEA_CLIENT_SECRET: '"lus7oMnb3H6M1hsChndphArE20Txr7erwJLf7SDBQWTw"',
   // GITEA_URL: '"https://gitea.test.com"',
-  // GITLAB_CLIENT_ID: '"33e01128c27fe75df3e5b35218d710c7df280e6ee9c90b6ca27ac9d9fdfb92f7"',
-  // GITLAB_URL: '"http://gitlab.qicoder.com"',
+  GITLAB_CLIENT_ID: '"074cd5103c62dea0f479dac861039656ac80935e304c8113a02cc64c629496ae"', 
+  GITLAB_CLIENT_SECRET: '"6f406f24216b686d55d28313dec1913c2a8e599afdb08380d5e8ce838e16e41e"',
+  GITLAB_URL: '"http://gitlab.qicoder.com"',
 })

index.html

@@ -1,28 +1,31 @@
 <!DOCTYPE html>
 <html>
-  <head>
+
+<head>
     <meta charset="utf-8">
-    <title>StackEdit中文版</title>
-    <link rel="canonical" href="https://stackedit.cn/app">
-    <meta name="description" content="免费，开源，功能全面的Markdown编辑器。">
+    <title>Markdown编辑器-JonyLee的设计导航</title>
+    <link rel="canonical" href="https://md.jonylee.top">
+    <meta name="description" content="StackEdit中文版，免费，开源，功能全面的Markdown编辑器。">
     <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1">
     <meta name="mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <script>
-      var _hmt = _hmt || [];
-    </script>
-  </head>
-  <body>
+</head>
+
+<body>
     <div id="app"></div>
     <!-- built files will be auto injected -->
+    <!-- baidu统计 -->
     <script>
-      (function() {
-        var hm = document.createElement("script");
-        hm.src = "https://hm.baidu.com/hm.js?20a1e7a201b42702c49074c87a1f1035";
-        var s = document.getElementsByTagName("script")[0]; 
-        s.parentNode.insertBefore(hm, s);
-      })();
+        var _hmt = _hmt || [];
+        (function() {
+            var hm = document.createElement("script");
+            hm.src = "https://hm.baidu.com/hm.js?dad4b4383b13eedea1ab45ee323df1c3";
+            var s = document.getElementsByTagName("script")[0];
+            s.parentNode.insertBefore(hm, s);
+        })();
     </script>
-  </body>
-</html>
+    <!-- baidu统计结束 -->
+</body>
+
+</html>

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "stackedit",
-  "version": "5.15.19",
+  "version": "5.15.21",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "stackedit",
-  "version": "5.15.19",
+  "version": "5.15.21",
   "description": "免费, 开源, 功能齐全的 Markdown 编辑器",
   "author": "Benoit Schweblin, 豆萁",
   "license": "Apache-2.0",

server/conf.js

@@ -15,6 +15,7 @@ const giteaClientId = process.env.GITEA_CLIENT_ID;
 const giteaClientSecret = process.env.GITEA_CLIENT_SECRET;
 const giteaUrl = process.env.GITEA_URL;
 const gitlabClientId = process.env.GITLAB_CLIENT_ID;
+const gitlabClientSecret = process.env.GITLAB_CLIENT_SECRET;
 const gitlabUrl = process.env.GITLAB_URL;
 
 exports.values = {
@@ -33,6 +34,9 @@ exports.values = {
   giteaClientId,
   giteaClientSecret,
   giteaUrl,
+  gitlabClientId,
+  gitlabClientSecret,
+  gitlabUrl,
 };
 
 exports.publicValues = {

server/gitea.js

@@ -1,4 +1,3 @@
-const qs = require('qs');
 const request = require('request');
 const conf = require('./conf');
 

server/gitlab.js

@@ -0,0 +1,40 @@
+const request = require('request');
+const conf = require('./conf');
+
+function gitlabToken(queryParam) {
+  return new Promise((resolve, reject) => {
+    request({
+      method: 'POST',
+      url: `${conf.values.gitlabUrl}/oauth/token`,
+      headers: {
+        'content-type': 'application/json',
+      },
+      json: true,
+      qs: {
+        ...queryParam,
+        client_id: conf.values.gitlabClientId,
+        client_secret: conf.values.gitlabClientSecret,
+      },
+    }, (err, res, body) => {
+      if (err) {
+        reject(err);
+      }
+      const token = body.access_token;
+      if (token) {
+        resolve(body);
+      } else {
+        reject(res.statusCode + ',body:' + JSON.stringify(body));
+      }
+    });
+  });
+}
+
+exports.gitlabToken = (req, res) => {
+  gitlabToken(req.query)
+    .then(
+      tokenBody => res.send(tokenBody),
+      err => res
+        .status(400)
+        .send(err ? err.message || err.toString() : 'bad_code'),
+    );
+};

server/index.js

@@ -5,6 +5,7 @@ const path = require('path');
 const github = require('./github');
 const gitee = require('./gitee');
 const gitea = require('./gitea');
+const gitlab = require('./gitlab');
 const pdf = require('./pdf');
 const pandoc = require('./pandoc');
 const conf = require('./conf');
@@ -28,6 +29,7 @@ module.exports = (app) => {
   app.get('/oauth2/githubToken', github.githubToken);
   app.get('/oauth2/giteeToken', gitee.giteeToken);
   app.get('/oauth2/giteaToken', gitea.giteaToken);
+  app.get('/oauth2/gitlabToken', gitlab.gitlabToken);
   app.get('/conf', (req, res) => res.send(conf.publicValues));
   app.post('/pdfExport', pdf.generate);
   app.post('/pandocExport', pandoc.generate);
@@ -70,6 +72,7 @@ module.exports = (app) => {
   }));
   // Serve share.html
   app.get('/share.html', (req, res) => res.sendFile(resolvePath('static/landing/share.html')));
+  app.get('/gistshare.html', (req, res) => res.sendFile(resolvePath('static/landing/gistshare.html')));
 
   // Serve static resources
   if (process.env.NODE_ENV === 'production') {

server/pandoc.js

@@ -59,7 +59,7 @@ exports.generate = (req, res) => {
     const metadata = readJson(req.query.metadata);
     const params = [];
 
-    params.push('--latex-engine=xelatex');
+    params.push('--pdf-engine=xelatex');
     params.push('--webtex=http://chart.apis.google.com/chart?cht=tx&chf=bg,s,FFFFFF00&chco=000000&chl=');
     if (options.toc) {
       params.push('--toc');

src/components/ExplorerNode.vue

@@ -14,6 +14,7 @@
       </div>
       <explorer-node v-for="node in node.files" :key="node.item.id" :node="node" :depth="depth + 1"></explorer-node>
     </div>
+    <button ref="copyId" v-clipboard="copyPath()" @click="info('路径已复制到剪切板!')" style="display: none;"></button>
   </div>
 </template>
 
@@ -23,6 +24,7 @@ import workspaceSvc from '../services/workspaceSvc';
 import explorerSvc from '../services/explorerSvc';
 import store from '../store';
 import badgeSvc from '../services/badgeSvc';
+import utils from '../services/utils';
 
 export default {
   name: 'explorer-node', // Required for recursivity
@@ -80,6 +82,9 @@ export default {
     ...mapActions('explorer', [
       'setDragTarget',
     ]),
+    ...mapActions('notification', [
+      'info',
+    ]),
     select(id = this.node.item.id, doOpen = true) {
       const node = store.getters['explorer/nodeMap'][id];
       if (!node) {
@@ -144,6 +149,11 @@ export default {
       // See https://stackoverflow.com/a/3977637/1333165
       evt.dataTransfer.setData('Text', '');
     },
+    copyPath() {
+      let path = utils.getAbsoluteDir(this.node).replaceAll(' ', '%20');
+      path = path.indexOf('/') === 0 ? path : `/${path}`;
+      return this.node.isFolder ? path : `${path}.md`;
+    },
     onDrop() {
       const sourceNode = store.getters['explorer/dragSourceNode'];
       const targetNode = store.getters['explorer/dragTargetNodeFolder'];
@@ -169,22 +179,26 @@ export default {
             top: evt.clientY,
           },
           items: [{
-            name: 'New file',
+            name: '新建文件',
             disabled: !this.node.isFolder || this.node.isTrash,
             perform: () => explorerSvc.newItem(false),
           }, {
-            name: 'New folder',
+            name: '新建文件夹',
             disabled: !this.node.isFolder || this.node.isTrash || this.node.isTemp,
             perform: () => explorerSvc.newItem(true),
           }, {
             type: 'separator',
           }, {
-            name: 'Rename',
+            name: '重命名',
             disabled: this.node.isTrash || this.node.isTemp,
             perform: () => this.setEditingId(this.node.item.id),
           }, {
-            name: 'Delete',
+            name: '删除',
             perform: () => explorerSvc.deleteItem(),
+          }, {
+            name: '复制路径',
+            disabled: this.node.isTrash || this.node.isTemp,
+            perform: () => this.$refs.copyId.click(),
           }],
         });
         if (item) {

src/components/Modal.vue

@@ -10,6 +10,7 @@
       <div class="modal__button-bar">
         <button class="button" v-if="simpleModal.rejectText" @click="config.reject()">{{simpleModal.rejectText}}</button>
         <button class="button button--resolve" v-if="simpleModal.resolveText" @click="config.resolve()">{{simpleModal.resolveText}}</button>
+        <button v-for="(item, idx) in (simpleModal.resolveArray || [])" class="button button--resolve"  @click="config.resolve(item.value)">{{item.text}}</button>
       </div>
     </modal-inner>
   </div>
@@ -41,6 +42,7 @@ import BadgeManagementModal from './modals/BadgeManagementModal';
 import SponsorModal from './modals/SponsorModal';
 import CommitMessageModal from './modals/CommitMessageModal';
 import WorkspaceImgPathModal from './modals/WorkspaceImgPathModal';
+import ChatGptModal from './modals/ChatGptModal';
 
 // Providers
 import GooglePhotoModal from './modals/providers/GooglePhotoModal';
@@ -111,6 +113,7 @@ export default {
     SponsorModal,
     CommitMessageModal,
     WorkspaceImgPathModal,
+    ChatGptModal,
     // Providers
     GooglePhotoModal,
     GoogleDriveAccountModal,
@@ -185,6 +188,7 @@ export default {
           // User has to sign in
           await store.dispatch('modal/open', 'signInForSponsorship');
           await giteeHelper.signin();
+          await syncSvc.afterSignIn();
           syncSvc.requestSync();
         }
         if (!store.getters.isSponsor) {

src/components/PreviewInPageButtons.vue

@@ -26,6 +26,7 @@ import store from '../store';
 import DropdownMenu from './common/DropdownMenu';
 import publishSvc from '../services/publishSvc';
 import giteeGistProvider from '../services/providers/giteeGistProvider';
+import gistProvider from '../services/providers/gistProvider';
 
 export default {
   components: {
@@ -107,12 +108,15 @@ export default {
           store.dispatch('notification/info', '登录主文档空间之后才可使用分享功能！');
           return;
         }
-        let giteeGistId = null;
-        const filterLocations = this.publishLocations.filter(it => it.providerId === 'giteegist' && it.url && it.gistId);
+        let tempGistId = null;
+        const isGithub = mainToken.providerId === 'githubAppData';
+        const gistProviderId = isGithub ? 'gist' : 'giteegist';
+        const filterLocations = this.publishLocations.filter(it => it.providerId === gistProviderId
+                 && it.url && it.gistId);
         if (filterLocations.length > 0) {
-          giteeGistId = filterLocations[0].gistId;
+          tempGistId = filterLocations[0].gistId;
         }
-        const location = giteeGistProvider.makeLocation(
+        const location = (isGithub ? gistProvider : giteeGistProvider).makeLocation(
           mainToken,
           `分享-${currentFile.name}`,
           true,
@@ -120,12 +124,15 @@ export default {
         );
         location.templateId = 'styledHtmlWithTheme';
         location.fileId = currentFile.id;
-        location.gistId = giteeGistId;
+        location.gistId = tempGistId;
         const { gistId } = await publishSvc.publishLocationAndStore(location);
-        const url = `${window.location.protocol}//${window.location.host}/share.html?id=${gistId}`;
+        const sharePage = mainToken.providerId === 'githubAppData' ? 'gistshare.html' : 'share.html';
+        const url = `${window.location.protocol}//${window.location.host}/${sharePage}?id=${gistId}`;
         await store.dispatch('modal/open', { type: 'shareHtml', name: currentFile.name, url });
       } catch (err) {
-        /* cancel */
+        if (err) {
+          store.dispatch('notification/error', err);
+        }
       } finally {
         this.sharing = false;
       }

src/components/menus/HistoryMenu.vue

@@ -8,7 +8,7 @@
           </option>
         </select>
       </p>
-      <p v-if="!historyContext">同步 <b>{{currentFileName}}</b> 以启用修订历史 或者 <a href="javascript:void(0)" @click="signin">登录 Gitee</a> 以同步您的主文档空间。</p>
+      <p v-if="!historyContext">同步 <b>{{currentFileName}}</b> 以启用修订历史 或者 <a href="javascript:void(0)" @click="signin">登录 Gitee</a> 或 <a href="javascript:void(0)" @click="signinWithGithub">登录 GitHub</a> 以同步您的主文档空间。</p>
       <p v-else-if="loading">历史版本加载中…</p>
       <p v-else-if="!revisionsWithSpacer.length"><b>{{currentFileName}}</b> 没有历史版本.</p>
       <div class="menu-entry menu-entry--info flex flex--row flex--align-center" v-else>
@@ -55,6 +55,7 @@ import EditorClassApplier from '../common/EditorClassApplier';
 import PreviewClassApplier from '../common/PreviewClassApplier';
 import utils from '../../services/utils';
 import giteeHelper from '../../services/providers/helpers/giteeHelper';
+import githubHelper from '../../services/providers/helpers/githubHelper';
 import syncSvc from '../../services/syncSvc';
 import store from '../../store';
 import badgeSvc from '../../services/badgeSvc';
@@ -168,6 +169,16 @@ export default {
     async signin() {
       try {
         await giteeHelper.signin();
+        await syncSvc.afterSignIn();
+        syncSvc.requestSync();
+      } catch (e) {
+        // Cancel
+      }
+    },
+    async signinWithGithub() {
+      try {
+        await githubHelper.signin();
+        await syncSvc.afterSignIn();
         syncSvc.requestSync();
       } catch (e) {
         // Cancel

src/components/menus/MainMenu.vue

@@ -14,6 +14,9 @@
         <span v-if="currentWorkspace.providerId === 'giteeAppData'">
           <b>{{currentWorkspace.name}}</b> 与您的 Gitee 默认文档空间仓库同步。
         </span>
+        <span v-else-if="currentWorkspace.providerId === 'githubAppData'">
+          <b>{{currentWorkspace.name}}</b> 与您的 GitHub 默认文档空间仓库同步。
+        </span>
         <span v-else-if="currentWorkspace.providerId === 'googleDriveWorkspace'">
           <b>{{currentWorkspace.name}}</b> 与 <a :href="workspaceLocationUrl" target="_blank">Google Drive 文件夹</a>同步。
         </span>
@@ -45,6 +48,11 @@
       <div>使用 Gitee 登录</div>
       <span>同步您的主文档空间并解锁功能。</span>
     </menu-entry>
+    <menu-entry v-if="!loginToken" @click.native="signinWithGithub">
+      <icon-login slot="icon"></icon-login>
+      <div>使用 GitHub 登录</div>
+      <span>同步您的主文档空间并解锁功能。</span>
+    </menu-entry>
     <menu-entry @click.native="setPanel('workspaces')">
       <icon-database slot="icon"></icon-database>
       <div><div class="menu-entry__label menu-entry__label--count" v-if="workspaceCount">{{workspaceCount}}</div> 文档空间</div>
@@ -142,6 +150,7 @@ import MenuEntry from './common/MenuEntry';
 import providerRegistry from '../../services/providers/common/providerRegistry';
 import UserImage from '../UserImage';
 import giteeHelper from '../../services/providers/helpers/giteeHelper';
+import githubHelper from '../../services/providers/helpers/githubHelper';
 import syncSvc from '../../services/syncSvc';
 import userSvc from '../../services/userSvc';
 import store from '../../store';
@@ -194,6 +203,16 @@ export default {
     async signin() {
       try {
         await giteeHelper.signin();
+        await syncSvc.afterSignIn();
+        syncSvc.requestSync();
+      } catch (e) {
+        // Cancel
+      }
+    },
+    async signinWithGithub() {
+      try {
+        await githubHelper.signin();
+        await syncSvc.afterSignIn();
         syncSvc.requestSync();
       } catch (e) {
         // Cancel

src/components/menus/PublishMenu.vue

@@ -263,8 +263,8 @@ export default {
     },
     async addGitlabAccount() {
       try {
-        const { serverUrl, applicationId } = await store.dispatch('modal/open', { type: 'gitlabAccount' });
-        await gitlabHelper.addAccount(serverUrl, applicationId);
+        const { serverUrl, applicationId, applicationSecret } = await store.dispatch('modal/open', { type: 'gitlabAccount' });
+        await gitlabHelper.addAccount(serverUrl, applicationId, applicationSecret);
       } catch (e) { /* cancel */ }
     },
     async addGiteaAccount() {

src/components/menus/SyncMenu.vue

@@ -239,8 +239,8 @@ export default {
     },
     async addGitlabAccount() {
       try {
-        const { serverUrl, applicationId } = await store.dispatch('modal/open', { type: 'gitlabAccount' });
-        await gitlabHelper.addAccount(serverUrl, applicationId);
+        const { serverUrl, applicationId, applicationSecret } = await store.dispatch('modal/open', { type: 'gitlabAccount' });
+        await gitlabHelper.addAccount(serverUrl, applicationId, applicationSecret);
       } catch (e) { /* cancel */ }
     },
     async addGiteaAccount() {

src/components/menus/WorkspacesMenu.vue

@@ -8,7 +8,8 @@
     <hr>
     <div class="workspace" v-for="(workspace, id) in workspacesById" :key="id">
       <menu-entry :href="workspace.url" target="_blank">
-        <icon-provider slot="icon" :provider-id="workspace.providerId"></icon-provider>
+        <icon-provider v-if="id === 'main' && !workspace.sub" slot="icon" :provider-id="'stackedit'"></icon-provider>
+        <icon-provider v-else slot="icon" :provider-id="workspace.providerId"></icon-provider>
         <div class="workspace__name"><div class="menu-entry__label" v-if="currentWorkspace === workspace">当前</div>{{workspace.name}}</div>
       </menu-entry>
     </div>
@@ -85,8 +86,8 @@ export default {
     },
     async addGitlabWorkspace() {
       try {
-        const { serverUrl, applicationId } = await store.dispatch('modal/open', { type: 'gitlabAccount' });
-        const token = await gitlabHelper.addAccount(serverUrl, applicationId);
+        const { serverUrl, applicationId, applicationSecret } = await store.dispatch('modal/open', { type: 'gitlabAccount' });
+        const token = await gitlabHelper.addAccount(serverUrl, applicationId, applicationSecret);
         store.dispatch('modal/open', {
           type: 'gitlabWorkspace',
           token,

src/components/modals/AccountManagementModal.vue

@@ -248,8 +248,8 @@ export default {
     },
     async addGitlabAccount() {
       try {
-        const { serverUrl, applicationId } = await store.dispatch('modal/open', { type: 'gitlabAccount' });
-        await gitlabHelper.addAccount(serverUrl, applicationId);
+        const { serverUrl, applicationId, applicationSecret } = await store.dispatch('modal/open', { type: 'gitlabAccount' });
+        await gitlabHelper.addAccount(serverUrl, applicationId, applicationSecret);
       } catch (e) { /* cancel */ }
     },
     async addGiteaAccount() {

src/components/modals/ChatGptModal.vue

@@ -0,0 +1,131 @@
+<template>
+  <modal-inner class="modal__inner-1--chatgpt" aria-label="chatgpt">
+    <div class="modal__content">
+      <div class="modal__image">
+        <icon-chat-gpt></icon-chat-gpt>
+      </div>
+      <p><b>ChatGPT内容生成</b><br>生成时长受ChatGPT服务响应与网络响应时长影响，时间可能较长</p>
+      <form-entry label="生成内容要求详细描述" error="content">
+        <textarea slot="field" class="text-input" type="text" placeholder="输入内容(支持换行)" v-model.trim="content" :disabled="generating"></textarea>
+        <div class="form-entry__info">
+          使用 <a href="https://api35.pxj123.cn/" target="_blank">api35.pxj123.cn</a> 的免费接口生成内容，AI模型是：GPT-3.5 Turbo。
+        </div>
+      </form-entry>
+      <div class="modal__result">
+        <pre class="result_pre" v-if="generating && !result">(等待生成中...)</pre>
+        <pre class="result_pre" v-else v-text="result"></pre>
+      </div>
+    </div>
+    <div class="modal__button-bar">
+      <button class="button" @click="reject()">{{ generating ? '停止' : '关闭' }}</button>
+      <button class="button button--resolve" @click="generate" v-if="!generating && !!content">{{ !!result ? '重新生成' : '开始生成' }}</button>
+      <button class="button button--resolve" @click="resolve" v-if="!generating && !!result">确认插入</button>
+    </div>
+  </modal-inner>
+</template>
+
+<script>
+import modalTemplate from './common/modalTemplate';
+import chatGptSvc from '../../services/chatGptSvc';
+import store from '../../store';
+
+export default modalTemplate({
+  data: () => ({
+    generating: false,
+    content: '',
+    result: '',
+    xhr: null,
+  }),
+  methods: {
+    resolve(evt) {
+      evt.preventDefault();
+      const { callback } = this.config;
+      this.config.resolve();
+      callback(this.result);
+    },
+    process({ done, content, error }) {
+      if (done) {
+        this.generating = false;
+        // 已结束
+      } else if (content) {
+        this.result = this.result + content;
+        const container = document.querySelector('.result_pre');
+        container.scrollTo(0, container.scrollHeight); // 滚动到最底部
+      } else if (error) {
+        this.generating = false;
+      }
+    },
+    generate() {
+      this.generating = true;
+      this.result = '';
+      try {
+        this.xhr = chatGptSvc.chat({
+          content: `${this.content}\n(使用Markdown方式输出结果)`,
+        }, this.process);
+      } catch (err) {
+        this.generating = false;
+        store.dispatch('notification/error', err);
+      }
+    },
+    reject() {
+      if (this.generating) {
+        if (this.xhr) {
+          this.xhr.abort();
+          this.generating = false;
+        }
+        return;
+      }
+      const { callback } = this.config;
+      this.config.reject();
+      callback(null);
+    },
+  },
+  mounted() {
+    const script = document.createElement('script');
+    script.src = `https://api35.pxj123.cn/js/chat.js?t=${new Date().getTime()}`;
+    script.onload = () => {
+      /* eslint-disable */
+      console.log('加载外部chatgpt的js成功!');
+    };
+    this.$el.appendChild(script);
+  },
+});
+</script>
+
+<style lang="scss">
+@import '../../styles/variables.scss';
+
+.modal__inner-1.modal__inner-1--chatgpt {
+  max-width: 560px;
+
+  .result_pre {
+    font-size: 0.9em;
+    font-variant-ligatures: no-common-ligatures;
+    line-height: 1.25;
+    white-space: pre-wrap;
+    word-break: break-word;
+    word-wrap: break-word;
+    height: 300px;
+    border: 1px solid rgb(126, 126, 126);
+    border-radius: $border-radius-base;
+    padding: 10px;
+    overflow-y: scroll; /* 开启垂直滚动条 */
+  }
+
+  .result_pre::-webkit-scrollbar {
+    display: none; /* 隐藏滚动条 */
+  }
+
+  .result_pre.scroll-bottom {
+    scroll-behavior: smooth;
+  }
+
+  .config-warning {
+    color: #f00;
+  }
+
+  .text-input {
+    min-height: 60px;
+  }
+}
+</style>

src/components/modals/CommitMessageModal.vue

@@ -2,9 +2,12 @@
   <modal-inner aria-label="提交信息">
     <p>自定义 <b>{{ config.name }}</b> 提交信息。</p>
     <div class="modal__content">
-      <form-entry label="提交信息">
-        <input slot="field" class="textfield" placeholder="提交信息非必填" type="text" v-model.trim="commitMessage" @keydown.enter="resolve()">
-      </form-entry>
+      <div class="form-entry">
+        <label class="form-entry__label">提交信息</label>
+        <div class="form-entry__field">
+          <input slot="field" class="textfield" placeholder="提交信息非必填" type="text" v-model.trim="commitMessage" @keydown.enter="resolve()">
+        </div>
+      </div>
     </div>
     <div class="modal__button-bar">
       <button class="button" @click="config.reject()">取消</button>

src/components/modals/PublishManagementModal.vue

@@ -89,14 +89,14 @@ export default {
       badgeSvc.addBadge('removePublishLocation');
     },
     shareUrl(location) {
-      if (location.providerId !== 'giteegist') {
+      if (location.providerId !== 'giteegist' && location.providerId !== 'gist') {
         return null;
       }
-      if (!location.url) {
+      if (!location.url || !location.gistId) {
         return null;
       }
-      const splitIndex = location.url.lastIndexOf('/');
-      return `${window.location.protocol}//${window.location.host}/share.html?id=${location.url.substr(splitIndex + 1)}`;
+      const sharePage = location.providerId === 'gist' ? 'gistshare.html' : 'share.html';
+      return `${window.location.protocol}//${window.location.host}/${sharePage}?id=${location.gistId}`;
     },
   },
 };

src/components/modals/WorkspaceManagementModal.vue

@@ -9,7 +9,8 @@
         <div class="flex flex--column">
           <div class="workspace-entry__header flex flex--row flex--align-center">
             <div class="workspace-entry__icon">
-              <icon-provider :provider-id="workspace.providerId"></icon-provider>
+              <icon-provider v-if="id === 'main' && !workspace.sub" :provider-id="'stackedit'"></icon-provider>
+              <icon-provider v-else :provider-id="workspace.providerId"></icon-provider>
             </div>
             <input class="text-input" type="text" v-if="editedId === id" v-focus @blur="submitEdit()" @keydown.enter="submitEdit()" @keydown.esc.stop="submitEdit(true)" v-model="editingName">
             <div class="workspace-entry__name" v-else>{{workspace.name}}</div>
@@ -17,7 +18,7 @@
               <button class="workspace-entry__button button" @click="edit(id)" v-title="'编辑名称'">
                 <icon-pen></icon-pen>
               </button>
-              <template v-if="workspace.providerId === 'giteeAppData' || workspace.providerId === 'githubWorkspace'
+              <template v-if="workspace.providerId === 'giteeAppData' || workspace.providerId === 'githubAppData' || workspace.providerId === 'githubWorkspace'
                 || workspace.providerId === 'giteeWorkspace' || workspace.providerId === 'gitlabWorkspace' || workspace.providerId === 'giteaWorkspace'">
                 <button class="workspace-entry__button button" @click="stopAutoSync(id)" v-if="workspace.autoSync == undefined || workspace.autoSync" v-title="'关闭自动同步'">
                   <icon-sync-auto></icon-sync-auto>

src/components/modals/common/FormEntry.vue

@@ -17,7 +17,7 @@ export default {
     uid: utils.uid(),
   }),
   mounted() {
-    this.$el.querySelector('input,select').id = this.uid;
+    this.$el.querySelector('input,select,textarea').id = this.uid;
   },
 };
 </script>

src/components/modals/providers/GiteaPublishModal.vue

@@ -4,11 +4,11 @@
       <div class="modal__image">
         <icon-provider provider-id="gitea"></icon-provider>
       </div>
-      <p>向您的<b> Gitea </b>项目发布<b> {{CurrentFileName}} </b>。</p>
+      <p>向您的<b> Gitea </b>项目发布<b> {{ currentFileName }} </b>。</p>
       <form-entry label="Project URL" error="projectUrl">
         <input slot="field" class="textfield" type="text" v-model.trim="projectUrl" @keydown.enter="resolve()">
         <div class="form-entry__info">
-          <b>例如:</b> {{config.token.serverUrl}}/path/to/project
+          <b>例如:</b> {{ config.token.serverUrl }}/path/to/project
         </div>
       </form-entry>
       <form-entry label="File path" error="path">

src/components/modals/providers/GiteeSaveModal.vue

@@ -4,7 +4,7 @@
       <div class="modal__image">
         <icon-provider provider-id="gitee"></icon-provider>
       </div>
-      <p>Save <b>{{currentFileName}}</b> to your <b>Gitee</b> repository and keep it synced.</p>
+      <p>保存 <b>{{currentFileName}}</b> 并与您的 <b>Gitee</b> 仓库保持同步.</p>
       <form-entry label="仓库URL" error="repoUrl">
         <input slot="field" class="textfield" type="text" v-model.trim="repoUrl" @keydown.enter="resolve()">
         <div class="form-entry__info">

src/components/modals/providers/GitlabAccountModal.vue

@@ -18,6 +18,9 @@
         </form-entry>
         <form-entry label="Application ID" error="applicationId">
           <input slot="field" class="textfield" type="text" v-model.trim="applicationId" @keydown.enter="resolve()">
+        </form-entry>
+        <form-entry label="Application Secret" error="applicationSecret">
+          <input slot="field" class="textfield" type="text" v-model.trim="applicationSecret" @keydown.enter="resolve()">
           <div class="form-entry__info">
             您必须使用重定向url <b>{{redirectUrl}}</b>配置OAuth2应用程序
           </div>
@@ -47,6 +50,7 @@ export default modalTemplate({
   computedLocalSettings: {
     serverUrl: 'gitlabServerUrl',
     applicationId: 'gitlabApplicationId',
+    applicationSecret: 'gitlabApplicationSecret',
   },
   computed: {
     httpAppUrl() {
@@ -78,7 +82,10 @@ export default modalTemplate({
       if (!this.applicationId) {
         this.setError('applicationId');
       }
-      if (serverUrl && this.applicationId) {
+      if (!this.applicationSecret) {
+        this.setError('applicationSecret');
+      }
+      if (serverUrl && this.applicationId && this.applicationSecret) {
         const parsedUrl = serverUrl.match(/^(http[s]?:\/\/[^/]+)/);
         if (!parsedUrl) {
           this.setError('serverUrl');
@@ -86,6 +93,7 @@ export default modalTemplate({
           this.config.resolve({
             serverUrl: parsedUrl[1],
             applicationId: this.applicationId,
+            applicationSecret: this.applicationSecret,
           });
         }
       }

src/data/constants.js

@@ -22,6 +22,6 @@ export default {
     'badgeCreations',
     'serverConf',
   ],
-  textMaxLength: 250000,
+  textMaxLength: 10000000,
   defaultName: 'Untitled',
 };

src/data/defaults/defaultLocalSettings.js

@@ -24,6 +24,7 @@ export default () => ({
   giteePublishTemplate: 'jekyllSite',
   gitlabServerUrl: '',
   gitlabApplicationId: '',
+  gitlabApplicationSecret: '',
   gitlabProjectUrl: '',
   gitlabWorkspaceProjectUrl: '',
   gitlabPublishTemplate: 'plainText',

src/data/defaults/defaultSettings.yml

@@ -43,6 +43,8 @@ editor:
     link: true
     # 图片
     image: true
+    # ChatGPT
+    chatgpt: true
 
 # Keyboard shortcuts
 # See https://craig.is/killing/mice
@@ -57,6 +59,7 @@ shortcuts:
   mod+shift+h: heading
   mod+shift+r: hr
   mod+shift+g: image
+  mod+shift+p: chatgpt
   mod+shift+i: italic
   mod+shift+l: link
   mod+shift+o: olist
@@ -65,6 +68,8 @@ shortcuts:
   mod+shift+t: table
   mod+shift+u: ulist
   mod+shift+f: inlineformula
+  # 切换编辑与预览模式
+  mod+shift+e: toggleeditor
   '= = > space':
     method: expand
     params:
@@ -108,16 +113,16 @@ turndown:
 
 # GitHub/GitLab/Gitee/Gitea commit messages
 git:
-  createFileMessage: '{{path}} created from https://stackedit.cn/'
-  updateFileMessage: '{{path}} updated from https://stackedit.cn/'
-  deleteFileMessage: '{{path}} deleted from https://stackedit.cn/'
+  createFileMessage: '{{path}} created from https://md.jonylee.top/'
+  updateFileMessage: '{{path}} updated from https://md.jonylee.top/'
+  deleteFileMessage: '{{path}} deleted from https://md.jonylee.top/'
 
 # Default content for new files
 newFileContent: |
 
 
 
-  > Written with [StackEdit中文版](https://stackedit.cn/).
+  > Written with [Markdown编辑器-StackEdit中文版](https://md.jonylee.top/).
 
 # Default properties for new files
 newFileProperties: |

src/data/features.js

@@ -158,7 +158,19 @@ export default [
       new Feature(
         'sponsor',
         '赞助',
-        '使用 Google 登录并赞助 StackEdit 以解锁 PDF 和 Pandoc 导出。（暂不支持赞助）',
+        '使用 Gitee 登录并赞助 StackEdit 以解锁 PDF 和 Pandoc 导出。（暂不支持赞助）',
+      ),
+    ],
+  ),
+  new Feature(
+    'githubSignIn',
+    '登录',
+    '使用 Gitee 登录，同步您的主文档空间并解锁功能。',
+    [
+      new Feature(
+        'githubSyncMainWorkspace',
+        '主文档空间已同步',
+        '使用 GitHub 登录以将您的主文档空间与您的默认空间stackedit-app-data仓库数据同步。',
       ),
     ],
   ),

src/data/pagedownButtons.js

@@ -49,4 +49,8 @@ export default [{
   method: 'image',
   title: '图片',
   icon: 'file-image',
+}, {
+  method: 'chatgpt',
+  title: 'ChatGPT',
+  icon: 'chat-gpt',
 }];

src/data/simpleModals.js

@@ -1,6 +1,7 @@
-const simpleModal = (contentHtml, rejectText, resolveText) => ({
+const simpleModal = (contentHtml, rejectText, resolveText, resolveArray) => ({
   contentHtml: typeof contentHtml === 'function' ? contentHtml : () => contentHtml,
   rejectText,
+  resolveArray,
   resolveText,
 });
 
@@ -65,21 +66,35 @@ export default {
     '关闭窗口',
   ),
   shareHtmlPre: simpleModal(
-    config => `<p>将给文档 "${config.name}" 创建分享链接，创建后将会把文档公开发布到GiteeGist中。您确定吗？</p>`,
+    config => `<p>将给文档 "${config.name}" 创建分享链接，创建后将会把文档公开发布到默认空间账号的Gist中。您确定吗？</p>`,
     '取消',
     '确认分享',
   ),
   signInForComment: simpleModal(
-    `<p>您必须使用 Google 登录才能开始评论。</p>
+    `<p>您必须使用 Gitee或GitHub 登录默认文档空间后才能开始评论。</p>
     <div class="modal__info"><b>注意:</b> 这将同步您的主文档空间。</div>`,
     '取消',
-    '确认登录',
+    '',
+    [{
+      text: 'Gitee登录',
+      value: 'gitee',
+    }, {
+      text: 'GitHub登录',
+      value: 'github',
+    }],
   ),
   signInForSponsorship: simpleModal(
-    `<p>您必须使用 Google 登录才能赞助。</p>
+    `<p>您必须使用 Gitee或GitHub 登录才能赞助。</p>
     <div class="modal__info"><b>注意:</b> 这将同步您的主文档空间。</div>`,
     '取消',
-    '确认登录',
+    '',
+    [{
+      text: 'Gitee登录',
+      value: 'gitee',
+    }, {
+      text: 'GitHub登录',
+      value: 'github',
+    }],
   ),
   sponsorOnly: simpleModal(
     '<p>此功能仅限于赞助商，因为它依赖于服务器资源。</p>',

src/data/templates/styledHtmlWithThemeAndTocTemplate.html

@@ -7,6 +7,16 @@
   <title>{{files.0.name}}</title>
   <link rel="stylesheet" href="https://stackedit.cn/style.css" />
   <style type="text/css">
+    .app--dark {
+      background-color: #444;
+    }
+    .app--dark .stackedit__html {
+      padding-left: 0;
+      padding-right: 0;
+    }
+    .app--dark .stackedit__content {
+      padding: 1px 20px 20px;
+    }
     {{{files.0.content.themeStyleContent}}}
   </style>
 </head>
@@ -14,7 +24,7 @@
 {{#if pdf}}
 <body class="stackedit stackedit--pdf">
 {{else}}
-<body class="stackedit">
+<body class="stackedit {{{files.0.content.colorThemeClass}}}">
 {{/if}}
   <div class="stackedit__left">
     <div class="stackedit__toc">
@@ -23,7 +33,7 @@
   </div>
   <div class="stackedit__right">
     <div class="stackedit__html">
-      <div class="{{{files.0.content.themeClass}}}">
+      <div class="stackedit__content {{{files.0.content.themeClass}}}">
         {{{files.0.content.html}}}
       </div>
     </div>

src/data/templates/styledHtmlWithThemeTemplate.html

@@ -7,6 +7,16 @@
   <title>{{files.0.name}}</title>
   <link rel="stylesheet" href="https://stackedit.cn/style.css" />
   <style type="text/css">
+    .app--dark {
+      background-color: #444;
+    }
+    .app--dark .stackedit__html {
+      padding-left: 0;
+      padding-right: 0;
+    }
+    .app--dark .stackedit__content {
+      padding: 1px 20px 20px;
+    }
     {{{files.0.content.themeStyleContent}}}
   </style>
 </head>
@@ -14,10 +24,10 @@
 {{#if pdf}}
 <body class="stackedit stackedit--pdf">
 {{else}}
-<body class="stackedit">
+<body class="stackedit {{{files.0.content.colorThemeClass}}}">
 {{/if}}
   <div class="stackedit__html">
-    <div class="{{{files.0.content.themeClass}}}">
+    <div class="stackedit__content {{{files.0.content.themeClass}}}">
       {{{files.0.content.html}}}
     </div>
   </div>

src/extensions/libs/markdownItAnchor.js

@@ -56,6 +56,7 @@ export default (md) => {
 
         // According to http://pandoc.org/README.html#extension-auto_identifiers
         let slug = headingContent
+          .replace(/<img[^>]*>/g, '') // Replace image to empty
           .replace(/\s/g, '-') // Replace all spaces and newlines with hyphens
           .replace(/[\0-,/:-@[-^`{-~]/g, '') // Remove all punctuation, except underscores, hyphens, and periods
           .toLowerCase(); // Convert all alphabetic characters to lowercase
@@ -64,7 +65,9 @@ export default (md) => {
         let i;
         for (i = 0; i < slug.length; i += 1) {
           const charCode = slug.charCodeAt(i);
-          if ((charCode >= 0x61 && charCode <= 0x7A) || charCode > 0x7E) {
+          if ((charCode >= 0x30 && charCode <= 0x39) || // 0-9
+            (charCode >= 0x61 && charCode <= 0x7A) || // a-z
+            charCode > 0x7E) {
             break;
           }
         }

src/extensions/libs/markdownItMath.js

@@ -23,11 +23,21 @@ function texMath(state, silent) {
   ) {
     return false;
   }
-  const endMarkerPos = state.src.indexOf(endMarker, startMathPos);
-  if (endMarkerPos === -1) {
-    return false;
+  function getIndex(tempStartMathPos) {
+    const tempEndMarkerPos = state.src.indexOf(endMarker, tempStartMathPos);
+    if (tempEndMarkerPos === -1) {
+      return tempEndMarkerPos;
+    }
+    if (state.src.charCodeAt(tempEndMarkerPos - 1) === 0x5C /* \ */) {
+      if (state.src.length - 1 > tempEndMarkerPos) {
+        return getIndex(tempEndMarkerPos + 1);
+      }
+      return -1;
+    }
+    return tempEndMarkerPos;
   }
-  if (state.src.charCodeAt(endMarkerPos - 1) === 0x5C /* \ */) {
+  const endMarkerPos = getIndex(startMathPos);
+  if (endMarkerPos === -1) {
     return false;
   }
   const nextPos = endMarkerPos + endMarker.length;

src/icons/ChatGpt.vue

@@ -0,0 +1,3 @@
+<template>
+  <svg class="icon" width="24px" height="24px" viewBox="140 140 520 520"><defs><linearGradient id="linear" x1="100%" y1="22%" x2="0%" y2="78%"><stop offset="0%" stop-color="rgb(131,211,231)"></stop><stop offset="2%" stop-color="rgb(127,203,229)"></stop><stop offset="25%" stop-color="rgb(86,115,217)"></stop><stop offset="49%" stop-color="rgb(105,80,190)"></stop><stop offset="98%" stop-color="rgb(197,59,119)"></stop><stop offset="100%" stop-color="rgb(197,59,119)"></stop></linearGradient></defs><path id="logo" d="m617.24 354a126.36 126.36 0 0 0 -10.86-103.79 127.8 127.8 0 0 0 -137.65-61.32 126.36 126.36 0 0 0 -95.31-42.49 127.81 127.81 0 0 0 -121.92 88.49 126.4 126.4 0 0 0 -84.5 61.3 127.82 127.82 0 0 0 15.72 149.86 126.36 126.36 0 0 0 10.86 103.79 127.81 127.81 0 0 0 137.65 61.32 126.36 126.36 0 0 0 95.31 42.49 127.81 127.81 0 0 0 121.96-88.54 126.4 126.4 0 0 0 84.5-61.3 127.82 127.82 0 0 0 -15.76-149.81zm-190.66 266.49a94.79 94.79 0 0 1 -60.85-22c.77-.42 2.12-1.16 3-1.7l101-58.34a16.42 16.42 0 0 0 8.3-14.37v-142.39l42.69 24.65a1.52 1.52 0 0 1 .83 1.17v117.92a95.18 95.18 0 0 1 -94.97 95.06zm-204.24-87.23a94.74 94.74 0 0 1 -11.34-63.7c.75.45 2.06 1.25 3 1.79l101 58.34a16.44 16.44 0 0 0 16.59 0l123.31-71.2v49.3a1.53 1.53 0 0 1 -.61 1.31l-102.1 58.95a95.16 95.16 0 0 1 -129.85-34.79zm-26.57-220.49a94.71 94.71 0 0 1 49.48-41.68c0 .87-.05 2.41-.05 3.48v116.68a16.41 16.41 0 0 0 8.29 14.36l123.31 71.19-42.69 24.65a1.53 1.53 0 0 1 -1.44.13l-102.11-59a95.16 95.16 0 0 1 -34.79-129.81zm350.74 81.62-123.31-71.2 42.69-24.64a1.53 1.53 0 0 1 1.44-.13l102.11 58.95a95.08 95.08 0 0 1 -14.69 171.55c0-.88 0-2.42 0-3.49v-116.68a16.4 16.4 0 0 0 -8.24-14.36zm42.49-63.95c-.75-.46-2.06-1.25-3-1.79l-101-58.34a16.46 16.46 0 0 0 -16.59 0l-123.31 71.2v-49.3a1.53 1.53 0 0 1 .61-1.31l102.1-58.9a95.07 95.07 0 0 1 141.19 98.44zm-267.11 87.87-42.7-24.65a1.52 1.52 0 0 1 -.83-1.17v-117.92a95.07 95.07 0 0 1 155.9-73c-.77.42-2.11 1.16-3 1.7l-101 58.34a16.41 16.41 0 0 0 -8.3 14.36zm23.19-50 54.92-31.72 54.92 31.7v63.42l-54.92 31.7-54.92-31.7z" fill="#202123"></path></svg>
+</template>

src/icons/Provider.vue

@@ -15,6 +15,7 @@ export default {
           return 'google-drive';
         case 'googlePhotos':
           return 'google-photos';
+        case 'githubAppData':
         case 'githubWorkspace':
           return 'github';
         case 'gist':
@@ -31,6 +32,8 @@ export default {
         case 'giteeWorkspace':
         case 'giteegist':
           return 'gitee';
+        case 'stackedit':
+          return 'stackedit';
         default:
           return this.providerId;
       }

src/icons/index.js

@@ -65,6 +65,7 @@ import SelectTheme from './SelectTheme';
 import Copy from './Copy';
 import Ellipsis from './Ellipsis';
 import Share from './Share';
+import ChatGpt from './ChatGpt';
 
 Vue.component('iconProvider', Provider);
 Vue.component('iconFormatBold', FormatBold);
@@ -132,3 +133,4 @@ Vue.component('iconSelectTheme', SelectTheme);
 Vue.component('iconCopy', Copy);
 Vue.component('iconEllipsis', Ellipsis);
 Vue.component('iconShare', Share);
+Vue.component('iconChatGpt', ChatGpt);

src/libs/pagedown.js

@@ -122,6 +122,7 @@ function Pagedown(options) {
   hooks.addNoop("onPreviewRefresh"); // called with no arguments after the preview has been refreshed
   hooks.addNoop("postBlockquoteCreation"); // called with the user's selection *after* the blockquote was created; should return the actual to-be-inserted text
   hooks.addFalse("insertImageDialog");
+  hooks.addFalse("insertChatGptDialog");
   /* called with one parameter: a callback to be called with the URL of the image. If the application creates
    * its own image insertion dialog, this hook should return true, and the callback should be called with the chosen
    * image url (or null if the user cancelled). If this hook returns false, the default dialog will be used.
@@ -477,6 +478,7 @@ function UIManager(input, commandManager) {
     buttons.image = bindCommand(function (chunk, postProcessing) {
       return this.doLinkOrImage(chunk, postProcessing, true);
     });
+    buttons.chatgpt = bindCommand("doChatGpt");
     buttons.olist = bindCommand(function (chunk, postProcessing) {
       this.doList(chunk, postProcessing, true);
     });
@@ -846,6 +848,17 @@ commandProto.doLinkOrImage = function (chunk, postProcessing, isImage) {
   }
 };
 
+commandProto.doChatGpt = function (chunk, postProcessing) {
+  var enteredCallback = function (content) {
+    if (content !== null) {
+      chunk.before = `${chunk.before}${content}`;
+      chunk.selection = '';
+    }
+    postProcessing();
+  };
+  this.hooks.insertChatGptDialog(enteredCallback);
+};
+
 // When making a list, hitting shift-enter will put your cursor on the next line
 // at the current indent level.
 commandProto.doAutoindent = function (chunk) {

src/services/chatGptSvc.js

@@ -0,0 +1,42 @@
+import store from '../store';
+
+export default {
+  chat({ content }, callback) {
+    const xhr = new XMLHttpRequest();
+    const url = 'https://api.openai-proxy.com/v1/chat/completions';
+    xhr.open('POST', url);
+    xhr.setRequestHeader('Content-Type', 'application/json');
+    xhr.setRequestHeader('Authorization', `Bearer ${window.my_api_key}`);
+    xhr.send(JSON.stringify({
+      model: 'gpt-3.5-turbo',
+      max_tokens: 3000,
+      top_p: 0,
+      temperature: 0.9,
+      frequency_penalty: 0,
+      presence_penalty: 0,
+      messages: [{ role: 'user', content }],
+      stream: true,
+    }));
+    let lastRespLen = 0;
+    xhr.onprogress = () => {
+      const responseText = xhr.response.substr(lastRespLen);
+      lastRespLen = xhr.response.length;
+      responseText.split('\n\n')
+        .filter(l => l.length > 0)
+        .forEach((text) => {
+          const item = text.substr(6);
+          if (item === '[DONE]') {
+            callback({ done: true });
+          } else {
+            const data = JSON.parse(item);
+            callback({ content: data.choices[0].delta.content });
+          }
+        });
+    };
+    xhr.onerror = () => {
+      store.dispatch('notification/error', 'ChatGPT接口请求异常！');
+      callback({ error: 'ChatGPT接口请求异常！' });
+    };
+    return xhr;
+  },
+};

src/services/editorSvc.js

@@ -217,8 +217,8 @@ const editorSvc = Object.assign(new Vue(), editorSvcDiscussions, editorSvcUtils,
           ];
 
           Array.prototype.slice.call(sectionPreviewElt.getElementsByTagName('a')).forEach((aElt) => {
-            const url = aElt.attributes.href.nodeValue;
-            if (url.indexOf('http://') >= 0 || url.indexOf('https://') >= 0 || url.indexOf('#') >= 0) {
+            const url = aElt.attributes && aElt.attributes.href && aElt.attributes.href.nodeValue;
+            if (!url || url.indexOf('http://') >= 0 || url.indexOf('https://') >= 0 || url.indexOf('#') >= 0) {
               return;
             }
             aElt.href = 'javascript:void(0);'; // eslint-disable-line no-script-url
@@ -233,7 +233,21 @@ const editorSvc = Object.assign(new Vue(), editorSvcDiscussions, editorSvcUtils,
             const clonedElt = headingElt.cloneNode(true);
             clonedElt.removeAttribute('id');
             sectionTocElt.appendChild(clonedElt);
-            headingElt.innerHTML = `<span class="prefix"></span><span class="content">${headingElt.innerHTML}</span><span class="suffix"></span>`;
+            // 创建一个新的 <span> 元素
+            const contentElt = document.createElement('span');
+            contentElt.className = 'content';
+            // 将原始内容移动到新的 <span> 元素中
+            while (headingElt.firstChild) {
+              contentElt.appendChild(headingElt.firstChild);
+            }
+            const prefixElt = document.createElement('span');
+            prefixElt.className = 'prefix';
+            headingElt.insertBefore(prefixElt, headingElt.firstChild);
+            // 将新的 <span> 元素替换原始元素
+            headingElt.appendChild(contentElt);
+            const suffixElt = document.createElement('span');
+            suffixElt.className = 'suffix';
+            headingElt.appendChild(suffixElt);
           }
           if (insertBeforeTocElt) {
             this.tocElt.insertBefore(sectionTocElt, insertBeforeTocElt);
@@ -439,6 +453,13 @@ const editorSvc = Object.assign(new Vue(), editorSvcDiscussions, editorSvcUtils,
       });
       return true;
     });
+    this.pagedownEditor.hooks.set('insertChatGptDialog', (callback) => {
+      store.dispatch('modal/open', {
+        type: 'chatGpt',
+        callback,
+      });
+      return true;
+    });
     this.pagedownEditor.hooks.set('insertImageUploading', (callback) => {
       callback(store.getters['img/currImgId']);
       return true;

src/services/exportSvc.js

@@ -73,6 +73,7 @@ export default {
     const parsingCtx = markdownConversionSvc.parseSections(converter, content.text);
     const conversionCtx = markdownConversionSvc.convert(parsingCtx);
     const html = conversionCtx.htmlSectionList.map(htmlSanitizer.sanitizeHtml).join('');
+    const colorThemeClass = `app--${store.getters['data/computedSettings'].colorTheme}`;
     const themeClass = `preview-theme--${store.state.theme.currPreviewTheme}`;
     let themeStyleContent = '';
     const themeStyleEle = document.getElementById(`preview-theme-${store.state.theme.currPreviewTheme}`);
@@ -92,8 +93,8 @@ export default {
 
     // 替换相对路径图片为blob图片
     const imgs = Array.prototype.slice.call(containerElt.getElementsByTagName('img')).map((imgElt) => {
-      let uri = imgElt.attributes.src.nodeValue;
-      if (uri.indexOf('http://') !== 0 && uri.indexOf('https://') !== 0) {
+      let uri = imgElt.attributes && imgElt.attributes.src && imgElt.attributes.src.nodeValue;
+      if (uri && uri.indexOf('http://') !== 0 && uri.indexOf('https://') !== 0) {
         uri = decodeURIComponent(uri);
         imgElt.removeAttribute('src');
         return { imgElt, uri };
@@ -115,7 +116,21 @@ export default {
     // Make TOC
     const allHeaders = containerElt.querySelectorAll('h1,h2,h3,h4,h5,h6');
     Array.prototype.slice.call(allHeaders).forEach((headingElt) => {
-      headingElt.innerHTML = `<span class="prefix"></span><span class="content">${headingElt.innerHTML}</span><span class="suffix"></span>`;
+      // 创建一个新的 <span> 元素
+      const contentElt = document.createElement('span');
+      contentElt.className = 'content';
+      // 将原始内容移动到新的 <span> 元素中
+      while (headingElt.firstChild) {
+        contentElt.appendChild(headingElt.firstChild);
+      }
+      const prefixElt = document.createElement('span');
+      prefixElt.className = 'prefix';
+      headingElt.insertBefore(prefixElt, headingElt.firstChild);
+      // 将新的 <span> 元素替换原始元素
+      headingElt.appendChild(contentElt);
+      const suffixElt = document.createElement('span');
+      suffixElt.className = 'suffix';
+      headingElt.appendChild(suffixElt);
     });
     const headings = allHeaders.cl_map(headingElt => ({
       title: headingElt.textContent,
@@ -134,6 +149,7 @@ export default {
           yamlProperties: content.properties,
           html: containerElt.innerHTML,
           toc,
+          colorThemeClass,
           themeClass,
           themeStyleContent,
         },

src/services/optional/shortcuts.js

@@ -3,8 +3,8 @@ import store from '../../store';
 import editorSvc from '../../services/editorSvc';
 import syncSvc from '../../services/syncSvc';
 
-// Skip shortcuts if modal is open or editor is hidden
-Mousetrap.prototype.stopCallback = () => store.getters['modal/config'] || !store.getters['content/isCurrentEditable'];
+// Skip shortcuts if modal is open
+Mousetrap.prototype.stopCallback = () => store.getters['modal/config'];
 
 const pagedownHandler = name => () => {
   editorSvc.pagedownEditor.uiManager.doClick(name);
@@ -20,6 +20,14 @@ const findReplaceOpener = type => () => {
   return true;
 };
 
+const toggleEditor = () => () => {
+  store.dispatch('data/toggleEditor', !store.getters['data/layoutSettings'].showEditor);
+  return true;
+};
+
+// 非编辑模式下支持的快捷键
+const noEditableShortcutMethods = ['toggleeditor'];
+
 const methods = {
   bold: pagedownHandler('bold'),
   italic: pagedownHandler('italic'),
@@ -28,6 +36,7 @@ const methods = {
   quote: pagedownHandler('quote'),
   code: pagedownHandler('code'),
   image: pagedownHandler('image'),
+  chatgpt: pagedownHandler('chatgpt'),
   olist: pagedownHandler('olist'),
   ulist: pagedownHandler('ulist'),
   clist: pagedownHandler('clist'),
@@ -35,6 +44,7 @@ const methods = {
   inline: pagedownHandler('heading'),
   hr: pagedownHandler('hr'),
   inlineformula: pagedownHandler('inlineformula'),
+  toggleeditor: toggleEditor(),
   sync() {
     if (syncSvc.isSyncPossible()) {
       syncSvc.requestSync();
@@ -66,8 +76,11 @@ const methods = {
 };
 
 store.watch(
-  () => store.getters['data/computedSettings'],
-  (computedSettings) => {
+  () => ({
+    computedSettings: store.getters['data/computedSettings'],
+    isCurrentEditable: store.getters['content/isCurrentEditable'],
+  }),
+  ({ computedSettings, isCurrentEditable }) => {
     Mousetrap.reset();
 
     Object.entries(computedSettings.shortcuts).forEach(([key, shortcut]) => {
@@ -79,14 +92,18 @@ store.watch(
         }
         if (Object.prototype.hasOwnProperty.call(methods, method)) {
           try {
-            Mousetrap.bind(`${key}`, () => !methods[method].apply(null, params));
+            // editor is editable or 一些非编辑模式下支持的快捷键
+            if (isCurrentEditable || noEditableShortcutMethods.indexOf(method) !== -1) {
+              Mousetrap.bind(`${key}`, () => !methods[method].apply(null, params));
+            }
           } catch (e) {
             // Ignore
           }
         }
       }
     });
-  }, {
+  },
+  {
     immediate: true,
   },
 );

src/services/providers/giteaProvider.js

@@ -36,7 +36,7 @@ export default new Provider({
   async uploadContent(token, content, syncLocation) {
     const updatedSyncLocation = {
       ...syncLocation,
-      projectId: await giteaHelper.getProjectId(syncLocation),
+      projectId: await giteaHelper.getProjectId(token, syncLocation),
     };
     if (!savedSha[updatedSyncLocation.id]) {
       try {
@@ -59,7 +59,7 @@ export default new Provider({
   async publish(token, html, metadata, publishLocation, commitMessage) {
     const updatedPublishLocation = {
       ...publishLocation,
-      projectId: await giteaHelper.getProjectId(publishLocation),
+      projectId: await giteaHelper.getProjectId(token, publishLocation),
     };
     try {
       // Get the last sha
@@ -81,7 +81,7 @@ export default new Provider({
   async openFile(token, syncLocation) {
     const updatedSyncLocation = {
       ...syncLocation,
-      projectId: await giteaHelper.getProjectId(syncLocation),
+      projectId: await giteaHelper.getProjectId(token, syncLocation),
     };
 
     // Check if the file exists and open it

src/services/providers/giteeGistProvider.js

@@ -5,91 +5,91 @@ import utils from '../utils';
 import userSvc from '../userSvc';
 
 export default new Provider({
-  id: 'giteegist',
-  name: 'GiteeGist',
-  getToken({ sub }) {
-    return store.getters['data/giteeTokensBySub'][sub];
-  },
-  getLocationUrl({ gistId }) {
-    return `https://gitee.com/mafgwo/codes/${gistId}`;
-  },
-  getLocationDescription({ filename }) {
-    return filename;
-  },
-  async downloadContent(token, syncLocation) {
-    const content = await giteeHelper.downloadGist({
-      ...syncLocation,
-      token,
-    });
-    return Provider.parseContent(content, `${syncLocation.fileId}/content`);
-  },
-  async uploadContent(token, content, syncLocation) {
-    const file = store.state.file.itemsById[syncLocation.fileId];
-    const description = utils.sanitizeName(file && file.name);
-    const gist = await giteeHelper.uploadGist({
-      ...syncLocation,
-      token,
-      description,
-      content: Provider.serializeContent(content),
-    });
-    return {
-      ...syncLocation,
-      gistId: gist.id,
-    };
-  },
-  async publish(token, html, metadata, publishLocation) {
-    const gist = await giteeHelper.uploadGist({
-      ...publishLocation,
-      token,
-      description: metadata.title,
-      content: html,
-    });
-    return {
-      ...publishLocation,
-      gistId: gist.id,
-    };
-  },
-  makeLocation(token, filename, isPublic, gistId) {
-    return {
-      providerId: this.id,
-      sub: token.sub,
-      filename,
-      isPublic,
-      gistId,
-    };
-  },
-  async listFileRevisions({ token, syncLocation }) {
-    const entries = await giteeHelper.getGistCommits({
-      ...syncLocation,
-      token,
-    });
+    id: 'giteegist',
+    name: 'GiteeGist',
+    getToken({ sub }) {
+        return store.getters['data/giteeTokensBySub'][sub];
+    },
+    getLocationUrl({ gistId }) {
+        return `https://gitee.com/caojiezi2003/codes/${gistId}`;
+    },
+    getLocationDescription({ filename }) {
+        return filename;
+    },
+    async downloadContent(token, syncLocation) {
+        const content = await giteeHelper.downloadGist({
+            ...syncLocation,
+            token,
+        });
+        return Provider.parseContent(content, `${syncLocation.fileId}/content`);
+    },
+    async uploadContent(token, content, syncLocation) {
+        const file = store.state.file.itemsById[syncLocation.fileId];
+        const description = utils.sanitizeName(file && file.name);
+        const gist = await giteeHelper.uploadGist({
+            ...syncLocation,
+            token,
+            description,
+            content: Provider.serializeContent(content),
+        });
+        return {
+            ...syncLocation,
+            gistId: gist.id,
+        };
+    },
+    async publish(token, html, metadata, publishLocation) {
+        const gist = await giteeHelper.uploadGist({
+            ...publishLocation,
+            token,
+            description: metadata.title,
+            content: html,
+        });
+        return {
+            ...publishLocation,
+            gistId: gist.id,
+        };
+    },
+    makeLocation(token, filename, isPublic, gistId) {
+        return {
+            providerId: this.id,
+            sub: token.sub,
+            filename,
+            isPublic,
+            gistId,
+        };
+    },
+    async listFileRevisions({ token, syncLocation }) {
+        const entries = await giteeHelper.getGistCommits({
+            ...syncLocation,
+            token,
+        });
 
-    return entries.map((entry) => {
-      const sub = `${giteeHelper.subPrefix}:${entry.user.id}`;
-      userSvc.addUserInfo({ id: sub, name: entry.user.login, imageUrl: entry.user.avatar_url });
-      return {
-        sub,
-        id: entry.version,
-        message: entry.commit && entry.commit.message,
-        created: new Date(entry.committed_at).getTime(),
-      };
-    });
-  },
-  async loadFileRevision() {
-    // Revision are already loaded
-    return false;
-  },
-  // async getFileRevisionContent({
-  //   token,
-  //   contentId,
-  //   syncLocation,
-  //   revisionId,
-  // }) {
-  //   const data = await giteeHelper.downloadGistRevision({
-  //     ...syncLocation,
-  //     token,
-  //     sha: revisionId,
-  //   });
-  //   return Provider.parseContent(data, contentId);
-  // },
-});
+        return entries.map((entry) => {
+            const sub = `${giteeHelper.subPrefix}:${entry.user.id}`;
+            userSvc.addUserInfo({ id: sub, name: entry.user.login, imageUrl: entry.user.avatar_url });
+            return {
+                sub,
+                id: entry.version,
+                message: entry.commit && entry.commit.message,
+                created: new Date(entry.committed_at).getTime(),
+            };
+        });
+    },
+    async loadFileRevision() {
+        // Revision are already loaded
+        return false;
+    },
+    // async getFileRevisionContent({
+    //   token,
+    //   contentId,
+    //   syncLocation,
+    //   revisionId,
+    // }) {
+    //   const data = await giteeHelper.downloadGistRevision({
+    //     ...syncLocation,
+    //     token,
+    //     sha: revisionId,
+    //   });
+    //   return Provider.parseContent(data, contentId);
+    // },
+});

src/services/providers/githubAppDataProvider.js

@@ -0,0 +1,292 @@
+import store from '../../store';
+import githubHelper from './helpers/githubHelper';
+import Provider from './common/Provider';
+import gitWorkspaceSvc from '../gitWorkspaceSvc';
+import userSvc from '../userSvc';
+
+const appDataRepo = 'stackedit-app-data';
+const appDataBranch = 'master';
+
+export default new Provider({
+  id: 'githubAppData',
+  name: 'Gitee应用数据',
+  getToken() {
+    return store.getters['workspace/syncToken'];
+  },
+  getWorkspaceParams() {
+    // No param as it's the main workspace
+    return {};
+  },
+  getWorkspaceLocationUrl() {
+    // No direct link to app data
+    return null;
+  },
+  getSyncDataUrl() {
+    // No direct link to app data
+    return null;
+  },
+  getSyncDataDescription({ id }) {
+    return id;
+  },
+  async initWorkspace() {
+    // Nothing much to do since the main workspace isn't necessarily synchronized
+    // Return the main workspace
+    return store.getters['workspace/workspacesById'].main;
+  },
+  getChanges() {
+    const token = this.getToken();
+    return githubHelper.getTree({
+      owner: token.name,
+      repo: appDataRepo,
+      branch: appDataBranch,
+      token,
+    });
+  },
+  prepareChanges(tree) {
+    return gitWorkspaceSvc.makeChanges(tree);
+  },
+  async saveWorkspaceItem({ item }) {
+    const syncData = {
+      id: store.getters.gitPathsByItemId[item.id],
+      type: item.type,
+      hash: item.hash,
+    };
+
+    // Files and folders are not in git, only contents
+    if (item.type === 'file' || item.type === 'folder') {
+      return { syncData };
+    }
+
+    // locations are stored as paths, so we upload an empty file
+    const syncToken = store.getters['workspace/syncToken'];
+    await githubHelper.uploadFile({
+      owner: syncToken.name,
+      repo: appDataRepo,
+      branch: appDataBranch,
+      token: syncToken,
+      path: syncData.id,
+      content: '',
+      sha: gitWorkspaceSvc.shaByPath[syncData.id],
+      commitMessage: item.commitMessage,
+    });
+
+    // Return sync data to save
+    return { syncData };
+  },
+  async removeWorkspaceItem({ syncData }) {
+    if (gitWorkspaceSvc.shaByPath[syncData.id]) {
+      const syncToken = store.getters['workspace/syncToken'];
+      await githubHelper.removeFile({
+        owner: syncToken.name,
+        repo: appDataRepo,
+        branch: appDataBranch,
+        token: syncToken,
+        path: syncData.id,
+        sha: gitWorkspaceSvc.shaByPath[syncData.id],
+      });
+    }
+  },
+  async downloadWorkspaceContent({
+    token,
+    contentId,
+    contentSyncData,
+    fileSyncData,
+  }) {
+    const { sha, data } = await githubHelper.downloadFile({
+      owner: token.name,
+      repo: appDataRepo,
+      branch: appDataBranch,
+      token,
+      path: fileSyncData.id,
+    });
+    gitWorkspaceSvc.shaByPath[fileSyncData.id] = sha;
+    const content = Provider.parseContent(data, contentId);
+    return {
+      content,
+      contentSyncData: {
+        ...contentSyncData,
+        hash: content.hash,
+        sha,
+      },
+    };
+  },
+  async downloadFile({ token, path }) {
+    const { sha, data } = await githubHelper.downloadFile({
+      owner: token.name,
+      repo: appDataRepo,
+      branch: appDataBranch,
+      token,
+      path,
+      isImg: true,
+    });
+    return {
+      content: data,
+      sha,
+    };
+  },
+  async downloadWorkspaceData({ token, syncData }) {
+    if (!syncData) {
+      return {};
+    }
+    const path = `.stackedit-data/${syncData.id}.json`;
+    // const path = store.getters.gitPathsByItemId[syncData.id];
+    // const path = syncData.id;
+    const { sha, data } = await githubHelper.downloadFile({
+      owner: token.name,
+      repo: appDataRepo,
+      branch: appDataBranch,
+      token,
+      path,
+    });
+    if (!sha) {
+      return {};
+    }
+    gitWorkspaceSvc.shaByPath[path] = sha;
+    const item = JSON.parse(data);
+    return {
+      item,
+      syncData: {
+        ...syncData,
+        hash: item.hash,
+        sha,
+        type: 'data',
+      },
+    };
+  },
+  async uploadWorkspaceContent({
+    token,
+    content,
+    file,
+    commitMessage,
+  }) {
+    const isImg = file.type === 'img';
+    const path = !isImg ? store.getters.gitPathsByItemId[file.id] : file.path;
+    const res = await githubHelper.uploadFile({
+      owner: token.name,
+      repo: appDataRepo,
+      branch: appDataBranch,
+      token,
+      path,
+      content: !isImg ? Provider.serializeContent(content) : file.content,
+      sha: gitWorkspaceSvc.shaByPath[!isImg ? path : file.path],
+      isImg,
+      commitMessage,
+    });
+
+    if (isImg) {
+      return {
+        sha: res.content.sha,
+      };
+    }
+    // Return new sync data
+    return {
+      contentSyncData: {
+        id: store.getters.gitPathsByItemId[content.id],
+        type: content.type,
+        hash: content.hash,
+        sha: res.content.sha,
+      },
+      fileSyncData: {
+        id: path,
+        type: 'file',
+        hash: file.hash,
+      },
+    };
+  },
+  async uploadWorkspaceData({
+    token,
+    item,
+    syncData,
+  }) {
+    const path = `.stackedit-data/${item.id}.json`;
+    // const path = store.getters.gitPathsByItemId[item.id];
+    // const path = syncData.id;
+    const res = await githubHelper.uploadFile({
+      token,
+      owner: token.name,
+      repo: appDataRepo,
+      branch: appDataBranch,
+      path,
+      content: JSON.stringify(item),
+      sha: gitWorkspaceSvc.shaByPath[path],
+    });
+
+    return {
+      syncData: {
+        ...syncData,
+        type: item.type,
+        hash: item.hash,
+        data: item.data,
+        sha: res.content.sha,
+      },
+    };
+  },
+  async listFileRevisions({ token, fileSyncDataId }) {
+    const { owner, repo, branch } = {
+      owner: token.name,
+      repo: appDataRepo,
+      branch: appDataBranch,
+    };
+    const entries = await githubHelper.getCommits({
+      token,
+      owner,
+      repo,
+      sha: branch,
+      path: fileSyncDataId,
+    });
+
+    return entries.map(({
+      author,
+      committer,
+      commit,
+      sha,
+    }) => {
+      let user;
+      if (author && author.login) {
+        user = author;
+      } else if (committer && committer.login) {
+        user = committer;
+      }
+      const sub = `${githubHelper.subPrefix}:${user.login}`;
+      if (user.avatar_url && user.avatar_url.endsWith('.png') && !user.avatar_url.endsWith('no_portrait.png')) {
+        user.avatar_url = `${user.avatar_url}!avatar60`;
+      }
+      userSvc.addUserInfo({ id: sub, name: user.login, imageUrl: user.avatar_url });
+      const date = (commit.author && commit.author.date)
+        || (commit.committer && commit.committer.date)
+        || 1;
+      return {
+        id: sha,
+        sub,
+        message: commit.message,
+        created: new Date(date).getTime(),
+      };
+    });
+  },
+  async loadFileRevision() {
+    // Revisions are already loaded
+    return false;
+  },
+  async getFileRevisionContent({
+    token,
+    contentId,
+    fileSyncDataId,
+    revisionId,
+  }) {
+    const { data } = await githubHelper.downloadFile({
+      owner: token.name,
+      repo: appDataRepo,
+      branch: revisionId,
+      token,
+      path: fileSyncDataId,
+    });
+    return Provider.parseContent(data, contentId);
+  },
+  getFilePathUrl(path) {
+    const token = this.getToken();
+    if (!token) {
+      return null;
+    }
+    return `https://github.com/${token.name}/${appDataRepo}/blob/${appDataBranch}${path}`;
+  },
+});

src/services/providers/gitlabWorkspaceProvider.js

@@ -75,11 +75,11 @@ export default new Provider({
     const sub = workspace ? workspace.sub : utils.queryParams.sub;
     let token = store.getters['data/gitlabTokensBySub'][sub];
     if (!token) {
-      const { applicationId } = await store.dispatch('modal/open', {
+      const { applicationId, applicationSecret } = await store.dispatch('modal/open', {
         type: 'gitlabAccount',
         forceServerUrl: serverUrl,
       });
-      token = await gitlabHelper.addAccount(serverUrl, applicationId, sub);
+      token = await gitlabHelper.addAccount(serverUrl, applicationId, applicationSecret, sub);
     }
 
     if (!workspace) {

src/services/providers/helpers/giteaHelper.js

@@ -317,6 +317,12 @@ export default {
     isImg,
     commitMessage,
   }) {
+    // 非法的文件名 不让提交
+    if (!path || path.endsWith('undefined')) {
+      return new Promise((resolve) => {
+        resolve({ res: { content: { sha: null } } });
+      });
+    }
     let uploadContent = content;
     if (isImg && typeof content !== 'string') {
       uploadContent = await utils.encodeFiletoBase64(content);

src/services/providers/helpers/giteeHelper.js

@@ -147,6 +147,7 @@ export default {
       sub: `${user.login}`,
     };
     if (isMain) {
+      token.providerId = 'giteeAppData';
       // 检查 stackedit-app-data 仓库是否已经存在 如果不存在则创建该仓库
       await this.checkAndCreateRepo(token);
     }
@@ -279,6 +280,12 @@ export default {
     isImg,
     commitMessage,
   }) {
+    // 非法的文件名 不让提交
+    if (!path || path.endsWith('undefined')) {
+      return new Promise((resolve) => {
+        resolve({ res: { content: { sha: null } } });
+      });
+    }
     let uploadContent = content;
     if (isImg && typeof content !== 'string') {
       uploadContent = await utils.encodeFiletoBase64(content);

src/services/providers/helpers/githubHelper.js

@@ -6,6 +6,8 @@ import badgeSvc from '../../badgeSvc';
 
 const getScopes = token => [token.repoFullAccess ? 'repo' : 'public_repo', 'gist'];
 
+const appDataRepo = 'stackedit-app-data';
+
 const request = (token, options) => networkSvc.request({
   ...options,
   headers: {
@@ -62,7 +64,7 @@ export default {
   /**
    * https://developer.github.com/apps/building-oauth-apps/authorization-options-for-oauth-apps/
    */
-  async startOauth2(scopes, sub = null, silent = false) {
+  async startOauth2(scopes, sub = null, silent = false, isMain) {
     await networkSvc.getServerConf();
     const clientId = store.getters['data/serverConf'].githubClientId;
 
@@ -110,16 +112,26 @@ export default {
     const token = {
       scopes,
       accessToken,
+      // 主文档空间的登录 标识登录
+      isLogin: !!isMain || (oldToken && !!oldToken.isLogin),
       name: user.login,
       sub: `${user.id}`,
       imgStorages: oldToken && oldToken.imgStorages,
       repoFullAccess: scopes.includes('repo'),
     };
 
+    if (isMain) {
+      token.providerId = 'githubAppData';
+      // check stackedit-app-data repo exist?
+      await this.checkAndCreateRepo(token);
+    }
     // Add token to github tokens
     store.dispatch('data/addGithubToken', token);
     return token;
   },
+  signin() {
+    return this.startOauth2(['repo', 'gist'], null, false, true);
+  },
   async addAccount(repoFullAccess = false) {
     const token = await this.startOauth2(getScopes({ repoFullAccess }));
     badgeSvc.addBadge('addGitHubAccount');
@@ -148,6 +160,30 @@ export default {
     return tree;
   },
 
+  async checkAndCreateRepo(token) {
+    const url = `https://api.github.com/repos/${encodeURIComponent(token.name)}/${encodeURIComponent(appDataRepo)}`;
+    try {
+      await request(token, { url });
+    } catch (err) {
+      // create
+      if (err.status === 404) {
+        await request(token, {
+          method: 'POST',
+          url: 'https://api.github.com/repos/mafgwo/stackedit-appdata-template/generate',
+          body: {
+            owner: token.name,
+            name: appDataRepo,
+            description: 'StackEdit中文版默认空间.',
+            include_all_branches: false,
+            private: true,
+          },
+        });
+      } else {
+        throw err;
+      }
+    }
+  },
+
   /**
    * https://developer.github.com/v3/repos/commits/#list-commits-on-a-repository
    */
@@ -157,11 +193,29 @@ export default {
     repo,
     sha,
     path,
+    tryTimes,
   }) {
-    return repoRequest(token, owner, repo, {
-      url: 'commits',
-      params: { sha, path },
-    });
+    let tryCount = tryTimes || 1;
+    try {
+      return repoRequest(token, owner, repo, {
+        url: 'commits',
+        params: { sha, path },
+      });
+    } catch (err) {
+      // 主文档 并且 409 则重试3次
+      if (tryCount <= 3 && err.status === 409 && repo === appDataRepo) {
+        tryCount += 1;
+        return this.getCommits({
+          token,
+          owner,
+          repo,
+          sha,
+          path,
+          tryTimes: tryCount,
+        });
+      }
+      throw err;
+    }
   },
 
   /**
@@ -179,6 +233,12 @@ export default {
     isImg,
     commitMessage,
   }) {
+    // 非法的文件名 不让提交
+    if (!path || path.endsWith('undefined')) {
+      return new Promise((resolve) => {
+        resolve({ res: { content: { sha: null } } });
+      });
+    }
     let uploadContent = content;
     if (isImg && typeof content !== 'string') {
       uploadContent = await utils.encodeFiletoBase64(content);
@@ -228,14 +288,30 @@ export default {
     path,
     isImg,
   }) {
-    const { sha, content } = await repoRequest(token, owner, repo, {
-      url: `contents/${encodeURIComponent(path)}`,
-      params: { ref: branch },
-    });
-    return {
-      sha,
-      data: !isImg ? utils.decodeBase64(content) : content,
-    };
+    try {
+      const { sha, content, encoding } = await repoRequest(token, owner, repo, {
+        url: `contents/${encodeURIComponent(path)}`,
+        params: { ref: branch },
+      });
+      let tempContent = content;
+      // 如果是图片且 encoding 为 none 则 需要获取 blob
+      if (isImg && encoding === 'none') {
+        const blobInfo = await repoRequest(token, owner, repo, {
+          url: `git/blobs/${sha}`,
+        });
+        tempContent = blobInfo.content;
+      }
+      return {
+        sha,
+        data: !isImg ? utils.decodeBase64(tempContent) : tempContent,
+      };
+    } catch (err) {
+      // not .stackedit-data  throw err
+      if (err.status === 404 && path.indexOf('.stackedit-data') >= 0) {
+        return {};
+      }
+      throw err;
+    }
   },
   /**
    * 获取仓库信息

src/services/providers/helpers/gitlabHelper.js

@@ -3,6 +3,9 @@ import networkSvc from '../../networkSvc';
 import store from '../../../store';
 import userSvc from '../../userSvc';
 import badgeSvc from '../../badgeSvc';
+import constants from '../../../data/constants';
+
+const tokenExpirationMargin = 5 * 60 * 1000;
 
 const request = ({ accessToken, serverUrl }, options) => networkSvc.request({
   ...options,
@@ -50,34 +53,90 @@ export default {
   /**
    * https://docs.gitlab.com/ee/api/oauth2.html
    */
-  async startOauth2(serverUrl, applicationId, sub = null, silent = false) {
+  async startOauth2(
+    serverUrl, applicationId, applicationSecret,
+    sub = null, silent = false, refreshToken,
+  ) {
     let apiUrl = serverUrl;
     let clientId = applicationId;
-    // 获取gitea配置的参数
+    let useServerConf = false;
+    // 获取gitlab配置的参数
     await networkSvc.getServerConf();
     const confClientId = store.getters['data/serverConf'].gitlabClientId;
     const confServerUrl = store.getters['data/serverConf'].gitlabUrl;
-    // 存在gitea配置则使用后端配置
+    // 存在gitlab配置则使用后端配置
     if (confClientId && confServerUrl) {
       apiUrl = confServerUrl;
       clientId = confClientId;
+      useServerConf = true;
+    }
+    let tokenBody;
+    if (!silent) {
+      // Get an OAuth2 code
+      const { code } = await networkSvc.startOauth2(
+        `${apiUrl}/oauth/authorize`,
+        {
+          client_id: clientId,
+          response_type: 'code',
+          redirect_uri: constants.oauth2RedirectUri,
+        },
+        silent,
+      );
+      if (useServerConf) {
+        tokenBody = (await networkSvc.request({
+          method: 'GET',
+          url: 'oauth2/gitlabToken',
+          params: {
+            code,
+            grant_type: 'authorization_code',
+            redirect_uri: constants.oauth2RedirectUri,
+          },
+        })).body;
+      } else {
+        // Exchange code with token
+        tokenBody = (await networkSvc.request({
+          method: 'POST',
+          url: `${apiUrl}/oauth/token`,
+          params: {
+            client_id: clientId,
+            client_secret: applicationSecret,
+            code,
+            grant_type: 'authorization_code',
+            redirect_uri: constants.oauth2RedirectUri,
+          },
+        })).body;
+      }
+    } else if (useServerConf) {
+      tokenBody = (await networkSvc.request({
+        method: 'GET',
+        url: 'oauth2/gitlabToken',
+        params: {
+          refresh_token: refreshToken,
+          grant_type: 'refresh_token',
+          redirect_uri: constants.oauth2RedirectUri,
+        },
+      })).body;
+    } else {
+      // Exchange refreshToken with token
+      tokenBody = (await networkSvc.request({
+        method: 'POST',
+        url: `${apiUrl}/oauth/token`,
+        body: {
+          client_id: clientId,
+          client_secret: applicationSecret,
+          refresh_token: refreshToken,
+          grant_type: 'refresh_token',
+          redirect_uri: constants.oauth2RedirectUri,
+        },
+      })).body;
     }
-    // Get an OAuth2 code
-    const { accessToken } = await networkSvc.startOauth2(
-      `${apiUrl}/oauth/authorize`,
-      {
-        client_id: clientId,
-        response_type: 'token',
-        scope: 'api',
-      },
-      silent,
-    );
 
+    const accessToken = tokenBody.access_token;
     // Call the user info endpoint
-    const user = await request({ accessToken, serverUrl }, {
+    const user = await request({ accessToken, serverUrl: apiUrl }, {
       url: 'user',
     });
-    const uniqueSub = `${serverUrl}/${user.id}`;
+    const uniqueSub = `${apiUrl}/${user.id}`;
     userSvc.addUserInfo({
       id: `${subPrefix}:${uniqueSub}`,
       name: user.username,
@@ -89,11 +148,17 @@ export default {
       throw new Error('GitLab account ID not expected.');
     }
 
+    const oldToken = store.getters['data/gitlabTokensBySub'][uniqueSub];
     // Build token object including scopes and sub
     const token = {
       accessToken,
       name: user.username,
-      serverUrl,
+      applicationId: clientId,
+      applicationSecret,
+      imgStorages: oldToken && oldToken.imgStorages,
+      refreshToken: tokenBody.refresh_token,
+      expiresOn: Date.now() + ((tokenBody.expires_in || 7200) * 1000),
+      serverUrl: apiUrl,
       sub: uniqueSub,
     };
 
@@ -101,12 +166,58 @@ export default {
     store.dispatch('data/addGitlabToken', token);
     return token;
   },
-  async addAccount(serverUrl, applicationId, sub = null) {
-    const token = await this.startOauth2(serverUrl, applicationId, sub);
+  async addAccount(serverUrl, applicationId, applicationSecret, sub = null) {
+    const token = await this.startOauth2(serverUrl, applicationId, applicationSecret, sub);
     badgeSvc.addBadge('addGitLabAccount');
     return token;
   },
+  // 刷新token
+  async refreshToken(token) {
+    const {
+      serverUrl,
+      applicationId,
+      applicationSecret,
+      sub,
+    } = token;
+    const lastToken = store.getters['data/gitlabTokensBySub'][sub];
+    // 兼容旧的没有过期时间
+    if (!lastToken.expiresOn || !lastToken.refreshToken) {
+      await store.dispatch('modal/open', {
+        type: 'providerRedirection',
+        name: 'Gitlab',
+      });
+      return this.startOauth2(serverUrl, applicationId, applicationSecret, sub);
+    }
+    // lastToken is not expired
+    if (lastToken.expiresOn > Date.now() + tokenExpirationMargin) {
+      return lastToken;
+    }
 
+    // existing token is about to expire.
+    // Try to get a new token in background
+    try {
+      return await this.startOauth2(
+        serverUrl, applicationId, applicationSecret,
+        sub, true, lastToken.refreshToken,
+      );
+    } catch (err) {
+      // If it fails try to popup a window
+      if (store.state.offline) {
+        throw err;
+      }
+      await store.dispatch('modal/open', {
+        type: 'providerRedirection',
+        name: 'Gitlab',
+      });
+      return this.startOauth2(serverUrl, applicationId, applicationSecret, sub);
+    }
+  },
+  // 带刷新token
+  async requestWithRefreshToken(token, options) {
+    const refreshedToken = await this.refreshToken(token);
+    const result = await request(refreshedToken, options);
+    return result;
+  },
   /**
    * https://docs.gitlab.com/ee/api/projects.html#get-single-project
    */
@@ -114,8 +225,7 @@ export default {
     if (projectId) {
       return projectId;
     }
-
-    const project = await request(token, {
+    const project = await this.requestWithRefreshToken(token, {
       url: `projects/${encodeURIComponent(projectPath)}`,
     });
     return project.id;
@@ -129,7 +239,7 @@ export default {
     projectId,
     branch,
   }) {
-    return request(token, {
+    return this.requestWithRefreshToken(token, {
       url: `projects/${encodeURIComponent(projectId)}/repository/tree`,
       params: {
         ref: branch,
@@ -148,7 +258,7 @@ export default {
     branch,
     path,
   }) {
-    return request(token, {
+    return this.requestWithRefreshToken(token, {
       url: `projects/${encodeURIComponent(projectId)}/repository/commits`,
       params: {
         ref_name: branch,
@@ -171,11 +281,17 @@ export default {
     isImg,
     commitMessage,
   }) {
+    // 非法的文件名 不让提交
+    if (!path || path.endsWith('undefined')) {
+      return new Promise((resolve) => {
+        resolve({ res: { content: { sha: null } } });
+      });
+    }
     let uploadContent = content;
     if (isImg && typeof content !== 'string') {
       uploadContent = await utils.encodeFiletoBase64(content);
     }
-    return request(token, {
+    return this.requestWithRefreshToken(token, {
       method: sha ? 'PUT' : 'POST',
       url: `projects/${encodeURIComponent(projectId)}/repository/files/${encodeURIComponent(path)}`,
       body: {
@@ -198,7 +314,7 @@ export default {
     path,
     sha,
   }) {
-    return request(token, {
+    return this.requestWithRefreshToken(token, {
       method: 'DELETE',
       url: `projects/${encodeURIComponent(projectId)}/repository/files/${encodeURIComponent(path)}`,
       body: {
@@ -219,7 +335,7 @@ export default {
     path,
     isImg,
   }) {
-    const res = await request(token, {
+    const res = await this.requestWithRefreshToken(token, {
       url: `projects/${encodeURIComponent(projectId)}/repository/files/${encodeURIComponent(path)}`,
       params: { ref: branch },
     });

src/services/providers/helpers/googleHelper.js

@@ -10,8 +10,7 @@ const tokenExpirationMargin = 5 * 60 * 1000; // 5 min (tokens expire after 1h)
 const driveAppDataScopes = ['https://www.googleapis.com/auth/drive.appdata'];
 const getDriveScopes = token => [token.driveFullAccess
   ? 'https://www.googleapis.com/auth/drive'
-  : 'https://www.googleapis.com/auth/drive.file',
-'https://www.googleapis.com/auth/drive.install'];
+  : 'https://www.googleapis.com/auth/drive.file'];
 const bloggerScopes = ['https://www.googleapis.com/auth/blogger'];
 const photosScopes = ['https://www.googleapis.com/auth/photos'];
 

src/services/syncSvc.js

@@ -6,6 +6,7 @@ import diffUtils from './diffUtils';
 import networkSvc from './networkSvc';
 import providerRegistry from './providers/common/providerRegistry';
 import giteeAppDataProvider from './providers/giteeAppDataProvider';
+import githubAppDataProvider from './providers/githubAppDataProvider';
 import './providers/couchdbWorkspaceProvider';
 import './providers/githubWorkspaceProvider';
 import './providers/giteeWorkspaceProvider';
@@ -830,7 +831,7 @@ const syncWorkspace = async (skipContents = false) => {
     }
 
     if (workspace.id === 'main') {
-      badgeSvc.addBadge('syncMainWorkspace');
+      badgeSvc.addBadge(workspace.providerId === 'giteeAppData' ? 'syncMainWorkspace' : 'githubSyncMainWorkspace');
     }
   } catch (err) {
     if (err && err.message === 'TOO_LATE') {
@@ -969,6 +970,15 @@ const requestSync = (addTriggerSyncBadge = false) => {
   });
 };
 
+const afterSignIn = async () => {
+  if (store.getters['workspace/currentWorkspace'].id === 'main' && workspaceProvider) {
+    const mainToken = store.getters['workspace/mainWorkspaceToken'];
+    // Try to find a suitable workspace sync provider
+    workspaceProvider = mainToken.providerId === 'githubAppData' ? githubAppDataProvider : giteeAppDataProvider;
+    await workspaceProvider.initWorkspace();
+  }
+};
+
 export default {
   async init() {
     // Load workspaces and tokens from localStorage
@@ -980,10 +990,11 @@ export default {
       await actionProvider.initAction();
     }
 
+    const mainToken = store.getters['workspace/mainWorkspaceToken'];
     // Try to find a suitable workspace sync provider
     workspaceProvider = providerRegistry.providersById[utils.queryParams.providerId];
     if (!workspaceProvider || !workspaceProvider.initWorkspace) {
-      workspaceProvider = giteeAppDataProvider;
+      workspaceProvider = mainToken && mainToken.providerId === 'githubAppData' ? githubAppDataProvider : giteeAppDataProvider;
     }
     const workspace = await workspaceProvider.initWorkspace();
     // Fix the URL hash
@@ -1041,6 +1052,7 @@ export default {
       }, 5000);
     }
   },
+  afterSignIn,
   syncImg,
   isSyncPossible,
   requestSync,

src/services/utils.js

@@ -400,7 +400,8 @@ export default {
     return path || '';
   },
   // 根据当前绝对路径 与 文件路径计算出文件绝对路径
-  getAbsoluteFilePath(currDirNode, filePath) {
+  getAbsoluteFilePath(currDirNode, originFilePath) {
+    const filePath = originFilePath && originFilePath.replaceAll('\\', '/');
     const currAbsolutePath = this.getAbsoluteDir(currDirNode);
     // "/"开头说明已经是绝对路径
     if (filePath.indexOf('/') === 0) {

src/store/discussion.js

@@ -1,5 +1,6 @@
 import utils from '../services/utils';
 import giteeHelper from '../services/providers/helpers/giteeHelper';
+import githubHelper from '../services/providers/helpers/githubHelper';
 import syncSvc from '../services/syncSvc';
 
 const idShifter = offset => (state, getters) => {
@@ -136,8 +137,13 @@ export default {
       const loginToken = rootGetters['workspace/loginToken'];
       if (!loginToken) {
         try {
-          await dispatch('modal/open', 'signInForComment', { root: true });
-          await giteeHelper.signin();
+          const signInWhere = await dispatch('modal/open', 'signInForComment', { root: true });
+          if (signInWhere === 'github') {
+            await githubHelper.signin();
+          } else {
+            await giteeHelper.signin();
+          }
+          await syncSvc.afterSignIn();
           syncSvc.requestSync();
           await dispatch('createNewDiscussion', selection);
         } catch (e) { /* cancel */ }

src/store/workspace.js

@@ -22,7 +22,7 @@ export default {
       Object.entries(rootGetters['data/workspaces']).forEach(([id, workspace]) => {
         const sanitizedWorkspace = {
           id,
-          providerId: 'giteeAppData',
+          providerId: (mainWorkspaceToken && mainWorkspaceToken.providerId) || 'giteeAppData',
           sub: mainWorkspaceToken && mainWorkspaceToken.sub,
           ...workspace,
         };
@@ -47,17 +47,19 @@ export default {
       || currentWorkspace.providerId === 'giteeWorkspace'
       || currentWorkspace.providerId === 'gitlabWorkspace'
       || currentWorkspace.providerId === 'giteaWorkspace'
-      || currentWorkspace.providerId === 'giteeAppData',
+      || currentWorkspace.providerId === 'giteeAppData'
+      || currentWorkspace.providerId === 'githubAppData',
     currentWorkspaceHasUniquePaths: (state, { currentWorkspace }) =>
       currentWorkspace.providerId === 'githubWorkspace'
       || currentWorkspace.providerId === 'giteeWorkspace'
       || currentWorkspace.providerId === 'gitlabWorkspace'
       || currentWorkspace.providerId === 'giteaWorkspace'
-      || currentWorkspace.providerId === 'giteeAppData',
+      || currentWorkspace.providerId === 'giteeAppData'
+      || currentWorkspace.providerId === 'githubAppData',
     lastSyncActivityKey: (state, { currentWorkspace }) => `${currentWorkspace.id}/lastSyncActivity`,
     lastFocusKey: (state, { currentWorkspace }) => `${currentWorkspace.id}/lastWindowFocus`,
     mainWorkspaceToken: (state, getters, rootState, rootGetters) =>
-      utils.someResult(Object.values(rootGetters['data/giteeTokensBySub']), (token) => {
+      utils.someResult([...Object.values(rootGetters['data/giteeTokensBySub']), ...Object.values(rootGetters['data/githubTokensBySub'])], (token) => {
         if (token.isLogin) {
           return token;
         }
@@ -85,8 +87,10 @@ export default {
       switch (currentWorkspace.providerId) {
         case 'googleDriveWorkspace':
           return 'google';
+        case 'githubAppData':
         case 'githubWorkspace':
           return 'github';
+        case 'giteeAppData':
         case 'giteeWorkspace':
         default:
           return 'gitee';

static/landing/gistshare.html

@@ -0,0 +1,169 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title>文章分享 - Markdown编辑器</title>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="canonical" href="https://md.jonylee.top/">
+    <link rel="icon" href="static/landing/favicon.ico" type="image/x-icon">
+    <link rel="shortcut icon" href="static/landing/favicon.ico" type="image/x-icon">
+    <meta charset="UTF-8">
+    <meta name="keywords" content="Markdown编辑器,StackEdit中文版,StackEdit汉化版,StackEdit,在线Markdown,笔记利器,Markdown笔记">
+    <meta name="description" content="支持直接将码云（Gitee）、GitHub、Gitea等仓库作为笔记存储仓库且支持拖拽/粘贴上传图片，并且可以直接在页面编辑同步和管理的Markdown编辑器。">
+    <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1">
+    <meta name="baidu-site-verification" content="code-tGpn2BT069" />
+    <meta name="msvalidate.01" content="90A9558158543277BD284CFA054E7F5B" />
+    <link rel="stylesheet" href="style.css">
+    <style>
+        .share-header {
+            position: fixed;
+            top: 0;
+            left: 0;
+            width: 100%;
+            background-color: #383c4a;
+            color: #fff;
+            padding: 10px;
+            box-sizing: border-box;
+            z-index: 99999;
+        }
+        
+        .share-header .logo {
+            margin: 0 0 -8px 0;
+        }
+        
+        .share-header nav {
+            display: flex;
+            flex-direction: row;
+            justify-content: space-between;
+            align-items: center;
+        }
+        
+        .share-header nav ul {
+            list-style-type: none;
+            margin: 0;
+            padding: 0;
+            display: flex;
+            flex-direction: row;
+        }
+        
+        .share-header nav li {
+            margin: 0 10px;
+        }
+        
+        .share-header nav a {
+            color: #fff;
+            text-decoration: none;
+        }
+        
+        .share-header nav a:hover {
+            text-decoration: underline;
+        }
+        
+        .share-content {
+            transform: translateY(50px);
+            height: 100vh;
+        }
+    </style>
+    <script type="text/javascript">
+        function getQueryString(name) {
+            var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
+            var r = window.location.search.substr(1).match(reg);
+            if (r != null) {
+                return unescape(r[2]);
+            }
+            return null;
+        }
+
+        function appendTagHtml(newdoc, tagName, targetParentEle) {
+            const tags = newdoc.getElementsByTagName(tagName);
+            if (!tags) {
+                return;
+            }
+            for (let i = 0; i < tags.length; i++) {
+                targetParentEle.append(tags[i]);
+            }
+        }
+
+        window.onload = function() {
+            const xhr = new XMLHttpRequest();
+            const gistId = getQueryString('id');
+            let accessToken = null;
+            const tokens = window.localStorage.getItem('data/tokens');
+            if (tokens) {
+                const tokensObj = JSON.parse(tokens);
+                if (tokensObj.data && tokensObj.data.github) {
+                    const tokenArr = Object.keys(tokensObj.data.github).map(it => tokensObj.data.github[it]).filter(it => it && it.isLogin);
+                    if (tokenArr.length > 0) {
+                        accessToken = tokenArr[0].accessToken;
+                    }
+                }
+            }
+            const url = `https://api.github.com/gists/${gistId}`;
+            xhr.open('GET', url);
+            if (accessToken) {
+                xhr.setRequestHeader('Authorization', `Bearer ${accessToken}`);
+            }
+            xhr.onload = function() {
+                if (xhr.status === 200) {
+                    const newdoc = document.implementation.createHTMLDocument("");
+                    const body = JSON.parse(xhr.responseText);
+                    for (let key in body.files) {
+                        newdoc.documentElement.innerHTML = body.files[key].content;
+                    }
+                    const currHead = document.head;
+                    // head
+                    appendTagHtml(newdoc, 'style', currHead);
+                    // title
+                    document.title = newdoc.title + ' - StackEdit中文版';
+                    // 内容
+                    const shareContent = document.getElementsByClassName('share-content')[0];
+                    shareContent.innerHTML = newdoc.body.innerHTML;
+                    document.body.className = newdoc.body.className;
+                } else if (xhr.status === 403) {
+                    const rateLimit = xhr.responseText && xhr.responseText.indexOf('Rate Limit') >= 0;
+                    const appUri = `${window.location.protocol}//${window.location.host}/app`;
+                    document.getElementById('div_info').innerHTML = `${rateLimit ? "请求太过频繁" : "无权限访问"}，请使用GitHub登录 <a href="${appUri}" target="_brank">主文档空间</a> 后再刷新此页面!`;
+                } else {
+                    console.error('An error occurred: ' + xhr.status);
+                    document.getElementById('div_info').innerHTML = `分享内容获取失败或已失效！请使用GitHub登录 <a href="${appUri}" target="_brank">主文档空间</a> 后再刷新此页面!`;
+                }
+            };
+            xhr.send();
+        }
+    </script>
+</head>
+
+<body>
+    <div class="share-header">
+        <nav>
+            <a class="logo" href="https://md.jonylee.top" target="_blank">
+                <img src="static/landing/logo.svg" height="30px" />
+            </a>
+            <ul>
+                <li><a href="https://md.jonylee.top" target="_blank">首页</a></li>
+                <li><a href="https://md.jonylee.top/app" target="_blank">写笔记</a></li>
+            </ul>
+        </nav>
+    </div>
+    <div class="share-content stackedit">
+        <div id="div_info" style="text-align: center; height: 600px;">文章加载中......</div>
+    </div>
+
+    <script src="https://code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
+
+    <!-- built files will be auto injected -->
+    <!-- baidu统计-->
+    <script>
+        var _hmt = _hmt || [];
+        (function() {
+            var hm = document.createElement("script");
+            hm.src = "https://hm.baidu.com/hm.js?dad4b4383b13eedea1ab45ee323df1c3";
+            var s = document.getElementsByTagName("script")[0];
+            s.parentNode.insertBefore(hm, s);
+        })();
+    </script>
+    <!-- baidu统计结束-->
+</body>
+
+</html>

static/landing/index.html

@@ -2,14 +2,13 @@
 <html manifest="cache.manifest">
 
 <head>
-    <title>StackEdit中文版 – 浏览器内 Markdown 编辑器</title>
-    <link rel="canonical" href="https://stackedit.cn/">
+    <title>Markdown编辑器-JonyLee的设计导航</title>
+    <link rel="canonical" href="https://md.jonylee.top/">
     <link rel="icon" href="static/landing/favicon.ico" type="image/x-icon">
     <link rel="shortcut icon" href="static/landing/favicon.ico" type="image/x-icon">
     <meta charset="UTF-8">
     <meta name="keywords" content="Markdown编辑器,StackEdit中文版,StackEdit汉化版,StackEdit,在线Markdown,笔记利器,Markdown笔记">
-    <meta name="description"
-          content="支持直接将码云（Gitee）、GitHub、Gitea等仓库作为笔记存储仓库且支持拖拽/粘贴上传图片，并且可以直接在页面编辑同步和管理的Markdown编辑器。">
+    <meta name="description" content="支持直接将码云（Gitee）、GitHub、Gitea等仓库作为笔记存储仓库且支持拖拽/粘贴上传图片，并且可以直接在页面编辑同步和管理的Markdown编辑器。">
     <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1">
     <meta name="baidu-site-verification" content="code-tGpn2BT069" />
     <meta name="msvalidate.01" content="90A9558158543277BD284CFA054E7F5B" />
@@ -18,22 +17,22 @@
         body {
             background-color: #fbfbfb;
         }
-
+        
         * {
             box-sizing: border-box;
         }
-
+        
         h1 {
             font-weight: 400;
             text-align: center;
             font-size: 2.5em;
             margin: 2.5em 0;
         }
-
+        
         h3 {
             margin: 1em 0;
         }
-
+        
         .button {
             color: #555;
             font-size: 20px;
@@ -61,7 +60,7 @@
             border-radius: 2px;
             text-decoration: none;
         }
-
+        
         .button:active,
         .button:focus,
         .button:hover {
@@ -70,46 +69,46 @@
             outline: 0;
             text-decoration: none;
         }
-
+        
         .icon {
             width: 100%;
             height: 100%;
             display: inline;
         }
-
+        
         .icon * {
             fill: currentColor;
         }
-
+        
         .button .icon {
             height: 30px;
             width: 30px;
             margin: -6px 6px -6px 0;
         }
-
+        
         .row {
             margin: 8em 0;
         }
-
+        
         .row::after {
             display: block;
             content: '';
             clear: both;
         }
-
+        
         @media (min-width: 700px) {
             .column {
                 width: 50%;
                 float: right;
             }
         }
-
+        
         .landing {
             position: absolute;
             width: 100%;
             height: 100%;
         }
-
+        
         .landing__content {
             margin-left: auto;
             margin-right: auto;
@@ -117,7 +116,7 @@
             padding-right: 30px;
             max-width: 1000px;
         }
-
+        
         .landing__footer {
             padding: 1em 0;
             text-align: center;
@@ -125,11 +124,11 @@
             color: rgba(255, 255, 255, 0.75);
             font-size: 0.9em;
         }
-
+        
         .landing__footer a {
             color: #fff;
         }
-
+        
         .navigation-bar {
             background-color: #2c2c2c;
             position: fixed;
@@ -138,25 +137,25 @@
             width: 100%;
             z-index: 1;
         }
-
+        
         .navigation-bar__button {
             color: #b9b9b9;
         }
-
+        
         .navigation-bar__button:active,
         .navigation-bar__button:focus,
         .navigation-bar__button:hover {
             color: #fff;
             background-color: rgba(255, 255, 255, 0.1);
         }
-
+        
         .splash-screen {
             position: relative;
             width: 100%;
             height: 100%;
             padding: 25px;
         }
-
+        
         .splash-screen__logo {
             width: 300px;
             height: 150px;
@@ -169,14 +168,14 @@
             background: no-repeat center url('static/landing/logo.svg');
             background-size: contain;
         }
-
+        
         @media (min-width: 700px) {
             .splash-screen__logo {
                 width: 600px;
                 height: 160px;
             }
         }
-
+        
         .splash-screen__subtitle {
             position: absolute;
             text-align: center;
@@ -185,7 +184,7 @@
             right: 5px;
             font-size: 16px;
         }
-
+        
         @media (min-width: 700px) {
             .splash-screen__subtitle {
                 text-align: right;
@@ -193,7 +192,7 @@
                 font-size: 22px;
             }
         }
-
+        
         .splash-screen__footer {
             position: absolute;
             bottom: 25px;
@@ -201,43 +200,42 @@
             width: 100%;
             text-align: center;
         }
-
+        
         .splash-screen__footer .button {
             padding: 10px 20px;
         }
-
+        
         .social {
             margin: 0 5px;
         }
-
+        
         .social a {
             color: #555;
             text-decoration: none;
         }
-
+        
         .social a:active,
         .social a:focus,
         .social a:hover {
             color: #333;
             outline: 0;
         }
-
+        
         .landing__footer .social a {
             color: rgba(255, 255, 255, 0.85);
         }
-
+        
         .landing__footer .social a:active,
         .landing__footer .social a:focus,
         .landing__footer .social a:hover {
             color: #fff;
         }
-
-
+        
         .social .icon {
             height: 30px;
             width: 30px;
         }
-
+        
         .feature {
             padding: 5px 5px;
             border-radius: 2px;
@@ -245,7 +243,7 @@
             margin: 1em auto;
             text-align: center;
         }
-
+        
         .image {
             display: block;
             margin: 1em auto;
@@ -253,7 +251,7 @@
             border-radius: 2px;
             background-color: #fff;
         }
-
+        
         .image img {
             display: block;
             margin: 0.5em auto;
@@ -261,7 +259,9 @@
     </style>
     <script>
         function scrollTo(selector) {
-            $('html,body').animate({scrollTop: $(selector).offset().top}, 500);
+            $('html,body').animate({
+                scrollTop: $(selector).offset().top
+            }, 500);
         }
     </script>
 </head>
@@ -270,34 +270,18 @@
     <div class="landing">
         <div class="navigation-bar">
             <a class="navigation-bar__button button" href="app" title="The app">
-                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon"><path d="M 16.8363,2.73375C 16.45,2.73375 16.0688,2.88125 15.7712,3.17375L 13.6525,5.2925L 18.955,10.5962L 21.0737,8.47625C 21.665,7.89 21.665,6.94375 21.0737,6.3575L 17.895,3.17375C 17.6025,2.88125 17.2163,2.73375 16.8363,2.73375 Z M 12.9437,6.00125L 4.84375,14.1062L 7.4025,14.39L 7.57875,16.675L 9.85875,16.85L 10.1462,19.4088L 18.2475,11.3038M 4.2475,15.0437L 2.515,21.7337L 9.19875,19.9412L 8.955,17.7838L 6.645,17.6075L 6.465,15.2925"></path></svg>
-                开始写作
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon"><path d="M 16.8363,2.73375C 16.45,2.73375 16.0688,2.88125 15.7712,3.17375L 13.6525,5.2925L 18.955,10.5962L 21.0737,8.47625C 21.665,7.89 21.665,6.94375 21.0737,6.3575L 17.895,3.17375C 17.6025,2.88125 17.2163,2.73375 16.8363,2.73375 Z M 12.9437,6.00125L 4.84375,14.1062L 7.4025,14.39L 7.57875,16.675L 9.85875,16.85L 10.1462,19.4088L 18.2475,11.3038M 4.2475,15.0437L 2.515,21.7337L 9.19875,19.9412L 8.955,17.7838L 6.645,17.6075L 6.465,15.2925"></path></svg>                开始写作
             </a>
         </div>
         <div class="splash-screen">
             <div class="splash-screen__logo">
                 <div class="splash-screen__subtitle">
-                    笔记利器(浏览器内 Markdown 编辑器)
-
-                    <div class="social">
-                        <a href="https://jq.qq.com/?_wv=1027&k=wUSCNqmN" target="_blank" title="QQ交流群">
-                            <svg t="1665396466500" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3543" width="32" height="32">
-                                <path d="M512 0C229.12 0 0 229.12 0 512c0 282.88 229.12 512 512 512s512-229.12 512-512C1024 229.12 794.88 0 512 0zM782.08 670.72c-11.52 6.4-30.72-7.68-48.64-34.56-6.4 28.16-24.32 53.76-48.64 74.24 25.6 8.96 42.24 25.6 42.24 42.24 0 29.44-46.08 52.48-102.4 52.48-51.2 0-93.44-19.2-101.12-43.52-2.56 0-10.24 0-12.8 0-7.68 24.32-49.92 43.52-101.12 43.52-56.32 0-102.4-23.04-102.4-52.48 0-17.92 16.64-33.28 42.24-42.24-24.32-20.48-42.24-46.08-48.64-74.24-17.92 25.6-37.12 39.68-48.64 34.56-17.92-8.96-14.08-57.6 7.68-107.52 16.64-39.68 39.68-69.12 57.6-75.52 0-2.56 0-5.12 0-7.68 0-15.36 3.84-29.44 11.52-40.96 0-1.28 0-1.28 0-2.56 0-7.68 1.28-14.08 5.12-19.2C340.48 312.32 408.32 230.4 518.4 230.4c110.08 0 177.92 81.92 183.04 185.6 2.56 5.12 5.12 12.8 5.12 19.2 0 1.28 0 1.28 0 2.56 7.68 11.52 11.52 25.6 11.52 40.96 0 2.56 0 5.12 0 7.68 17.92 6.4 40.96 35.84 57.6 75.52C796.16 613.12 800 661.76 782.08 670.72z" p-id="3544"></path>
-                            </svg>
-                        </a>
-                        <a href="https://gitee.com/mafgwo/stackedit" target="_blank" title="码云开源仓库">
-                            <svg t="1652950823759" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2991" width="32" height="32" xmlns:xlink="http://www.w3.org/1999/xlink">
-                                <defs><style type="text/css"></style></defs>
-                                <path d="M512 1024C229.222 1024 0 794.778 0 512S229.222 0 512 0s512 229.222 512 512-229.222 512-512 512z m259.149-568.883h-290.74a25.293 25.293 0 0 0-25.292 25.293l-0.026 63.206c0 13.952 11.315 25.293 25.267 25.293h177.024c13.978 0 25.293 11.315 25.293 25.267v12.646a75.853 75.853 0 0 1-75.853 75.853h-240.23a25.293 25.293 0 0 1-25.267-25.293V417.203a75.853 75.853 0 0 1 75.827-75.853h353.946a25.293 25.293 0 0 0 25.267-25.292l0.077-63.207a25.293 25.293 0 0 0-25.268-25.293H417.152a189.62 189.62 0 0 0-189.62 189.645V771.15c0 13.977 11.316 25.293 25.294 25.293h372.94a170.65 170.65 0 0 0 170.65-170.65V480.384a25.293 25.293 0 0 0-25.293-25.267z" fill="#C71D23" p-id="2992"></path>
-                            </svg>
-                        </a>
-                    </div>
+                    浏览器内 Markdown 笔记利器
                 </div>
             </div>
             <div class="splash-screen__footer">
                 <a class="button" href="javascript:scrollTo($('.anchor'))">
-                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon"><path d="M 11,4L 13,4L 13,16.0104L 18.5052,10.5052L 19.9194,11.9194L 12,19.8388L 4.08058,11.9194L 5.49479,10.5052L 11,16.0104L 11,4 Z "/></path></svg>
-                    阅读更多
+                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon"><path d="M 11,4L 13,4L 13,16.0104L 18.5052,10.5052L 19.9194,11.9194L 12,19.8388L 4.08058,11.9194L 5.49479,10.5052L 11,16.0104L 11,4 Z "/></path></svg> 阅读更多
                 </a>
             </div>
         </div>
@@ -432,31 +416,24 @@
                 </div>
             </div>
             <div class="row">
-              <div class="column">
-                <div class="image" style="width: 250px">
-                  <img width="230" src="static/landing/twemoji.png">
+                <div class="column">
+                    <div class="image" style="width: 250px">
+                        <img width="230" src="static/landing/twemoji.png">
+                    </div>
                 </div>
-              </div>
-              <div class="column">
-                <div class="feature">
-                  <h3>Emojis表情</h3>
-                  <p>StackEdit中文版 支持使用 Markdown 表情符号标记在文件中插入表情符号。</p>
+                <div class="column">
+                    <div class="feature">
+                        <h3>Emojis表情</h3>
+                        <p>StackEdit中文版 支持使用 Markdown 表情符号标记在文件中插入表情符号。</p>
+                    </div>
                 </div>
-              </div>
             </div>
         </div>
         <div class="landing__footer">
-            <div class="social">
-                <a href="https://gitee.com/mafgwo/stackedit" target="_blank">
-                    <svg t="1652950823759" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2991" width="32" height="32" xmlns:xlink="http://www.w3.org/1999/xlink">
-                        <defs><style type="text/css"></style></defs>
-                        <path d="M512 1024C229.222 1024 0 794.778 0 512S229.222 0 512 0s512 229.222 512 512-229.222 512-512 512z m259.149-568.883h-290.74a25.293 25.293 0 0 0-25.292 25.293l-0.026 63.206c0 13.952 11.315 25.293 25.267 25.293h177.024c13.978 0 25.293 11.315 25.293 25.267v12.646a75.853 75.853 0 0 1-75.853 75.853h-240.23a25.293 25.293 0 0 1-25.267-25.293V417.203a75.853 75.853 0 0 1 75.827-75.853h353.946a25.293 25.293 0 0 0 25.267-25.292l0.077-63.207a25.293 25.293 0 0 0-25.268-25.293H417.152a189.62 189.62 0 0 0-189.62 189.645V771.15c0 13.977 11.316 25.293 25.294 25.293h372.94a170.65 170.65 0 0 0 170.65-170.65V480.384a25.293 25.293 0 0 0-25.293-25.267z" fill="#C71D23" p-id="2992"></path>
-                    </svg>
-                </a>
-            </div>
-            <a href="app" title="The app">The app</a> – <a href="https://gitee.com/mafgwo/stackedit/issues" target="_blank" title="The app">Community</a><br>
-            © 2022 <a href="https://gitee.com/mafgwo" target="_blank">豆萁</a> <a href="https://beian.miit.gov.cn/" target="_blank">粤ICP备18096694号</a><br>
-            Licensed under an
+            <a href="app" title="Markdown编辑器">Markdown编辑器</a> – <a href="https://gitee.com/mafgwo" target="_blank" title="豆萁">代码作者</a><br> Copyright&nbsp;&copy;
+            <script>
+                document.write((new Date()).getFullYear())
+            </script>&nbsp;<a href="https://jonylee.top">JonyLee</a>&nbsp;&amp;&nbsp;<a href="https://beian.miit.gov.cn/" target="_blank">沪ICP备2023021298号-1</a><br> 开源许可
             <a target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License</a> –
             <a href="privacy_policy.html" target="_blank">隐私策略</a>
         </div>
@@ -464,15 +441,17 @@
     <script src="https://code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
 
     <!-- built files will be auto injected -->
+    <!-- baidu统计-->
     <script>
         var _hmt = _hmt || [];
         (function() {
-          var hm = document.createElement("script");
-          hm.src = "https://hm.baidu.com/hm.js?20a1e7a201b42702c49074c87a1f1035";
-          var s = document.getElementsByTagName("script")[0]; 
-          s.parentNode.insertBefore(hm, s);
+            var hm = document.createElement("script");
+            hm.src = "https://hm.baidu.com/hm.js?dad4b4383b13eedea1ab45ee323df1c3";
+            var s = document.getElementsByTagName("script")[0];
+            s.parentNode.insertBefore(hm, s);
         })();
     </script>
+    <!-- baidu统计结束-->
 </body>
 
-</html>
+</html>

static/landing/privacy_policy.html

@@ -1,90 +1,90 @@
 <!DOCTYPE html>
 <html lang="en">
- <head> 
-  <meta charset="utf-8" /> 
-  <meta name="format-detection" content="telephone=no" /> 
-  <meta name="msapplication-tap-highlight" content="no" /> 
-  <meta http-equiv="content-type" content="text/html;charset=utf-8" /> 
-  <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" /> 
-  <meta name="renderer" content="webkit" /> 
-  <meta name="viewport" id="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width" /> 
-  <title> 隐私权政策</title> 
-  <style>
-  html {
-	font-size: 14px;
-	color: #666;
-}
 
-* {
-	margin: 0;
-	padding: 0;
-}
+<head>
+    <meta charset="utf-8" />
+    <meta name="format-detection" content="telephone=no" />
+    <meta name="msapplication-tap-highlight" content="no" />
+    <meta http-equiv="content-type" content="text/html;charset=utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
+    <meta name="renderer" content="webkit" />
+    <meta name="viewport" id="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width" />
+    <title> 隐私权政策</title>
+    <style>
+        html {
+            font-size: 14px;
+            color: #666;
+        }
+        
+        * {
+            margin: 0;
+            padding: 0;
+        }
+        
+        .title {
+            padding: 10px;
+            font-size: 16px;
+            color: #333;
+            text-align: center;
+        }
+        
+        .date-text {
+            text-align: right;
+            padding-right: 20px;
+            color: #333;
+            padding-bottom: 6px;
+        }
+        
+        body {
+            padding: 10px 10px 20px;
+        }
+        
+        .main-text {
+            padding: 10px 0;
+            text-indent: 20px;
+            color: #333;
+            font-size: 16px;
+        }
+        
+        .content {
+            text-indent: 20px;
+            line-height: 22px;
+        }
+    </style>
+</head>
 
-.title {
-	padding: 10px;
-	font-size: 16px;
-	color: #333;
-	text-align: center;
-}
+<body>
+    <h3 class="title"> 隐私权政策 </h3>
+    <div class="content">
+        【Markdown编辑器】（以下简称“本站”）深知个人信息对您的重要性， 故不会特意收集个人信息。
+    </div>
+    <div class="content">
+        请在使用本产品（或服务）前，仔细阅读并了解本《隐私权政策》。
+    </div>
+    <div class="main-text">
+        一、关于您的文件信息
+    </div>
+    <div class="content">
+        个人文档都是存储在第三方，本站对所有第三方的文件都是在您授权之后，通过您的浏览器直接访问，并不会在本站后端获取和保存您的任何个人文件信息。
+    </div>
+    <div class="main-text">
+        二、关于您的用户信息
+    </div>
+    <div class="content">
+        本站不存在注册行为，待您授权后，您在第三方平台上个人信息的获取仅仅是在您的浏览器中直接获取，并不会在本站后端获取和保存您的个人信息。
+    </div>
+    <div class="main-text">
+        三、其他
+    </div>
+    <div class="content">
+        本站可能会更新本隐私政策，以反映本站的业务需求和适用法律的变化。在更新隐私政策时，我会通过此网站或其他合适的方式通知您。如果您继续使用本站的服务，则意味着您同意更新后的隐私政策。
+    </div>
+    <div class="main-text">
+        四、如何联系我
+    </div>
+    <div class="content">
+        如果您对本隐私政策有任何疑问、意见或建议，可通过<a href="https://jonylee.top" target="_blank" title="个人主页-JonyLee的设计导航">个人主页</a>联系方式与我联系：
+    </div>
+</body>
 
-.date-text {
-	text-align: right;
-	padding-right: 20px;
-	color: #333;
-	padding-bottom: 6px;
-}
-
-body {
-	padding: 10px 10px 20px;
-}
-
-.main-text {
-	padding: 10px 0;
-	text-indent: 20px;
-	color: #333;
-	font-size: 16px;
-}
-
-.content {
-	text-indent: 20px;
-	line-height: 22px;
-}
-  </style>
- </head>  
- <body> 
-  <h3 class="title"> 隐私权政策 </h3> 
-  <div class="content">
-    【StackEdit中文版】（以下简称“此站”）深知个人信息对您的重要性， 故不会特意收集个人信息。 
-  </div> 
-  <div class="content">
-    请在使用我们的产品（或服务）前，仔细阅读并了解本《隐私权政策》。 
-  </div> 
-  <div class="main-text">
-    一、我们不会收集个人文档信息
-  </div> 
-  <div class="content">
-   个人文档都是存储在第三方，此站仅仅是通过前端缓存的token来获取或保存文档到第三方，并不会在本站后端保存用户的任何文档信息。
-  </div> 
-  <div class="main-text">
-   二、我们不会收集个人第三方的Token或用户信息
-  </div> 
-  <div class="content">
-    本站不存在注册行为，不会收集个人信息，但是为了正常从第三方把Markdown文档读取或写入，有时需要借助本站后端获取第三方网站Token信息再返回给前端，但是本站承诺绝不会收集个人第三方网站的Token信息，只会在后端获取到之后返回给本站前端供前端使用。
-  </div> 
-  <div class="main-text">
-   三、如何联系我们 
-  </div> 
-  <div class="content">
-   如果您对本隐私政策有任何疑问、意见或建议，通过以下方式与我们联系：
-  </div> 
-  <div class="content">
-   邮箱：【mafgwo@163.com】
-  </div> 
-  <div class="content">
-   微信：【qicoding】
-  </div> 
-  <div class="content">
-   一般情况下，我们将在一周内回复。
-  </div>   
- </body>
 </html>

static/landing/share.html

@@ -1,165 +1,181 @@
 <!DOCTYPE html>
 <html>
+
 <head>
-	<title>StackEdit中文版</title>
-	<meta charset="UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="canonical" href="https://stackedit.cn/">
+    <title>文章分享 - Markdown编辑器</title>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="canonical" href="https://md.jonylee.top/">
     <link rel="icon" href="static/landing/favicon.ico" type="image/x-icon">
     <link rel="shortcut icon" href="static/landing/favicon.ico" type="image/x-icon">
     <meta charset="UTF-8">
     <meta name="keywords" content="Markdown编辑器,StackEdit中文版,StackEdit汉化版,StackEdit,在线Markdown,笔记利器,Markdown笔记">
-    <meta name="description"
-          content="支持直接将码云（Gitee）、GitHub、Gitea等仓库作为笔记存储仓库且支持拖拽/粘贴上传图片，并且可以直接在页面编辑同步和管理的Markdown编辑器。">
+    <meta name="description" content="支持直接将码云（Gitee）、GitHub、Gitea等仓库作为笔记存储仓库且支持拖拽/粘贴上传图片，并且可以直接在页面编辑同步和管理的Markdown编辑器。">
     <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1">
     <meta name="baidu-site-verification" content="code-tGpn2BT069" />
     <meta name="msvalidate.01" content="90A9558158543277BD284CFA054E7F5B" />
     <link rel="stylesheet" href="style.css">
-	<style>
-		.share-header {
-			position: fixed;
-			top: 0;
-			left: 0;
-			width: 100%;
-			background-color: #383c4a;
-			color: #fff;
-			padding: 10px;
-			box-sizing: border-box;
+    <style>
+        .share-header {
+            position: fixed;
+            top: 0;
+            left: 0;
+            width: 100%;
+            background-color: #383c4a;
+            color: #fff;
+            padding: 10px;
+            box-sizing: border-box;
             z-index: 99999;
-		}
-
-		.share-header .logo {
-			margin: 0 0 -8px 0;
-		}
-
-		.share-header nav {
-			display: flex;
-			flex-direction: row;
-			justify-content: space-between;
-			align-items: center;
-		}
-
-		.share-header nav ul {
-			list-style-type: none;
-			margin: 0;
-			padding: 0;
-			display: flex;
-			flex-direction: row;
-		}
-
-		.share-header nav li {
-			margin: 0 10px;
-		}
-
-		.share-header nav a {
-			color: #fff;
-			text-decoration: none;
-		}
-
-		.share-header nav a:hover {
-			text-decoration: underline;
-		}
-
-		.share-content {
-			margin-top: 60px;
-		}
-	</style>
+        }
+        
+        .share-header .logo {
+            margin: 0 0 -8px 0;
+        }
+        
+        .share-header nav {
+            display: flex;
+            flex-direction: row;
+            justify-content: space-between;
+            align-items: center;
+        }
+        
+        .share-header nav ul {
+            list-style-type: none;
+            margin: 0;
+            padding: 0;
+            display: flex;
+            flex-direction: row;
+        }
+        
+        .share-header nav li {
+            margin: 0 10px;
+        }
+        
+        .share-header nav a {
+            color: #fff;
+            text-decoration: none;
+        }
+        
+        .share-header nav a:hover {
+            text-decoration: underline;
+        }
+        
+        .share-content {
+            transform: translateY(50px);
+            height: 100vh;
+        }
+    </style>
     <script type="text/javascript">
-    function getQueryString(name) {
-        var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
-        var r = window.location.search.substr(1).match(reg);
-        if (r != null) {
-            return unescape(r[2]);
+        function getQueryString(name) {
+            var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
+            var r = window.location.search.substr(1).match(reg);
+            if (r != null) {
+                return unescape(r[2]);
+            }
+            return null;
         }
-        return null;
-     }
 
-    function appendTagHtml(newdoc, tagName, targetParentEle) {
-        const tags = newdoc.getElementsByTagName(tagName);
-        if (!tags) {
-            return;
-        }
-        for (let i = 0; i < tags.length; i++) {
-            targetParentEle.append(tags[i]);
-        }
-    }
-
-    window.onload = function() {
-        const xhr = new XMLHttpRequest();
-        const gistId = getQueryString('id');
-        const workspaces = window.localStorage.getItem('data/workspaces');
-        let accessToken = null;
-        if (workspaces) {
-            const workspacesObj = JSON.parse(workspaces);
-            const sub = workspacesObj.data && workspacesObj.data.main && workspacesObj.data.main.sub;
-            if (sub) {
-                const tokens = window.localStorage.getItem('data/tokens');
-                if (tokens) {
-                    const tokensObj = JSON.parse(tokens);
-                    accessToken = tokensObj.data && tokensObj.data.gitee && tokensObj.data.gitee[sub] && tokensObj.data.gitee[sub].accessToken;
-                }
+        function appendTagHtml(newdoc, tagName, targetParentEle) {
+            const tags = newdoc.getElementsByTagName(tagName);
+            if (!tags) {
+                return;
+            }
+            for (let i = 0; i < tags.length; i++) {
+                targetParentEle.append(tags[i]);
             }
         }
-        let url = `https://gitee.com/api/v5/gists/${gistId}`;
-        if (accessToken) {
-            url = `${url}?access_token=${accessToken}`;
-        }
-        xhr.open('GET', url);
-        xhr.onload = function() {
-            if (xhr.status === 200) {
-                const newdoc = document.implementation.createHTMLDocument("");
-                const body = JSON.parse(xhr.responseText);
-                for (let key in body.files) {
-                    newdoc.documentElement.innerHTML = body.files[key].content;
+
+        window.onload = function() {
+            const xhr = new XMLHttpRequest();
+            const gistId = getQueryString('id');
+            let accessToken = null;
+            const tokens = window.localStorage.getItem('data/tokens');
+            if (tokens) {
+                const tokensObj = JSON.parse(tokens);
+                if (tokensObj.data && tokensObj.data.gitee) {
+                    const tokenArr = Object.keys(tokensObj.data.gitee).map(it => tokensObj.data.gitee[it]).filter(it => it && it.isLogin);
+                    if (tokenArr.length > 0) {
+                        accessToken = tokenArr[0].accessToken;
+                    }
                 }
-                const currHead = document.head;
-                // 头部
-                appendTagHtml(newdoc, 'style', currHead);
-                // title
-                document.title = newdoc.title + ' - StackEdit中文版';
-                // 内容
-                const shareContent = document.getElementsByClassName('share-content')[0];
-                shareContent.innerHTML = newdoc.body.innerHTML;
-            } else if (xhr.status === 403) {
-                const rateLimit = xhr.responseText && xhr.responseText.indexOf('Rate Limit') >= 0;
-                const appUri = `${window.location.protocol}//${window.location.host}/app`;
-                document.getElementsByClassName('share-content')[0].innerHTML = `${rateLimit ? "请求太过频繁" : "无权限访问"}，请登录 <a href="${appUri}" target="_brank">主文档空间</a> 后再刷新此页面!`;
-            } else {
-                console.error('An error occurred: ' + xhr.status);
-                document.getElementsByClassName('share-content')[0].innerHTML = '分享内容获取失败或已失效!';
             }
-        };
-        xhr.send();
-     }
-     </script>
+            const url = `https://gitee.com/api/v5/gists/${gistId}`;
+            let urlWithToken = url;
+            let withToken = false;
+            if (accessToken) {
+                urlWithToken = `${url}?access_token=${accessToken}`;
+                withToken = true;
+            }
+            xhr.open('GET', urlWithToken);
+            xhr.onload = function() {
+                if (xhr.status === 200) {
+                    const newdoc = document.implementation.createHTMLDocument("");
+                    const body = JSON.parse(xhr.responseText);
+                    for (let key in body.files) {
+                        newdoc.documentElement.innerHTML = body.files[key].content;
+                    }
+                    const currHead = document.head;
+                    // 头部
+                    appendTagHtml(newdoc, 'style', currHead);
+                    // title
+                    document.title = newdoc.title + ' - StackEdit中文版';
+                    // 内容
+                    const shareContent = document.getElementsByClassName('share-content')[0];
+                    shareContent.innerHTML = newdoc.body.innerHTML;
+                    document.body.className = newdoc.body.className;
+                } else if (xhr.status === 403) {
+                    const rateLimit = xhr.responseText && xhr.responseText.indexOf('Rate Limit') >= 0;
+                    const appUri = `${window.location.protocol}//${window.location.host}/app`;
+                    document.getElementById('div_info').innerHTML = `${rateLimit ? "请求太过频繁" : "无权限访问"}，请登录 <a href="${appUri}" target="_brank">主文档空间</a> 后再刷新此页面!`;
+                } else if (xhr.status === 401) {
+                    if (withToken) {
+                        withToken = false;
+                        xhr.open('GET', url);
+                        xhr.send();
+                    } else {
+                        console.error('An error occurred: ' + xhr.status);
+                        document.getElementById('div_info').innerHTML = `分享内容获取失败或已失效！请登录 <a href="${appUri}" target="_brank">主文档空间</a> 后再刷新此页面!`;
+                    }
+                } else {
+                    console.error('An error occurred: ' + xhr.status);
+                    document.getElementById('div_info').innerHTML = `分享内容获取失败或已失效！请登录 <a href="${appUri}" target="_brank">主文档空间</a> 后再刷新此页面!`;
+                }
+            };
+            xhr.send();
+        }
+    </script>
 </head>
+
 <body>
-	<div class="share-header">
-		<nav>
-			<a class="logo" href="/" target="_blank">
-				<img src="static/landing/logo.svg" height="30px"/>
-			</a>
-			<ul>
-				<li><a href="/" target="_blank">首页</a></li>
-				<li><a href="app" target="_blank">写笔记</a></li>
-			</ul>
-		</nav>
-	</div>
-	<div class="share-content stackedit">
-		<div style="text-align: center; height: 600px;">文章加载中......</div>
-	</div>
+    <div class="share-header">
+        <nav>
+            <a class="logo" href="https://md.jonylee.top" target="_blank">
+                <img src="static/landing/logo.svg" height="30px" />
+            </a>
+            <ul>
+                <li><a href="https://md.jonylee.top" target="_blank">首页</a></li>
+                <li><a href="https://md.jonylee.top/app" target="_blank">写笔记</a></li>
+            </ul>
+        </nav>
+    </div>
+    <div class="share-content stackedit">
+        <div id="div_info" style="text-align: center; height: 600px;">文章加载中......</div>
+    </div>
 
     <script src="https://code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
 
     <!-- built files will be auto injected -->
+    <!-- baidu统计-->
     <script>
         var _hmt = _hmt || [];
         (function() {
             var hm = document.createElement("script");
-            hm.src = "https://hm.baidu.com/hm.js?20a1e7a201b42702c49074c87a1f1035";
-            var s = document.getElementsByTagName("script")[0]; 
+            hm.src = "https://hm.baidu.com/hm.js?dad4b4383b13eedea1ab45ee323df1c3";
+            var s = document.getElementsByTagName("script")[0];
             s.parentNode.insertBefore(hm, s);
         })();
     </script>
+    <!-- baidu统计结束-->
 </body>
-</html>
+
+</html>

static/sitemap.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
     <url>
-        <loc>https://stackedit.cn/</loc>
+        <loc>https://md.jonylee.top/</loc>
         <changefreq>weekly</changefreq>
         <priority>1.0</priority>
     </url>
     <url>
-        <loc>https://stackedit.cn/app</loc>
+        <loc>https://md.jonylee.top/app</loc>
         <changefreq>weekly</changefreq>
         <priority>1.0</priority>
     </url>
@@ -16,7 +16,7 @@
         <priority>0.8</priority>
     </url>
     <url>
-        <loc>https://stackedit.cn/privacy_policy.html</loc>
+        <loc>https://md.jonylee.top/privacy_policy.html</loc>
         <changefreq>monthly</changefreq>
         <priority>0.6</priority>
     </url>

static/themes/preview-theme-activeblue.js

@@ -36,7 +36,7 @@ style.innerHTML = "/** activeblue 灵动蓝\n \
  top: 0;\n \
  width: 60px;\n \
  height: 60px;\n \
- background: url(https://my-wechat.mdnice.com/ape_blue.svg);\n \
+ background: url(https://imgs.qicoder.com/stackedit/ape_blue.svg);\n \
  background-size: 100% 100%;\n \
  opacity: .12;\n \
 }\n \

static/themes/preview-theme-caoyuangreen.js

@@ -100,7 +100,7 @@ style.innerHTML = "/* 草原绿 caoyuangreen\n \
   width:30px;\n \
   height:30px;\n \
   display:block;\n \
-  background-image:url(https://files.mdnice.com/grass-green.png);\n \
+  background-image:url(https://imgs.qicoder.com/stackedit/grass-green.png);\n \
   background-position:center;\n \
   background-size:30px;\n \
   margin:auto;\n \
@@ -172,7 +172,7 @@ style.innerHTML = "/* 草原绿 caoyuangreen\n \
   padding-bottom: 25px;\n \
   border-left: none !important;\n \
   border: 1px solid #1b900d !important;\n \
-  background: #fff;\n \
+  background: #fff !important;\n \
 \n \
 }\n \
 \n \

static/themes/preview-theme-jikebrack.js

@@ -152,6 +152,7 @@ background: rgba(0, 0, 0, 0.05) !important;\n \
 \n \
 /* 引用文字 */\n \
 .preview-theme--jikebrack blockquote p {\n \
+margin: 0px;\n \
 font-size: 15px;\n \
 font-family: -apple-system-font, BlinkMacSystemFont, \"Helvetica Neue\", \"PingFang SC\", \"Hiragino Sans GB\", \"Microsoft YaHei UI\", \"Microsoft YaHei\", Arial, sans-serif;\n \
 color: rgb(119, 119, 119);\n \

static/themes/preview-theme-simplebrack.js

@@ -182,6 +182,7 @@ list-style-type: circle;\n \
 border-left: 3px solid rgba(0, 0, 0, 0.65) !important;\n \
 border-right: 1px solid rgba(0, 0, 0, 0.65) !important;\n \
 background: rgb(249, 249, 249) !important;\n \
+color: rgba(0,0,0,0.5) !important;\n \
 }\n \
 \n \
 /* 引用文字 */\n \