fix the method of getting tags

2026-04-24 19:48:37 +09:00 · 2024-06-13 17:07:19 +08:00
parent aa505c9fa6
commit 05a1f535fe
3 changed files with 272 additions and 231 deletions
@@ -85,5 +85,8 @@
   },
   "memoFailed":{
      "message": "Failed! 😭"
+   },
+   "invalidToken":{
+      "message": "Invalid token or url 😭"
   }
 }
@@ -88,5 +88,8 @@
   },
   "memoFailed":{
      "message": "发送失败 😭"
+   },
+   "invalidToken":{
+      "message": "无效的 token 或 url 😭"
   }
 }
@@ -11,6 +11,7 @@ function get_info(callback) {
      memo_lock: '',
      open_action: '',
      open_content: '',
+      userid: '',
      resourceIdList: []
    },
    function (items) {
@@ -32,6 +33,7 @@ function get_info(callback) {
      returnObject.memo_lock = items.memo_lock
      returnObject.open_content = items.open_content
      returnObject.open_action = items.open_action
+      returnObject.userid = items.userid
      returnObject.resourceIdList = items.resourceIdList

      if (callback) callback(returnObject)
@@ -45,17 +47,17 @@ get_info(function (info) {
    $('#blog_info').hide()
  }
  var memoNow = info.memo_lock
-  if(memoNow == ''){
+  if (memoNow == '') {
    chrome.storage.sync.set(
-      { memo_lock: 'PUBLIC'}
+      { memo_lock: 'PUBLIC' }
    )
    $("#lock-now").text(chrome.i18n.getMessage("lockPublic"))
  }
-  if(memoNow == "PUBLIC"){
+  if (memoNow == "PUBLIC") {
    $("#lock-now").text(chrome.i18n.getMessage("lockPublic"))
-  }else if(memoNow == "PRIVATE"){
+  } else if (memoNow == "PRIVATE") {
    $("#lock-now").text(chrome.i18n.getMessage("lockPrivate"))
-  }else if(memoNow == "PROTECTED"){
+  } else if (memoNow == "PROTECTED") {
    $("#lock-now").text(chrome.i18n.getMessage("lockProtected"))
  }
  $('#apiUrl').val(info.apiUrl)
@@ -126,7 +128,7 @@ function initDrag() {
    ev.preventDefault()
    var files = ev.dataTransfer.files || ev.target.files
    for (var i = 0; i < files.length; i++) {
-        file = files[i]
+      file = files[i]
    }
    uploadImage(file)
  }
@@ -165,7 +167,7 @@ function uploadImage(data) {
        processData: false,
        contentType: false,
        dataType: 'json',
-        headers : {'Authorization':'Bearer ' + info.apiTokens},
+        headers: { 'Authorization': 'Bearer ' + info.apiTokens },
        success: function (data) {
          console.log(data)
          if (data.id) {
@@ -173,7 +175,7 @@ function uploadImage(data) {
            relistNow.push(data.id)
            chrome.storage.sync.set(
              {
-                open_action: '', 
+                open_action: '',
                open_content: '',
                resourceIdList: relistNow
              },
@@ -187,7 +189,7 @@ function uploadImage(data) {
            //发送失败 清空open_action（打开时候进行的操作）,同时清空open_content
            chrome.storage.sync.set(
              {
-                open_action: '', 
+                open_action: '',
                open_content: '',
                resourceIdList: []
              },
@@ -209,40 +211,72 @@ function uploadImage(data) {
 }

 $('#saveKey').click(function () {
-  chrome.storage.sync.set(
-    {
-      apiUrl: $('#apiUrl').val(),
-      apiTokens: $('#apiTokens').val()
-    },
-    function () {
-      $.message({
-        message: chrome.i18n.getMessage("saveSuccess")
-      })
-      $('#blog_info').hide()
+  var apiUrl = $('#apiUrl').val()
+  var apiTokens = $('#apiTokens').val()
+  // 设置请求参数
+  const settings = {
+    async: true,
+    crossDomain: true,
+    url: apiUrl + 'api/v1/auth/status',
+    method: 'POST',
+    headers: {
+      'Authorization': 'Bearer ' + apiTokens
    }
-  )
-})
+  };
+
+  $.ajax(settings).done(function (response) {
+    if (response && response.id) {
+      // 如果响应包含用户 ID，存储 apiUrl 和 apiTokens
+      chrome.storage.sync.set(
+        {
+          apiUrl: apiUrl,
+          apiTokens: apiTokens,
+          userid: response.id
+        },
+        function () {
+          $.message({
+            message: chrome.i18n.getMessage("saveSuccess")
+          });
+          $('#blog_info').hide();
+        }
+      );
+    } else {
+      // 如果响应不包含用户 ID，显示错误消息
+      $.message({
+        message: chrome.i18n.getMessage("invalidToken")
+      });
+    }
+  }).fail(function () {
+    // 请求失败时显示错误消息
+    $.message({
+      message: chrome.i18n.getMessage("invalidToken")
+    });
+  });
+});

 $('#opensite').click(function () {
  get_info(function (info) {
-    chrome.tabs.create({url:info.apiUrl})
+    chrome.tabs.create({ url: info.apiUrl })
  })
 })

 $('#tags').click(function () {
  get_info(function (info) {
    if (info.apiUrl) {
-      var tagUrl = info.apiUrl+'api/v1/tag'
-      var tagDom = ""
+      var parent = "memos/-";
+      // 如果不使用 user 过滤，会返回所有用户的标签
+      var filter = "?filter=" + encodeURIComponent(`creator == 'users/${info.userid}'`);
+      var tagUrl = info.apiUrl + 'api/v1/' + parent + '/tags' + filter;
+      var tagDom = "";
      $.ajax({
-        url:tagUrl,
-        type:"GET",
-        contentType:"application/json;",
-        dataType:"json",
-        headers : {'Authorization':'Bearer ' + info.apiTokens},
-        success: function(data){
-          $.each(data, function(i,obj){
-            tagDom += '<span class="item-container">#'+obj+'</span>'
+        url: tagUrl,
+        type: "GET",
+        contentType: "application/json;",
+        dataType: "json",
+        headers: { 'Authorization': 'Bearer ' + info.apiTokens },
+        success: function (data) {
+          $.each(data.tagAmounts, function (tag, amount) {
+            tagDom += '<span class="item-container">#' + tag + '</span>';
          });
          tagDom += '<svg id="hideTag" class="hidetag" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path d="M78.807 362.435c201.539 314.275 666.962 314.188 868.398-.241 16.056-24.99 13.143-54.241-4.04-62.54-17.244-8.377-40.504 3.854-54.077 24.887-174.484 272.338-577.633 272.41-752.19.195-13.573-21.043-36.874-33.213-54.113-24.837-17.177 8.294-20.06 37.545-3.978 62.536z" fill="#fff"/><path d="M894.72 612.67L787.978 494.386l38.554-34.785 106.742 118.251-38.554 34.816zM635.505 727.51l-49.04-147.123 49.255-16.41 49.054 147.098-49.27 16.435zm-236.18-12.001l-49.568-15.488 43.29-138.48 49.557 15.513-43.28 138.455zM154.49 601.006l-38.743-34.565 95.186-106.732 38.763 34.566-95.206 106.731z" fill="#fff"/></svg>'
          $("#taglist").html(tagDom).slideToggle(500)
@@ -256,7 +290,7 @@ $('#tags').click(function () {
  })
 })

-$(document).on("click","#hideTag",function () {
+$(document).on("click", "#hideTag", function () {
  $('#taghide').slideToggle(500)
 })

@@ -277,75 +311,75 @@ $('#saveTag').click(function () {
 })

 $('#lock').click(function () {
-  $("#lock-wrapper").toggleClass( "!hidden", 1000 );
+  $("#lock-wrapper").toggleClass("!hidden", 1000);
 })

-$(document).on("click",".item-lock",function () {
-  $("#lock-wrapper").toggleClass( "!hidden", 1000 );
+$(document).on("click", ".item-lock", function () {
+  $("#lock-wrapper").toggleClass("!hidden", 1000);
  $("#lock-now").text($(this).text())
-    _this = $(this)[0].dataset.type;
-    chrome.storage.sync.set(
-      {memo_lock: _this}
-    )
+  _this = $(this)[0].dataset.type;
+  chrome.storage.sync.set(
+    { memo_lock: _this }
+  )
 })

 $('#search').click(function () {
  get_info(function (info) {
-  if (info.status) {
-    $("#randomlist").html('').hide()
-    var searchDom = ""
-    const pattern = $("textarea[name=text]").val()
-    if(pattern){
-      $.ajax({
-        //memos+"api/"+apiV1+"memo?creatorId="+bbMemo.creatorId+"&content="+serchText+"&limit=20";
-        url:info.apiUrl+"api/v1/memo",
-        type:"GET",
-        contentType:"application/json;",
-        dataType:"json",
-        headers : {'Authorization':'Bearer ' + info.apiTokens},
-        success: function(data){
-          const options = {keys: ['content']};
-          const fuse = new Fuse(data, options);
-          var searchData = fuse.search(pattern)
-          for(var i=0;i < searchData.length;i++){
-            searchDom += '<div class="random-item"><div class="random-time"><span id="random-link" data-id="'+searchData[i].item.id+'"><svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path d="M864 640a32 32 0 0 1 64 0v224.096A63.936 63.936 0 0 1 864.096 928H159.904A63.936 63.936 0 0 1 96 864.096V159.904C96 124.608 124.64 96 159.904 96H384a32 32 0 0 1 0 64H192.064A31.904 31.904 0 0 0 160 192.064v639.872A31.904 31.904 0 0 0 192.064 864h639.872A31.904 31.904 0 0 0 864 831.936V640zm-485.184 52.48a31.84 31.84 0 0 1-45.12-.128 31.808 31.808 0 0 1-.128-45.12L815.04 166.048l-176.128.736a31.392 31.392 0 0 1-31.584-31.744 32.32 32.32 0 0 1 31.84-32l255.232-1.056a31.36 31.36 0 0 1 31.584 31.584L924.928 388.8a32.32 32.32 0 0 1-32 31.84 31.392 31.392 0 0 1-31.712-31.584l.736-179.392L378.816 692.48z" fill="#666" data-spm-anchor-id="a313x.7781069.0.i12" class="selected"/></svg></span><span id="random-delete" data-id="'+searchData[i].item.id+'"><svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path d="M224 322.6h576c16.6 0 30-13.4 30-30s-13.4-30-30-30H224c-16.6 0-30 13.4-30 30 0 16.5 13.5 30 30 30zm66.1-144.2h443.8c16.6 0 30-13.4 30-30s-13.4-30-30-30H290.1c-16.6 0-30 13.4-30 30s13.4 30 30 30zm339.5 435.5H394.4c-16.6 0-30 13.4-30 30s13.4 30 30 30h235.2c16.6 0 30-13.4 30-30s-13.4-30-30-30z" fill="#666"/><path d="M850.3 403.9H173.7c-33 0-60 27-60 60v360c0 33 27 60 60 60h676.6c33 0 60-27 60-60v-360c0-33-27-60-60-60zm-.1 419.8l-.1.1H173.9l-.1-.1V464l.1-.1h676.2l.1.1v359.7z" fill="#666"/></svg></span>'+dayjs(new Date(searchData[i].item.createdTs)*1000).fromNow()+'</div><div class="random-content">'+searchData[i].item.content.replace(/!\[.*?\]\((.*?)\)/g,' <img class="random-image" src="$1"/> ').replace(/\[(.*?)\]\((.*?)\)/g,' <a href="$2" target="_blank">$1</a> ')+'</div>'
-            if(searchData[i].item.resourceList && searchData[i].item.resourceList.length > 0){
-              var resourceList = searchData[i].item.resourceList;
-              for(var j=0;j < resourceList.length;j++){
-                var restype = resourceList[j].type.slice(0,5);
-                var resexlink = resourceList[j].externalLink
-                var resLink = '',fileId=''
-                if(resexlink){
-                  resLink = resexlink
-                }else{
-                  fileId = resourceList[j].publicId || resourceList[j].filename
-                  resLink = info.apiUrl+'o/r/'+resourceList[j].id+'/'+fileId
-                }
-                if(restype == 'image'){
-                  searchDom += '<img class="random-image" src="'+resLink+'"/>'
-                }
-                if(restype !== 'image'){
-                  searchDom += '<a target="_blank" rel="noreferrer" href="'+resLink+'">'+resourceList[j].filename+'</a>'
+    if (info.status) {
+      $("#randomlist").html('').hide()
+      var searchDom = ""
+      const pattern = $("textarea[name=text]").val()
+      if (pattern) {
+        $.ajax({
+          //memos+"api/"+apiV1+"memo?creatorId="+bbMemo.creatorId+"&content="+serchText+"&limit=20";
+          url: info.apiUrl + "api/v1/memo",
+          type: "GET",
+          contentType: "application/json;",
+          dataType: "json",
+          headers: { 'Authorization': 'Bearer ' + info.apiTokens },
+          success: function (data) {
+            const options = { keys: ['content'] };
+            const fuse = new Fuse(data, options);
+            var searchData = fuse.search(pattern)
+            for (var i = 0; i < searchData.length; i++) {
+              searchDom += '<div class="random-item"><div class="random-time"><span id="random-link" data-id="' + searchData[i].item.id + '"><svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path d="M864 640a32 32 0 0 1 64 0v224.096A63.936 63.936 0 0 1 864.096 928H159.904A63.936 63.936 0 0 1 96 864.096V159.904C96 124.608 124.64 96 159.904 96H384a32 32 0 0 1 0 64H192.064A31.904 31.904 0 0 0 160 192.064v639.872A31.904 31.904 0 0 0 192.064 864h639.872A31.904 31.904 0 0 0 864 831.936V640zm-485.184 52.48a31.84 31.84 0 0 1-45.12-.128 31.808 31.808 0 0 1-.128-45.12L815.04 166.048l-176.128.736a31.392 31.392 0 0 1-31.584-31.744 32.32 32.32 0 0 1 31.84-32l255.232-1.056a31.36 31.36 0 0 1 31.584 31.584L924.928 388.8a32.32 32.32 0 0 1-32 31.84 31.392 31.392 0 0 1-31.712-31.584l.736-179.392L378.816 692.48z" fill="#666" data-spm-anchor-id="a313x.7781069.0.i12" class="selected"/></svg></span><span id="random-delete" data-id="' + searchData[i].item.id + '"><svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path d="M224 322.6h576c16.6 0 30-13.4 30-30s-13.4-30-30-30H224c-16.6 0-30 13.4-30 30 0 16.5 13.5 30 30 30zm66.1-144.2h443.8c16.6 0 30-13.4 30-30s-13.4-30-30-30H290.1c-16.6 0-30 13.4-30 30s13.4 30 30 30zm339.5 435.5H394.4c-16.6 0-30 13.4-30 30s13.4 30 30 30h235.2c16.6 0 30-13.4 30-30s-13.4-30-30-30z" fill="#666"/><path d="M850.3 403.9H173.7c-33 0-60 27-60 60v360c0 33 27 60 60 60h676.6c33 0 60-27 60-60v-360c0-33-27-60-60-60zm-.1 419.8l-.1.1H173.9l-.1-.1V464l.1-.1h676.2l.1.1v359.7z" fill="#666"/></svg></span>' + dayjs(new Date(searchData[i].item.createdTs) * 1000).fromNow() + '</div><div class="random-content">' + searchData[i].item.content.replace(/!\[.*?\]\((.*?)\)/g, ' <img class="random-image" src="$1"/> ').replace(/\[(.*?)\]\((.*?)\)/g, ' <a href="$2" target="_blank">$1</a> ') + '</div>'
+              if (searchData[i].item.resourceList && searchData[i].item.resourceList.length > 0) {
+                var resourceList = searchData[i].item.resourceList;
+                for (var j = 0; j < resourceList.length; j++) {
+                  var restype = resourceList[j].type.slice(0, 5);
+                  var resexlink = resourceList[j].externalLink
+                  var resLink = '', fileId = ''
+                  if (resexlink) {
+                    resLink = resexlink
+                  } else {
+                    fileId = resourceList[j].publicId || resourceList[j].filename
+                    resLink = info.apiUrl + 'o/r/' + resourceList[j].id + '/' + fileId
+                  }
+                  if (restype == 'image') {
+                    searchDom += '<img class="random-image" src="' + resLink + '"/>'
+                  }
+                  if (restype !== 'image') {
+                    searchDom += '<a target="_blank" rel="noreferrer" href="' + resLink + '">' + resourceList[j].filename + '</a>'
+                  }
                }
              }
+              searchDom += '</div>'
            }
-            searchDom += '</div>'
+            window.ViewImage && ViewImage.init('.random-image')
+            $("#randomlist").html(searchDom).slideDown(500);
          }
-          window.ViewImage && ViewImage.init('.random-image')
-          $("#randomlist").html(searchDom).slideDown(500);
-        }
-      });
-    }else{
+        });
+      } else {
+        $.message({
+          message: chrome.i18n.getMessage("searchNow")
+        })
+      }
+    } else {
      $.message({
-        message: chrome.i18n.getMessage("searchNow")
+        message: chrome.i18n.getMessage("placeApiUrl")
      })
    }
-  } else {
-    $.message({
-      message: chrome.i18n.getMessage("placeApiUrl")
-    })
-  }
-})
+  })
 })

 $('#random').click(function () {
@@ -353,47 +387,47 @@ $('#random').click(function () {
    if (info.status) {
      $("#randomlist").html('').hide()
      var nowTag = $("textarea[name=text]").val().match(/#([^\s#]+)/)
-      if( $("#taglist").is(':visible') && nowTag[1]){
-        var tagUrl = info.apiUrl+'api/v1/memo?rowStatus=NORMAL&tag='+nowTag[1]
+      if ($("#taglist").is(':visible') && nowTag[1]) {
+        var tagUrl = info.apiUrl + 'api/v1/memo?rowStatus=NORMAL&tag=' + nowTag[1]
        $.ajax({
-          url:tagUrl,
-          type:"GET",
-          contentType:"application/json;",
-          dataType:"json",
-          headers : {'Authorization':'Bearer ' + info.apiTokens},
-          success: function(data){
+          url: tagUrl,
+          type: "GET",
+          contentType: "application/json;",
+          dataType: "json",
+          headers: { 'Authorization': 'Bearer ' + info.apiTokens },
+          success: function (data) {
            let randomNum = Math.floor(Math.random() * (data.length));
            var randomData = data[randomNum]
            randDom(randomData)
          }
        })
-      }else{
-        var randomUrl0 = info.apiUrl+'api/v1/memo?rowStatus=NORMAL&limit=1'
+      } else {
+        var randomUrl0 = info.apiUrl + 'api/v1/memo?rowStatus=NORMAL&limit=1'
        $.ajax({
-          url:randomUrl0,
-          type:"GET",
-          contentType:"application/json;",
-          dataType:"json",
-          headers : {'Authorization':'Bearer ' + info.apiTokens},
-          success: function(data0){
+          url: randomUrl0,
+          type: "GET",
+          contentType: "application/json;",
+          dataType: "json",
+          headers: { 'Authorization': 'Bearer ' + info.apiTokens },
+          success: function (data0) {
            var creatorId = data0[0].creatorId
-            var randomUrl1 = info.apiUrl+'api/v1/memo/stats?creatorId='+creatorId
+            var randomUrl1 = info.apiUrl + 'api/v1/memo/stats?creatorId=' + creatorId
            $.ajax({
-              url:randomUrl1,
-              type:"GET",
-              contentType:"application/json;",
-              dataType:"json",
-              headers : {'Authorization':'Bearer ' + info.apiTokens},
-              success: function(data1){
+              url: randomUrl1,
+              type: "GET",
+              contentType: "application/json;",
+              dataType: "json",
+              headers: { 'Authorization': 'Bearer ' + info.apiTokens },
+              success: function (data1) {
                let randomNum = Math.floor(Math.random() * (data1.length)) + 1;
-                var randomUrl2 = info.apiUrl+'api/v1/memo?rowStatus=NORMAL&limit=1&offset='+randomNum
+                var randomUrl2 = info.apiUrl + 'api/v1/memo?rowStatus=NORMAL&limit=1&offset=' + randomNum
                $.ajax({
-                  url:randomUrl2,
-                  type:"GET",
-                  contentType:"application/json;",
-                  dataType:"json",
-                  headers : {'Authorization':'Bearer ' + info.apiTokens},
-                  success: function(data2){
+                  url: randomUrl2,
+                  type: "GET",
+                  contentType: "application/json;",
+                  dataType: "json",
+                  headers: { 'Authorization': 'Bearer ' + info.apiTokens },
+                  success: function (data2) {
                    var randomData = data2[0]
                    randDom(randomData)
                  }
@@ -411,72 +445,72 @@ $('#random').click(function () {
  })
 })

-function randDom(randomData){
+function randDom(randomData) {
  get_info(function (info) {
-  var randomDom = '<div class="random-item"><div class="random-time"><span id="random-link" data-id="'+randomData.id+'"><svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path d="M864 640a32 32 0 0 1 64 0v224.096A63.936 63.936 0 0 1 864.096 928H159.904A63.936 63.936 0 0 1 96 864.096V159.904C96 124.608 124.64 96 159.904 96H384a32 32 0 0 1 0 64H192.064A31.904 31.904 0 0 0 160 192.064v639.872A31.904 31.904 0 0 0 192.064 864h639.872A31.904 31.904 0 0 0 864 831.936V640zm-485.184 52.48a31.84 31.84 0 0 1-45.12-.128 31.808 31.808 0 0 1-.128-45.12L815.04 166.048l-176.128.736a31.392 31.392 0 0 1-31.584-31.744 32.32 32.32 0 0 1 31.84-32l255.232-1.056a31.36 31.36 0 0 1 31.584 31.584L924.928 388.8a32.32 32.32 0 0 1-32 31.84 31.392 31.392 0 0 1-31.712-31.584l.736-179.392L378.816 692.48z" fill="#666" data-spm-anchor-id="a313x.7781069.0.i12" class="selected"/></svg></span><span id="random-delete" data-id="'+randomData.id+'"><svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path d="M224 322.6h576c16.6 0 30-13.4 30-30s-13.4-30-30-30H224c-16.6 0-30 13.4-30 30 0 16.5 13.5 30 30 30zm66.1-144.2h443.8c16.6 0 30-13.4 30-30s-13.4-30-30-30H290.1c-16.6 0-30 13.4-30 30s13.4 30 30 30zm339.5 435.5H394.4c-16.6 0-30 13.4-30 30s13.4 30 30 30h235.2c16.6 0 30-13.4 30-30s-13.4-30-30-30z" fill="#666"/><path d="M850.3 403.9H173.7c-33 0-60 27-60 60v360c0 33 27 60 60 60h676.6c33 0 60-27 60-60v-360c0-33-27-60-60-60zm-.1 419.8l-.1.1H173.9l-.1-.1V464l.1-.1h676.2l.1.1v359.7z" fill="#666"/></svg></span>'+dayjs(new Date(randomData.createdTs * 1000)).fromNow()+'</div><div class="random-content">'+randomData.content.replace(/!\[.*?\]\((.*?)\)/g,' <img class="random-image" src="$1"/> ').replace(/\[(.*?)\]\((.*?)\)/g,' <a href="$2" target="_blank">$1</a> ')+'</div>'
-  if(randomData.resourceList && randomData.resourceList.length > 0){
-    var resourceList = randomData.resourceList;
-    for(var j=0;j < resourceList.length;j++){
-      var restype = resourceList[j].type.slice(0,5);
-      var resexlink = resourceList[j].externalLink
-      var resLink = '',fileId=''
-      if(resexlink){
-        resLink = resexlink
-      }else{
-        fileId = resourceList[j].publicId || resourceList[j].filename
-        resLink = info.apiUrl+'o/r/'+resourceList[j].id+'/'+fileId
-      }
-      if(restype == 'image'){
-        randomDom += '<img class="random-image" src="'+resLink+'"/>'
-      }
-      if(restype !== 'image'){
-        randomDom += '<a target="_blank" rel="noreferrer" href="'+resLink+'">'+resourceList[j].filename+'</a>'
+    var randomDom = '<div class="random-item"><div class="random-time"><span id="random-link" data-id="' + randomData.id + '"><svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path d="M864 640a32 32 0 0 1 64 0v224.096A63.936 63.936 0 0 1 864.096 928H159.904A63.936 63.936 0 0 1 96 864.096V159.904C96 124.608 124.64 96 159.904 96H384a32 32 0 0 1 0 64H192.064A31.904 31.904 0 0 0 160 192.064v639.872A31.904 31.904 0 0 0 192.064 864h639.872A31.904 31.904 0 0 0 864 831.936V640zm-485.184 52.48a31.84 31.84 0 0 1-45.12-.128 31.808 31.808 0 0 1-.128-45.12L815.04 166.048l-176.128.736a31.392 31.392 0 0 1-31.584-31.744 32.32 32.32 0 0 1 31.84-32l255.232-1.056a31.36 31.36 0 0 1 31.584 31.584L924.928 388.8a32.32 32.32 0 0 1-32 31.84 31.392 31.392 0 0 1-31.712-31.584l.736-179.392L378.816 692.48z" fill="#666" data-spm-anchor-id="a313x.7781069.0.i12" class="selected"/></svg></span><span id="random-delete" data-id="' + randomData.id + '"><svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path d="M224 322.6h576c16.6 0 30-13.4 30-30s-13.4-30-30-30H224c-16.6 0-30 13.4-30 30 0 16.5 13.5 30 30 30zm66.1-144.2h443.8c16.6 0 30-13.4 30-30s-13.4-30-30-30H290.1c-16.6 0-30 13.4-30 30s13.4 30 30 30zm339.5 435.5H394.4c-16.6 0-30 13.4-30 30s13.4 30 30 30h235.2c16.6 0 30-13.4 30-30s-13.4-30-30-30z" fill="#666"/><path d="M850.3 403.9H173.7c-33 0-60 27-60 60v360c0 33 27 60 60 60h676.6c33 0 60-27 60-60v-360c0-33-27-60-60-60zm-.1 419.8l-.1.1H173.9l-.1-.1V464l.1-.1h676.2l.1.1v359.7z" fill="#666"/></svg></span>' + dayjs(new Date(randomData.createdTs * 1000)).fromNow() + '</div><div class="random-content">' + randomData.content.replace(/!\[.*?\]\((.*?)\)/g, ' <img class="random-image" src="$1"/> ').replace(/\[(.*?)\]\((.*?)\)/g, ' <a href="$2" target="_blank">$1</a> ') + '</div>'
+    if (randomData.resourceList && randomData.resourceList.length > 0) {
+      var resourceList = randomData.resourceList;
+      for (var j = 0; j < resourceList.length; j++) {
+        var restype = resourceList[j].type.slice(0, 5);
+        var resexlink = resourceList[j].externalLink
+        var resLink = '', fileId = ''
+        if (resexlink) {
+          resLink = resexlink
+        } else {
+          fileId = resourceList[j].publicId || resourceList[j].filename
+          resLink = info.apiUrl + 'o/r/' + resourceList[j].id + '/' + fileId
+        }
+        if (restype == 'image') {
+          randomDom += '<img class="random-image" src="' + resLink + '"/>'
+        }
+        if (restype !== 'image') {
+          randomDom += '<a target="_blank" rel="noreferrer" href="' + resLink + '">' + resourceList[j].filename + '</a>'
+        }
      }
    }
-  }
-  randomDom += '</div>'
-  window.ViewImage && ViewImage.init('.random-image')
-  $("#randomlist").html(randomDom).slideDown(500);
+    randomDom += '</div>'
+    window.ViewImage && ViewImage.init('.random-image')
+    $("#randomlist").html(randomDom).slideDown(500);
  })
 }

-$(document).on("click","#random-link",function () {
+$(document).on("click", "#random-link", function () {
  var memoId = $("#random-link").data('id');
  get_info(function (info) {
-    chrome.tabs.create({url:info.apiUrl+"m/"+memoId})
+    chrome.tabs.create({ url: info.apiUrl + "m/" + memoId })
  })
 })

-$(document).on("click","#random-delete",function () {
-get_info(function (info) {
-  var memosId = $("#random-delete").data('id');
-  var deleteUrl = info.apiUrl+'api/v1/memo/'+memosId
-  $.ajax({
-    url:deleteUrl,
-    type:"PATCH",
-    data:JSON.stringify({
-      'id': memosId,
-      'rowStatus': "ARCHIVED"
-    }),
-    contentType:"application/json;",
-    dataType:"json",
-    headers : {'Authorization':'Bearer ' + info.apiTokens},
-    success: function(result){
-          $("#randomlist").html('').hide()
-              $.message({
-                message: chrome.i18n.getMessage("archiveSuccess")
-              })
-  },error:function(err){//清空open_action（打开时候进行的操作）,同时清空open_content
-              $.message({
-                message: chrome.i18n.getMessage("archiveFailed")
-              })
-          }
+$(document).on("click", "#random-delete", function () {
+  get_info(function (info) {
+    var memosId = $("#random-delete").data('id');
+    var deleteUrl = info.apiUrl + 'api/v1/memo/' + memosId
+    $.ajax({
+      url: deleteUrl,
+      type: "PATCH",
+      data: JSON.stringify({
+        'id': memosId,
+        'rowStatus': "ARCHIVED"
+      }),
+      contentType: "application/json;",
+      dataType: "json",
+      headers: { 'Authorization': 'Bearer ' + info.apiTokens },
+      success: function (result) {
+        $("#randomlist").html('').hide()
+        $.message({
+          message: chrome.i18n.getMessage("archiveSuccess")
+        })
+      }, error: function (err) {//清空open_action（打开时候进行的操作）,同时清空open_content
+        $.message({
+          message: chrome.i18n.getMessage("archiveFailed")
+        })
+      }
+    })
  })
 })
-})

-$(document).on("click",".item-container",function () {
-  var tagHtml = $(this).text()+" "
+$(document).on("click", ".item-container", function () {
+  var tagHtml = $(this).text() + " "
  add(tagHtml);
 })

@@ -487,10 +521,10 @@ $('#newtodo').click(function () {

 $('#getlink').click(function () {
  chrome.tabs.query({ active: true, currentWindow: true }, ([tab]) => {
-    var linkHtml = " ["+tab.title+"]("+tab.url+") "
-    if(tab.url){
+    var linkHtml = " [" + tab.title + "](" + tab.url + ") "
+    if (tab.url) {
      add(linkHtml);
-    }else{
+    } else {
      $.message({
        message: chrome.i18n.getMessage("getTabFailed")
      })
@@ -502,13 +536,13 @@ $('#upres').click(async function () {
  $('#inFile').click()
 })

-$('#inFile').on('change', function(data){
-  var fileVal = $('#inFile').val();
+$('#inFile').on('change', function (data) {
+  var fileVal = $('#inFile').val();
  var file = null
-  if(fileVal == '') {
+  if (fileVal == '') {
    return;
  }
-  file= this.files[0];
+  file = this.files[0];
  uploadImage(file)
 });

@@ -516,10 +550,10 @@ function add(str) {
  var tc = document.getElementById("content");
  var tclen = tc.value.length;
  tc.focus();
-  if(typeof document.selection != "undefined"){
+  if (typeof document.selection != "undefined") {
    document.selection.createRange().text = str;
-  }else{
-    tc.value = 
+  } else {
+    tc.value =
      tc.value.substr(0, tc.selectionStart) +
      str +
      tc.value.substring(tc.selectionStart, tclen);
@@ -532,35 +566,35 @@ $('#blog_info_edit').click(function () {

 $('#content_submit_text').click(function () {
  var contentVal = $("textarea[name=text]").val()
-  if(contentVal){
+  if (contentVal) {
    sendText()
-  }else{
+  } else {
    $.message({
      message: chrome.i18n.getMessage("placeContent")
    })
  }
 })

-function getOne(memosId){
+function getOne(memosId) {
  get_info(function (info) {
-  if (info.apiUrl) {
-    $("#randomlist").html('').hide()
-        var getUrl = info.apiUrl+'api/v1/memo/'+memosId
-        $.ajax({
-          url:getUrl,
-          type:"GET",
-          contentType:"application/json;",
-          dataType:"json",
-          headers : {'Authorization':'Bearer ' + info.apiTokens},
-          success: function(data){
-            randDom(data)
-          }
-        })
-  } else {
-    $.message({
-      message: chrome.i18n.getMessage("placeApiUrl")
-    })
-  }
+    if (info.apiUrl) {
+      $("#randomlist").html('').hide()
+      var getUrl = info.apiUrl + 'api/v1/memo/' + memosId
+      $.ajax({
+        url: getUrl,
+        type: "GET",
+        contentType: "application/json;",
+        dataType: "json",
+        headers: { 'Authorization': 'Bearer ' + info.apiTokens },
+        success: function (data) {
+          randDom(data)
+        }
+      })
+    } else {
+      $.message({
+        message: chrome.i18n.getMessage("placeApiUrl")
+      })
+    }
  })
 }

@@ -576,46 +610,47 @@ function sendText() {
      var showTag = info.showtag
      var nowTag = $("textarea[name=text]").val().match(/(#[^\s#]+)/)
      var sendvisi = info.memo_lock || ''
-      if(nowTag){
-        if(nowTag[1] == showTag){
+      if (nowTag) {
+        if (nowTag[1] == showTag) {
          sendvisi = 'PUBLIC'
-        }else if(nowTag[1] == hideTag){
+        } else if (nowTag[1] == hideTag) {
          sendvisi = 'PRIVATE'
        }
      }
      $.ajax({
-        url:info.apiUrl+'api/v1/memos',
-        type:"POST",
-        data:JSON.stringify({
+        url: info.apiUrl + 'api/v1/memos',
+        type: "POST",
+        data: JSON.stringify({
          'content': content,
          'visibility': sendvisi,
          'resourceIdList': info.resourceIdList || [],
        }),
-        contentType:"application/json;",
-        dataType:"json",
-        headers : {'Authorization':'Bearer ' + info.apiTokens},
-        success: function(data){
-              //发送成功
-              getOne(data.id)
-              chrome.storage.sync.set(
-                { open_action: '', open_content: '',resourceIdList:''},
-                function () {
-                  $.message({
-                    message: chrome.i18n.getMessage("memoSuccess")
-                  })
-                  //$("#content_submit_text").removeAttr('disabled');
-                  $("textarea[name=text]").val('')
-                }
+        contentType: "application/json;",
+        dataType: "json",
+        headers: { 'Authorization': 'Bearer ' + info.apiTokens },
+        success: function (data) {
+          //发送成功
+          getOne(data.id)
+          chrome.storage.sync.set(
+            { open_action: '', open_content: '', resourceIdList: '' },
+            function () {
+              $.message({
+                message: chrome.i18n.getMessage("memoSuccess")
+              })
+              //$("#content_submit_text").removeAttr('disabled');
+              $("textarea[name=text]").val('')
+            }
          )
-      },error:function(err){//清空open_action（打开时候进行的操作）,同时清空open_content
-              chrome.storage.sync.set(
-                { open_action: '', open_content: '',resourceIdList:'' },
-                function () {
-                  $.message({
-                    message: chrome.i18n.getMessage("memoFailed")
-                  })
-                }
-              )},
+        }, error: function (err) {//清空open_action（打开时候进行的操作）,同时清空open_content
+          chrome.storage.sync.set(
+            { open_action: '', open_content: '', resourceIdList: '' },
+            function () {
+              $.message({
+                message: chrome.i18n.getMessage("memoFailed")
+              })
+            }
+          )
+        },
      })
    } else {
      $.message({