diff --git a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkServiceImpl.java b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkServiceImpl.java index c3f82e9..192a62f 100644 --- a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkServiceImpl.java +++ b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkServiceImpl.java @@ -1,8 +1,10 @@ package com.fanxb.bookmark.business.bookmark.service.impl; +import cn.hutool.core.codec.Base64Decoder; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.CharsetUtil; +import cn.hutool.core.util.HashUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.fanxb.bookmark.business.api.UserApi; @@ -21,6 +23,7 @@ import com.fanxb.bookmark.common.constant.RedisConstant; import com.fanxb.bookmark.common.entity.po.Bookmark; import com.fanxb.bookmark.common.exception.CustomException; import com.fanxb.bookmark.common.util.*; +import com.mysql.cj.conf.url.SingleConnectionUrl; import lombok.extern.slf4j.Slf4j; import okhttp3.Request; import okhttp3.Response; @@ -37,6 +40,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.io.File; +import java.io.FileOutputStream; import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; @@ -53,7 +57,6 @@ import java.util.stream.Collectors; * 类功能详述： * * @author fanxb - * @date 2019/7/8 15:00 */ @Service @Slf4j @@ -116,7 +119,6 @@ public class BookmarkServiceImpl implements BookmarkService { * @param path 节点路径，不包含自身 * @param sort 当前层级中的排序序号 * @author fanxb - * @date 2019/7/8 14:49 */ private void dealBookmark(int userId, Element ele, String path, int sort, List bookmarks) { if (!DT.equalsIgnoreCase(ele.tagName())) { @@ -125,7 +127,7 @@ public class BookmarkServiceImpl implements BookmarkService { Element first = ele.child(0); if (A.equalsIgnoreCase(first.tagName())) { //说明为链接 - Bookmark node = new Bookmark(userId, path, first.ownText(), first.attr("href"), first.attr("icon") + Bookmark node = new Bookmark(userId, path, first.ownText(), first.attr("href"), "" , Long.parseLong(first.attr("add_date")) * 1000, sort); //存入数据库 insertOne(node); @@ -155,7 +157,6 @@ public class BookmarkServiceImpl implements BookmarkService { * @param node node * @return boolean 如果已经存在返回true，否则false * @author fanxb - * @date 2019/7/8 17:25 */ private boolean insertOne(Bookmark node) { //先根据name,userId,parentId获取此节点id @@ -217,7 +218,7 @@ public class BookmarkServiceImpl implements BookmarkService { bookmark.setUserId(userId); bookmark.setCreateTime(System.currentTimeMillis()); bookmark.setAddTime(bookmark.getCreateTime()); - bookmark.setIcon(getIconPath(bookmark.getUrl())); + bookmark.setIcon(getIconPath(bookmark.getUrl(), bookmark.getIcon(), bookmark.getIconUrl())); //文件夹和书签都建立搜索key pinYinService.changeBookmark(bookmark); bookmarkDao.insertOne(bookmark); @@ -231,7 +232,7 @@ public class BookmarkServiceImpl implements BookmarkService { bookmark.setUserId(userId); if (bookmark.getType() == 0) { pinYinService.changeBookmark(bookmark); - bookmark.setIcon(getIconPath(bookmark.getUrl())); + bookmark.setIcon(getIconPath(bookmark.getUrl(), null, null)); } bookmarkDao.editBookmark(bookmark); userApi.versionPlus(userId); @@ -290,7 +291,7 @@ public class BookmarkServiceImpl implements BookmarkService { while ((deal = bookmarkDao.selectUserNoIcon(userId, start, size)).size() > 0) { start += size; deal.forEach(item -> { - String icon = getIconPath(item.getUrl()); + String icon = getIconPath(item.getUrl(), null, null); if (StrUtil.isNotEmpty(icon)) { bookmarkDao.updateIcon(item.getBookmarkId(), icon); } @@ -322,58 +323,90 @@ public class BookmarkServiceImpl implements BookmarkService { } /** - * 获取icon + * 获取icon,通过网络获取，或者从base64还原 * - * @param url url + * @param url url + * @param icon icon + * @param iconUrl iconUrl * @return {@link String} * @author fanxb */ - private String getIconPath(String url) { - if (StrUtil.isEmpty(url)) { - return ""; - } + private String getIconPath(String url, String icon, String iconUrl) { String host; try { URL urlObj = new URL(url); - host = urlObj.getHost(); + host = urlObj.getAuthority(); } catch (Exception e) { log.warn("url无法解析出domain:{}", url); return ""; } + if (StrUtil.isNotBlank(icon)) { + //优先从base64还原出图片 + try { + byte[] b = Base64Decoder.decode(icon.substring(icon.indexOf(",") + 1)); + String iconPath = saveToFile(iconUrl, host, b); + hostIconDao.insert(host, iconPath); + return iconPath; + } catch (Exception e) { + log.error("解析base64获取icon故障:{}", iconUrl, e); + } + } + String iconPath = hostIconDao.selectByHost(host); if (iconPath != null) { return iconPath; } - iconPath = saveFile(host, urlIconAddress + "/icon?url=" + host + "&size=16..64..256"); + //再根据url解析 + iconPath = saveFile(host, urlIconAddress + "/icon?url=" + host + "&size=16..128..256"); if (StrUtil.isNotEmpty(iconPath)) { hostIconDao.insert(host, iconPath); } return iconPath; } + /** + * 保存文件到icon路径 + * + * @param host host + * @param url url + * @return {@link String} + * @author FleyX + */ private String saveFile(String host, String url) { - try { - try (Response res = HttpUtil.getClient(false).newCall(new Request.Builder().url(url) - .header("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.75 Safari/537.36 Edg/100.0.1185.36") - .get().build()).execute()) { - assert res.body() != null; - if (!HttpUtil.checkIsOk(res.code())) { - throw new CustomException("请求错误:" + res.code()); - } - byte[] data = res.body().byteStream().readAllBytes(); - if (data.length > 0) { - String iconUrl = res.request().url().toString(); - String fileName = URLEncoder.encode(host, StandardCharsets.UTF_8) + iconUrl.substring(iconUrl.lastIndexOf(".")); - String filePath = Paths.get(FileConstant.FAVICON_PATH, host.substring(0, 2), fileName).toString(); - FileUtil.writeBytes(data, Paths.get(CommonConstant.fileSavePath, filePath).toString()); - return File.separator + filePath; - } else { - log.info("未获取到icon:{}", url); - } + try (Response res = HttpUtil.getClient(false).newCall(new Request.Builder().url(url) + .header("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.75 Safari/537.36 Edg/100.0.1185.36") + .get().build()).execute()) { + assert res.body() != null; + if (!HttpUtil.checkIsOk(res.code())) { + throw new CustomException("请求错误:" + res.code()); + } + byte[] data = res.body().byteStream().readAllBytes(); + if (data.length > 0) { + String iconUrl = new URL(res.request().url().toString()).getPath(); + return saveToFile(iconUrl, host, data); + } else { + log.info("未获取到icon:{}", url); } } catch (Exception e) { log.error("url获取icon故障:{}", url, e); } return ""; } + + + /** + * 保存到文件中 + * + * @param iconUrl icon文件名 + * @param host host + * @param b 数据 + * @return {@link String} + * @author FleyX + */ + private String saveToFile(String iconUrl, String host, byte[] b) { + String fileName = URLEncoder.encode(host, StandardCharsets.UTF_8) + iconUrl.substring(iconUrl.lastIndexOf(".")); + String filePath = Paths.get(FileConstant.FAVICON_PATH, host.replace("www", "").replaceAll("\\.", "").substring(0, 2), fileName).toString(); + FileUtil.writeBytes(b, Paths.get(CommonConstant.fileSavePath, filePath).toString()); + return File.separator + filePath; + } } diff --git a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/po/Bookmark.java b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/po/Bookmark.java index 31975f4..c656876 100644 --- a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/po/Bookmark.java +++ b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/po/Bookmark.java @@ -12,7 +12,6 @@ import java.util.List; * 类功能详述： * * @author fanxb - * @date 2019/7/8 11:19 */ @Data public class Bookmark { @@ -36,6 +35,7 @@ public class Bookmark { private String name; private String url = ""; private String icon = ""; + private String iconUrl; private Integer sort; private String searchKey = ""; private Long addTime; diff --git a/bookmark_front/src/components/main/Search.vue b/bookmark_front/src/components/main/Search.vue index 246b5f1..bee7a7b 100644 --- a/bookmark_front/src/components/main/Search.vue +++ b/bookmark_front/src/components/main/Search.vue @@ -51,7 +51,7 @@ - + diff --git a/bookmark_front/src/router/index.js b/bookmark_front/src/router/index.js index 3487034..9a4d971 100644 --- a/bookmark_front/src/router/index.js +++ b/bookmark_front/src/router/index.js @@ -58,7 +58,7 @@ router.beforeEach(async (to, from, next) => { await vuex.default.dispatch("treeData/clear"); await vuex.default.dispatch("globalConfig/clear"); next({ - path: "/public/login?to=" + btoa(location.href), + path: "/public/login?to=" + btoa(to.fullPath), replace: true }); } else { diff --git a/bookmark_front/src/store/modules/treeData.js b/bookmark_front/src/store/modules/treeData.js index 9ee7947..cfa4ebd 100644 --- a/bookmark_front/src/store/modules/treeData.js +++ b/bookmark_front/src/store/modules/treeData.js @@ -22,7 +22,13 @@ export const refreshHomePinList = "refreshHomePinList"; * 通过id获取书签数据 */ export const getById = "getById"; +/** + * 登录前初始化 + */ export const noLoginInit = "noLoginInit"; +/** + * 登陆后初始化 + */ export const loginInit = "loginInit"; export const refresh = "refresh"; export const clear = "clear"; @@ -39,6 +45,10 @@ export const addNode = "addNode"; * 版本检查定时调度 */ let timer = null; +/** + * 检查本地版本是否有更新 + */ +let checkLocalDataTimer = null; /** * 刷新书签确认弹窗是否展示 */ @@ -76,8 +86,8 @@ const getters = { }; const actions = { - async [noLoginInit]() {}, - async [loginInit](context) { + async [noLoginInit] () { }, + async [loginInit] (context) { if (context.state.isInit || context.state.isIniting) { return; } @@ -89,11 +99,12 @@ const actions = { context.commit(IS_INIT, true); context.commit(IS_INITING, false); timer = setInterval(() => treeDataCheck(context, false), CHECK_INTERVAL); + checkLocalDataTimer = setInterval(() => checkLocalData(context), 2000); }, /** * 确保数据加载完毕 */ - ensureDataOk(context) { + ensureDataOk (context) { return new Promise((resolve, reject) => { let timer = setInterval(() => { try { @@ -108,7 +119,7 @@ const actions = { }); }, //刷新缓存数据 - async [refresh](context) { + async [refresh] (context) { let treeData = await HttpUtil.get("/bookmark/currentUser"); if (!treeData[""]) { treeData[""] = []; @@ -127,7 +138,7 @@ const actions = { await localforage.setItem(TOTAL_TREE_DATA, treeData); }, //清除缓存数据 - async [clear](context) { + async [clear] (context) { context.commit(TOTAL_TREE_DATA, null); context.commit(VERSION, null); context.commit(SHOW_REFRESH_TOAST, false); @@ -137,13 +148,16 @@ const actions = { if (timer != null) { clearInterval(timer); } + if (checkLocalDataTimer != null) { + clearInterval(checkLocalDataTimer); + } await localforage.removeItem(TOTAL_TREE_DATA); await localforage.removeItem(VERSION); }, /** * 移动节点 */ - async moveNode(context, info) { + async moveNode (context, info) { let data = context.state[TOTAL_TREE_DATA]; const target = info.node.dataRef; const current = info.dragNode.dataRef; @@ -211,7 +225,7 @@ const actions = { await localforage.setItem(TOTAL_TREE_DATA, state[TOTAL_TREE_DATA]); return body; }, - async [refreshHomePinList]({ commit }) { + async [refreshHomePinList] ({ commit }) { let list = await HttpUtil.get("/home/pin"); commit(HOME_PIN_LIST, list); let map = {}; @@ -221,14 +235,14 @@ const actions = { /** * 更新版本数据 */ - async updateVersion({ commit, state }, version) { + async updateVersion ({ commit, state }, version) { commit(VERSION, version == null ? state[VERSION] + 1 : version); await localforage.setItem(VERSION, state[VERSION]); }, /** * 新增书签、文件夹 */ - async [addNode](context, { sourceNode, targetNode }) { + async [addNode] (context, { sourceNode, targetNode }) { if (sourceNode === null) { if (context.state[TOTAL_TREE_DATA][""] === undefined) { context.state[TOTAL_TREE_DATA][""] = []; @@ -253,7 +267,7 @@ const actions = { /** * 删除节点数据 */ - async [deleteData](context, { pathList, bookmarkIdList }) { + async [deleteData] (context, { pathList, bookmarkIdList }) { //待删除的书签 let bookmarkIdSet = new Set(); bookmarkIdList.forEach(item => bookmarkIdSet.add(item)); @@ -281,7 +295,7 @@ const actions = { /** * 编辑书签节点 */ - async editNode({ dispatch, state, commit }, { node, newName, newUrl, newIcon }) { + async editNode ({ dispatch, state, commit }, { node, newName, newUrl, newIcon }) { node.name = newName; node.url = newUrl; node.icon = newIcon; @@ -295,10 +309,10 @@ const mutations = { [TOTAL_TREE_DATA]: (state, totalTreeData) => { state.totalTreeData = totalTreeData; }, - [IS_INIT](state, isInit) { + [IS_INIT] (state, isInit) { state.isInit = isInit; }, - [IS_INITING](state, isIniting) { + [IS_INITING] (state, isIniting) { state.isIniting = isIniting; }, [VERSION]: (state, version) => { @@ -322,7 +336,7 @@ const mutations = { * @param {*} isFirst * @returns */ -async function treeDataCheck(context, isFirst) { +async function treeDataCheck (context, isFirst) { if (toastShow || !checkJwtValid(context.rootState.globalConfig.token)) { return; } @@ -336,14 +350,14 @@ async function treeDataCheck(context, isFirst) { closable: false, keyboard: false, maskClosable: false, - onOk() { + onOk () { toastShow = false; return new Promise(async resolve => { await context.dispatch(refresh); resolve(); }); }, - onCancel() { + onCancel () { toastShow = false; } }); @@ -354,6 +368,24 @@ async function treeDataCheck(context, isFirst) { } } +/** + * 检查本地缓存数据是否有更新 + * @param {*} context + */ +async function checkLocalData (context) { + let data = await localforage.getItem(TOTAL_TREE_DATA); + let version = await localforage.getItem(VERSION); + if (!data || !version) { + return; + } + if (version > context.state[VERSION]) { + console.log("从local缓存更新数据：", version); + context.commit(TOTAL_TREE_DATA, data); + context.commit(VERSION, version); + } + +} + export const store = { namespaced: true, state, diff --git a/bookmark_front/src/views/manage/bookmarkTree/index.vue b/bookmark_front/src/views/manage/bookmarkTree/index.vue index 1e4442e..892b890 100644 --- a/bookmark_front/src/views/manage/bookmarkTree/index.vue +++ b/bookmark_front/src/views/manage/bookmarkTree/index.vue @@ -15,7 +15,7 @@ @@ -77,7 +77,7 @@ 新增 复制URL - {{ homePinList.filter(item => item.id && item.bookmarkId == rec.dataRef.bookmarkId).length > 0 ? "从首页移除" : "固定到首页" }} + {{ homePinList.filter((item) => item.id && item.bookmarkId == rec.dataRef.bookmarkId).length > 0 ? "从首页移除" : "固定到首页" }} 编辑 删除 @@ -114,7 +114,7 @@ export default { loadedKeys: [], // 已加载数据 replaceFields: { title: "name", - key: "bookmarkId" + key: "bookmarkId", }, mulSelect: false, // 多选框是否显示 currentSelect: null, // 当前树的选择项 @@ -126,19 +126,19 @@ export default { // 新增、修改目标数据，null说明向根节点增加数据 targetNode: null, // 是否为新增动作 - isAdd: false + isAdd: false, }, - copyBoard: null //剪贴板对象 + copyBoard: null, //剪贴板对象 }; }, computed: { ...mapState("treeData", ["totalTreeData", HOME_PIN_LIST]), - ...mapState("globalConfig", ["isPhone"]) + ...mapState("globalConfig", ["isPhone"]), }, watch: { totalTreeData(newVal, oldVal) { this.resetData(); - } + }, }, async mounted() { this.$store.commit(TREE_DATA + "/" + SHOW_REFRESH_TOAST, true); @@ -147,21 +147,14 @@ export default { this.loading = false; //初始化clipboard this.copyBoard = new ClipboardJS(".copy-to-board", { - text: function(trigger) { + text: function (trigger) { return trigger.attributes.data.nodeValue; - } + }, }); - this.copyBoard.on("success", e => { + this.copyBoard.on("success", (e) => { this.$message.success("复制成功"); e.clearSelection(); }); - - window.onblur = e => { - console.log("窗口非激活"); - }; - window.onfocus = e => { - console.log("窗口激活"); - }; }, beforeDestroy() { this.$store.commit(TREE_DATA + "/" + SHOW_REFRESH_TOAST, false); @@ -175,7 +168,7 @@ export default { */ loadData(treeNode) { console.log("加载数据", treeNode); - return new Promise(resolve => { + return new Promise((resolve) => { const data = typeof treeNode === "number" ? this.$store.getters["treeData/getById"](treeNode) : treeNode.dataRef; let newPath = data.path + "." + data.bookmarkId; if (!this.totalTreeData[newPath]) { @@ -219,9 +212,9 @@ export default { this.expandedKeys = [ ...item.path .split(".") - .filter(item => item.length > 0) - .map(item => parseInt(item)), - item.bookmarkId + .filter((item) => item.length > 0) + .map((item) => parseInt(item)), + item.bookmarkId, ]; } else { this.expandedKeys.pop(); @@ -235,7 +228,7 @@ export default { } else { this.checkedKeys.splice(this.checkedKeys.indexOf(item.bookmarkId), 1); this.checkedNodes.splice( - this.checkedNodes.findIndex(item1 => item1.bookmarkId === item.bookmarkId), + this.checkedNodes.findIndex((item1) => item1.bookmarkId === item.bookmarkId), 1 ); } @@ -255,9 +248,9 @@ export default { this.expandedKeys = [ ...item.path .split(".") - .filter(item => item.length > 0) - .map(item => parseInt(item)), - item.bookmarkId + .filter((item) => item.length > 0) + .map((item) => parseInt(item)), + item.bookmarkId, ]; } } else { @@ -280,7 +273,7 @@ export default { const bookmarkIdList = []; const pathList = []; if (this.checkedNodes) { - this.checkedNodes.forEach(item => + this.checkedNodes.forEach((item) => item.type === 1 ? pathList.push(item.path + "." + item.bookmarkId) : bookmarkIdList.push(item.bookmarkId) ); } @@ -297,7 +290,7 @@ export default { await HttpUtil.post("/bookmark/batchDelete", null, { pathList, bookmarkIdList }); await this.$store.dispatch(TREE_DATA + "/" + deleteData, { pathList, bookmarkIdList }); //删除已经被删除的数据 - pathList.forEach(item => { + pathList.forEach((item) => { const id = parseInt(item.split(".").reverse()[0]); let index = this.loadedKeys.indexOf(id); if (index > -1) { @@ -329,13 +322,13 @@ export default { this.refresh(false); this.expandedKeys = item.path .split(".") - .filter(one => one.length > 0) - .map(one => parseInt(one)); + .filter((one) => one.length > 0) + .map((one) => parseInt(one)); this.loadedKeys = item.path .split(".") - .filter(one => one.length > 0) - .map(one => parseInt(one)); - this.expandedKeys.forEach(async one => await this.loadData(one)); + .filter((one) => one.length > 0) + .map((one) => parseInt(one)); + this.expandedKeys.forEach(async (one) => await this.loadData(one)); this.currentSelect = item; }, /** @@ -351,7 +344,7 @@ export default { this.addModal = { show: false, targetNode: null, - isAdd: false + isAdd: false, }; }, async onDrop(info) { @@ -395,12 +388,12 @@ export default { await this.deleteBookmarks(); resolve(); }); - } + }, }); } else if (key === "edit") { this.editData(); } else if (key === "pin") { - let pin = this.homePinList.filter(one => one.id && one.bookmarkId == item.bookmarkId); + let pin = this.homePinList.filter((one) => one.id && one.bookmarkId == item.bookmarkId); if (pin.length > 0) { await HttpUtil.delete("/home/pin", { id: pin[0].id }); } else { @@ -418,8 +411,8 @@ export default { dealList(root, map[""], map); let content = exportFileHead + root.outerHTML; downloadFile(moment().format("YYYY-MM-DD") + "导出书签.html", content); - } - } + }, + }, }; diff --git a/bookmark_front/src/views/noHead/addBookmark/index.vue b/bookmark_front/src/views/noHead/addBookmark/index.vue index c7596dd..b121e37 100644 --- a/bookmark_front/src/views/noHead/addBookmark/index.vue +++ b/bookmark_front/src/views/noHead/addBookmark/index.vue @@ -14,14 +14,16 @@ export default { form: { name: null, url: null, + icon: null, + iconUrl: null, type: 0, - path: "" - } + path: "", + }, }; }, mounted() { //接受父节点传递的书签信息 - window.addEventListener("message", event => { + window.addEventListener("message", (event) => { if (!event.data.code) { return; } @@ -30,6 +32,8 @@ export default { console.log("新增书签"); this.form.name = event.data.data.name; this.form.url = event.data.data.url; + this.form.icon = event.data.data.icon; + this.form.iconUrl = event.data.data.iconUrl; this.addBookmark(); } }); @@ -46,8 +50,8 @@ export default { this.$message.success("添加成功"); await this.$store.dispatch(TREE_DATA + "/" + addNode, { sourceNode: null, targetNode: res }); setTimeout(this.closeIframe, 500); - } - } + }, + }, }; diff --git a/bookmark_front/src/views/public/login/index.vue b/bookmark_front/src/views/public/login/index.vue index 270735d..2dce028 100644 --- a/bookmark_front/src/views/public/login/index.vue +++ b/bookmark_front/src/views/public/login/index.vue @@ -67,11 +67,15 @@ export default { loading: false, //是否加载中 oauthLogining: false, //true:正在进行oauth后台操作 page: null, //oauth打开的页面实例 + redirect: null, }; }, async created() { let _this = this; window.addEventListener("storage", this.storageDeal.bind(this)); + if (this.$route.query.to) { + this.redirect = atob(this.$route.query.to); + } }, destroyed() { window.removeEventListener("storage", this.storageDeal); @@ -85,7 +89,7 @@ export default { this.loading = true; let token = await httpUtil.post("/user/login", null, this.form); await this.$store.dispatch("globalConfig/setToken", token); - this.$router.replace("/"); + this.$router.replace(this.redirect ? this.redirect : "/"); } finally { this.loading = false; } diff --git a/浏览器插件/bookmarkBrowserPlugin/background.js b/浏览器插件/bookmarkBrowserPlugin/background.js index d42af06..f440bcb 100644 --- a/浏览器插件/bookmarkBrowserPlugin/background.js +++ b/浏览器插件/bookmarkBrowserPlugin/background.js @@ -15,6 +15,7 @@ chrome.contextMenus.onClicked.addListener(async function (info, tab) { let body = { name: tab.title, url: tab.url, + iconUrl: tab.favIconUrl }; sendToContent(tab.id, { code: "addBookmark", data: body, token: await getVal("token") }); }); @@ -33,7 +34,8 @@ chrome.runtime.onMessage.addListener(async (data, sender, sendResponse) => { await sendToContent(sender.tab.id, { code: "setTokenOk" }); } else if (data.code == 'getToken') { let token = await getVal("token"); - sendToPopup({ code: "setToken", data: await getVal("token") }); + + sendToPopup({ code: "setToken", data: token }); } else if (data.code == "clearToken") { await clearVal("token"); } @@ -83,7 +85,12 @@ function setVal (key, val) { */ function getVal (key) { return new Promise((resolve, reject) => { - chrome.storage.local.get([key], function (res) { + chrome.storage.local.get([key], async function (res) { + if (key === 'token' && !checkTokenValid(res[key])) { + console.log("token过期"); + await clearVal("token"); + res[key] = null; + } console.log("取值成功", res); resolve(res[key]); }) @@ -97,4 +104,24 @@ function clearVal (key) { resolve(); }) }) +} + +/** + * 检查token是否有效 + * @param {*} token + * @returns + */ +function checkTokenValid (token) { + try { + if (token && token.trim().length > 0) { + //检查token是否还有效 + let content = JSON.parse(atob(token.split(".")[1])); + if (content.exp > Date.now() / 1000) { + return true; + } + } + } catch (err) { + console.error(token, err); + } + return false; } \ No newline at end of file diff --git a/浏览器插件/bookmarkBrowserPlugin/manifest.json b/浏览器插件/bookmarkBrowserPlugin/manifest.json index 63e1f0d..440ce5d 100644 --- a/浏览器插件/bookmarkBrowserPlugin/manifest.json +++ b/浏览器插件/bookmarkBrowserPlugin/manifest.json @@ -8,7 +8,11 @@ "newtab": "tab/index.html" }, "action": { - "default_popup": "popup/index.html" + "default_popup": "popup/index.html", + "default_icon": { + "48": "static/icons/favicon.png", + "128": "static/icons/favicon.png" + } }, "icons": { "48": "static/icons/favicon.png", diff --git a/浏览器插件/bookmarkBrowserPlugin/static/js/config.js b/浏览器插件/bookmarkBrowserPlugin/static/js/config.js index cc7a69f..a26079c 100644 --- a/浏览器插件/bookmarkBrowserPlugin/static/js/config.js +++ b/浏览器插件/bookmarkBrowserPlugin/static/js/config.js @@ -1,7 +1,7 @@ // var bookmarkHost = "https://fleyx.com"; var bookmarkHost = "http://localhost:8080"; -var version = "0.1"; +var version = "0.1.1"; window.token = localStorage.getItem('token'); axios.defaults.baseURL = bookmarkHost + '/bookmark/api'; diff --git a/浏览器插件/bookmarkBrowserPlugin/static/js/content.js b/浏览器插件/bookmarkBrowserPlugin/static/js/content.js index 489074b..b639bb8 100644 --- a/浏览器插件/bookmarkBrowserPlugin/static/js/content.js +++ b/浏览器插件/bookmarkBrowserPlugin/static/js/content.js @@ -46,6 +46,15 @@ async function addBookmark (data) { return; } //新增书签 + try { + if (data.data.iconUrl) { + let icon = await axios.get(data.data.iconUrl, { responseType: 'arraybuffer' }); + console.log(JSON.stringify(new Uint8Array(icon.data))); + data.data.icon = `data:` + icon.headers['content-type'] + ';base64,' + window.btoa(String.fromCharCode(...new Uint8Array(icon.data))); + } + } catch (error) { + console.error(error); + } console.log("新增书签", data.data); bookmarkInfo = data.data; addBlockDiv = document.createElement("div"); diff --git a/浏览器插件/bookmarkBrowserPlugin/tab/index.html b/浏览器插件/bookmarkBrowserPlugin/tab/index.html index 4cbb50e..aed3a82 100644 --- a/浏览器插件/bookmarkBrowserPlugin/tab/index.html +++ b/浏览器插件/bookmarkBrowserPlugin/tab/index.html @@ -1,20 +1,21 @@ - - - - Document + + + + + 新建标签页 - - - - + + + +