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 6e50bc6..c3f82e9 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 @@ -36,12 +36,14 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.io.File; import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; import java.net.URLEncoder; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; +import java.nio.file.Path; import java.nio.file.Paths; import java.util.*; import java.util.stream.Collectors; @@ -324,7 +326,6 @@ public class BookmarkServiceImpl implements BookmarkService { * * @param url url * @return {@link String} - * @throws * @author fanxb */ private String getIconPath(String url) { @@ -343,10 +344,7 @@ public class BookmarkServiceImpl implements BookmarkService { if (iconPath != null) { return iconPath; } - iconPath = saveFile(host, "http://" + host + "/favicon.ico"); - if (StrUtil.isEmpty(iconPath)) { - iconPath = saveFile(host, urlIconAddress + "/icon?url=" + host + "&size=16..64..256"); - } + iconPath = saveFile(host, urlIconAddress + "/icon?url=" + host + "&size=16..64..256"); if (StrUtil.isNotEmpty(iconPath)) { hostIconDao.insert(host, iconPath); } @@ -366,9 +364,9 @@ public class BookmarkServiceImpl implements BookmarkService { 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(CommonConstant.fileSavePath, FileConstant.FAVICON_PATH, host.substring(0, 2), fileName).toString(); - FileUtil.writeBytes(data, filePath); - return filePath; + 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); } diff --git a/bookmark_front/.gitignore b/bookmark_front/.gitignore index c6c57be..c8016d8 100644 --- a/bookmark_front/.gitignore +++ b/bookmark_front/.gitignore @@ -3,6 +3,7 @@ node_modules /dist package-lock.json yarn.lock +public/files # local env files .env.local diff --git a/bookmark_front/public/static/bookmarkBrowserPlugin.7z b/bookmark_front/public/static/bookmarkBrowserPlugin.7z new file mode 100644 index 0000000..b52ae61 Binary files /dev/null and b/bookmark_front/public/static/bookmarkBrowserPlugin.7z differ diff --git a/bookmark_front/src/App.vue b/bookmark_front/src/App.vue index 9ae6af4..be76731 100644 --- a/bookmark_front/src/App.vue +++ b/bookmark_front/src/App.vue @@ -17,7 +17,7 @@ body { margin: 0; padding: 0; font-size: 100px; - // background-color: @bgColor; + background-color: @bgColor; height: initial; } #app { diff --git a/bookmark_front/src/store/modules/treeData.js b/bookmark_front/src/store/modules/treeData.js index 5f91116..9ee7947 100644 --- a/bookmark_front/src/store/modules/treeData.js +++ b/bookmark_front/src/store/modules/treeData.js @@ -30,6 +30,10 @@ export const clear = "clear"; * 删除书签数据 */ export const deleteData = "deleteData"; +/** + * 新增节点 + */ +export const addNode = "addNode"; /** * 版本检查定时调度 @@ -44,321 +48,316 @@ let toastShow = false; * 书签树相关配置 */ const state = { - //全部书签数据 - [TOTAL_TREE_DATA]: {}, - //版本 - [VERSION]: null, - //是否已经初始化书签数据 - [IS_INIT]: false, - // 是否正在加载数据 - [IS_INITING]: false, - [SHOW_REFRESH_TOAST]: false, - [HOME_PIN_LIST]: [], - [HOME_PIN_BOOKMARK_ID_MAP]: {} + //全部书签数据 + [TOTAL_TREE_DATA]: {}, + //版本 + [VERSION]: null, + //是否已经初始化书签数据 + [IS_INIT]: false, + // 是否正在加载数据 + [IS_INITING]: false, + [SHOW_REFRESH_TOAST]: false, + [HOME_PIN_LIST]: [], + [HOME_PIN_BOOKMARK_ID_MAP]: {} }; const getters = { - [getById]: state => id => { - let arr = Object.values(state[TOTAL_TREE_DATA]); - for (let i in arr) { - for (let j in arr[i]) { - if (arr[i][j].bookmarkId === id) { - return arr[i][j]; - } - } - } - return null; - } + [getById]: state => id => { + let arr = Object.values(state[TOTAL_TREE_DATA]); + for (let i in arr) { + for (let j in arr[i]) { + if (arr[i][j].bookmarkId === id) { + return arr[i][j]; + } + } + } + return null; + } }; const actions = { - async [noLoginInit] () { - - }, - async [loginInit] (context) { - if (context.state.isInit || context.state.isIniting) { - return; - } - await context.dispatch(refreshHomePinList); - context.commit(IS_INITING, true); - context.commit(TOTAL_TREE_DATA, await localforage.getItem(TOTAL_TREE_DATA)); - context.commit(VERSION, await localforage.getItem(VERSION)); - await treeDataCheck(context, true); - context.commit(IS_INIT, true); - context.commit(IS_INITING, false); - timer = setInterval(() => treeDataCheck(context, false), CHECK_INTERVAL); - }, - /** - * 确保数据加载完毕 - */ - ensureDataOk (context) { - return new Promise((resolve, reject) => { - let timer = setInterval(() => { - try { - if (context.state[IS_INIT] && context.state[IS_INITING] == false) { - clearInterval(timer); - resolve(); - } - } catch (err) { - reject(err); - } - }, 50); - }); - }, - //刷新缓存数据 - async [refresh] (context) { - let treeData = await HttpUtil.get("/bookmark/currentUser"); - if (!treeData[""]) { - treeData[""] = []; - } - Object.values(treeData).forEach(item => - item.forEach(item1 => { - item1.isLeaf = item1.type === 0; - item1.class = "treeNodeItem"; - item1.scopedSlots = { title: "nodeTitle" }; - }) - ); - let version = await HttpUtil.get("/user/version"); - await context.dispatch("updateVersion", version); - await context.dispatch(refreshHomePinList); - context.commit(TOTAL_TREE_DATA, treeData); - await localforage.setItem(TOTAL_TREE_DATA, treeData); - }, - //清除缓存数据 - async [clear] (context) { - context.commit(TOTAL_TREE_DATA, null); - context.commit(VERSION, null); - context.commit(SHOW_REFRESH_TOAST, false); - context.commit(IS_INIT, false); - context.commit(IS_INITING, false); - context.commit(HOME_PIN_LIST, []); - if (timer != null) { - clearInterval(timer); - } - await localforage.removeItem(TOTAL_TREE_DATA); - await localforage.removeItem(VERSION); - }, - /** - * 移动节点 - */ - async moveNode (context, info) { - let data = context.state[TOTAL_TREE_DATA]; - const target = info.node.dataRef; - const current = info.dragNode.dataRef; - //从原来位置中删除当前节点 - let currentList = data[current.path]; - currentList.splice( - currentList.findIndex(item => item.bookmarkId === current.bookmarkId), - 1 - ); - //请求体 - const body = { - bookmarkId: current.bookmarkId, - sourcePath: current.path, - targetPath: "", - //-1 表示排在最后 - sort: -1 - }; - if (info.dropToGap) { - body.targetPath = target.path; - //移动到目标节点的上面或者下面 - let targetList = data[target.path]; - //目标节点index - let index = targetList.indexOf(target); - //移动节点相对于目标节点位置的增量 - let addIndex = info.dropPosition > index ? 1 : 0; - body.sort = target.sort + addIndex; - targetList.splice(index + addIndex, 0, current); - for (let i = index + 1; i < targetList.length; i++) { - targetList[i].sort += 1; - } - } else { - //移动到一个文件夹下面 - body.targetPath = target.path + "." + target.bookmarkId; - let targetList = data[body.targetPath]; - if (!targetList) { - targetList = []; - data[body.targetPath] = targetList; - } - body.sort = targetList.length > 0 ? targetList[targetList.length - 1].sort + 1 : 1; - targetList.push(current); - } - //更新节点的path和对应子节点path - current.path = body.targetPath; - current.sort = body.sort; - //如果为文件夹还要更新所有子书签的path - if (body.sourcePath !== body.targetPath) { - let keys = Object.keys(data); - //旧路径 - let oldPath = body.sourcePath + "." + current.bookmarkId; - //新路径 - let newPath = body.targetPath + "." + current.bookmarkId; - keys.forEach(item => { - if (!item.startsWith(oldPath)) { - return; - } - let newPathStr = item.replace(oldPath, newPath); - let list = data[item]; - delete data[item]; - data[newPathStr] = list; - list.forEach(item1 => (item1.path = newPathStr)); - }); - } - context.commit(TOTAL_TREE_DATA, context.state[TOTAL_TREE_DATA]); - await context.dispatch("updateVersion", null); - await localforage.setItem(TOTAL_TREE_DATA, state[TOTAL_TREE_DATA]); - return body; - }, - async [refreshHomePinList] ({ commit }) { - let list = await HttpUtil.get("/home/pin"); - commit(HOME_PIN_LIST, list); - let map = {}; - list.filter(item => item.id).forEach(item => map[item.bookmarkId] = true); - commit(HOME_PIN_BOOKMARK_ID_MAP, map); - - }, - /** - * 更新版本数据 - */ - async updateVersion ({ commit, state }, version) { - commit(VERSION, version == null ? state[VERSION] + 1 : version); - await localforage.setItem(VERSION, state[VERSION]); - }, - /** - * 新增书签、文件夹 - */ - async addNode (context, { sourceNode, targetNode }) { - if (sourceNode === null) { - if (context.state[TOTAL_TREE_DATA][""] === undefined) { - context.state[TOTAL_TREE_DATA][""] = []; - } - context.state[TOTAL_TREE_DATA][""].push(targetNode); - } else { - if (sourceNode.children === undefined) { - sourceNode.children = []; - } - sourceNode.children.push(targetNode); - } - if (targetNode.type === 0) { - context.state[TOTAL_TREE_DATA][targetNode.path + "." + targetNode.bookmarkId] = []; - } - targetNode.isLeaf = targetNode.type === 0; - targetNode.class = "treeNodeItem"; - targetNode.scopedSlots = { title: "nodeTitle" }; - context.commit(TOTAL_TREE_DATA, context.state[TOTAL_TREE_DATA]); - await context.dispatch("updateVersion", null); - await localforage.setItem(TOTAL_TREE_DATA, state[TOTAL_TREE_DATA]); - }, - /** - * 删除节点数据 - */ - async [deleteData] (context, { pathList, bookmarkIdList }) { - //待删除的书签 - let bookmarkIdSet = new Set(); - bookmarkIdList.forEach(item => bookmarkIdSet.add(item)); - //删除子节点 - pathList.forEach(item => { - delete state[TOTAL_TREE_DATA][item]; - Object.keys(context.state[TOTAL_TREE_DATA]) - .filter(key => key.startsWith(item + ".")) - .forEach(key => delete state[TOTAL_TREE_DATA][key]); - bookmarkIdSet.add(parseInt(item.split(".").reverse())); - }); - //删除直接选中的节点 - Object.keys(context.state[TOTAL_TREE_DATA]).forEach(item => { - let list = context.state[TOTAL_TREE_DATA][item]; - for (let i = list.length - 1; i >= 0; i--) { - if (bookmarkIdSet.has(list[i].bookmarkId)) { - list.splice(i, 1); - } - } - }); - context.commit(TOTAL_TREE_DATA, context.state[TOTAL_TREE_DATA]); - await context.dispatch("updateVersion", null); - await localforage.setItem(TOTAL_TREE_DATA, state[TOTAL_TREE_DATA]); - }, - /** - * 编辑书签节点 - */ - async editNode ({ dispatch, state, commit }, { node, newName, newUrl, newIcon }) { - node.name = newName; - node.url = newUrl; - node.icon = newIcon; - commit(TOTAL_TREE_DATA, state[TOTAL_TREE_DATA]); - await dispatch("updateVersion", null); - await localforage.setItem(TOTAL_TREE_DATA, state[TOTAL_TREE_DATA]); - } + async [noLoginInit]() {}, + async [loginInit](context) { + if (context.state.isInit || context.state.isIniting) { + return; + } + await context.dispatch(refreshHomePinList); + context.commit(IS_INITING, true); + context.commit(TOTAL_TREE_DATA, await localforage.getItem(TOTAL_TREE_DATA)); + context.commit(VERSION, await localforage.getItem(VERSION)); + await treeDataCheck(context, true); + context.commit(IS_INIT, true); + context.commit(IS_INITING, false); + timer = setInterval(() => treeDataCheck(context, false), CHECK_INTERVAL); + }, + /** + * 确保数据加载完毕 + */ + ensureDataOk(context) { + return new Promise((resolve, reject) => { + let timer = setInterval(() => { + try { + if (context.state[IS_INIT] && context.state[IS_INITING] == false) { + clearInterval(timer); + resolve(); + } + } catch (err) { + reject(err); + } + }, 50); + }); + }, + //刷新缓存数据 + async [refresh](context) { + let treeData = await HttpUtil.get("/bookmark/currentUser"); + if (!treeData[""]) { + treeData[""] = []; + } + Object.values(treeData).forEach(item => + item.forEach(item1 => { + item1.isLeaf = item1.type === 0; + item1.class = "treeNodeItem"; + item1.scopedSlots = { title: "nodeTitle" }; + }) + ); + let version = await HttpUtil.get("/user/version"); + await context.dispatch("updateVersion", version); + await context.dispatch(refreshHomePinList); + context.commit(TOTAL_TREE_DATA, treeData); + await localforage.setItem(TOTAL_TREE_DATA, treeData); + }, + //清除缓存数据 + async [clear](context) { + context.commit(TOTAL_TREE_DATA, null); + context.commit(VERSION, null); + context.commit(SHOW_REFRESH_TOAST, false); + context.commit(IS_INIT, false); + context.commit(IS_INITING, false); + context.commit(HOME_PIN_LIST, []); + if (timer != null) { + clearInterval(timer); + } + await localforage.removeItem(TOTAL_TREE_DATA); + await localforage.removeItem(VERSION); + }, + /** + * 移动节点 + */ + async moveNode(context, info) { + let data = context.state[TOTAL_TREE_DATA]; + const target = info.node.dataRef; + const current = info.dragNode.dataRef; + //从原来位置中删除当前节点 + let currentList = data[current.path]; + currentList.splice( + currentList.findIndex(item => item.bookmarkId === current.bookmarkId), + 1 + ); + //请求体 + const body = { + bookmarkId: current.bookmarkId, + sourcePath: current.path, + targetPath: "", + //-1 表示排在最后 + sort: -1 + }; + if (info.dropToGap) { + body.targetPath = target.path; + //移动到目标节点的上面或者下面 + let targetList = data[target.path]; + //目标节点index + let index = targetList.indexOf(target); + //移动节点相对于目标节点位置的增量 + let addIndex = info.dropPosition > index ? 1 : 0; + body.sort = target.sort + addIndex; + targetList.splice(index + addIndex, 0, current); + for (let i = index + 1; i < targetList.length; i++) { + targetList[i].sort += 1; + } + } else { + //移动到一个文件夹下面 + body.targetPath = target.path + "." + target.bookmarkId; + let targetList = data[body.targetPath]; + if (!targetList) { + targetList = []; + data[body.targetPath] = targetList; + } + body.sort = targetList.length > 0 ? targetList[targetList.length - 1].sort + 1 : 1; + targetList.push(current); + } + //更新节点的path和对应子节点path + current.path = body.targetPath; + current.sort = body.sort; + //如果为文件夹还要更新所有子书签的path + if (body.sourcePath !== body.targetPath) { + let keys = Object.keys(data); + //旧路径 + let oldPath = body.sourcePath + "." + current.bookmarkId; + //新路径 + let newPath = body.targetPath + "." + current.bookmarkId; + keys.forEach(item => { + if (!item.startsWith(oldPath)) { + return; + } + let newPathStr = item.replace(oldPath, newPath); + let list = data[item]; + delete data[item]; + data[newPathStr] = list; + list.forEach(item1 => (item1.path = newPathStr)); + }); + } + context.commit(TOTAL_TREE_DATA, context.state[TOTAL_TREE_DATA]); + await context.dispatch("updateVersion", null); + await localforage.setItem(TOTAL_TREE_DATA, state[TOTAL_TREE_DATA]); + return body; + }, + async [refreshHomePinList]({ commit }) { + let list = await HttpUtil.get("/home/pin"); + commit(HOME_PIN_LIST, list); + let map = {}; + list.filter(item => item.id).forEach(item => (map[item.bookmarkId] = true)); + commit(HOME_PIN_BOOKMARK_ID_MAP, map); + }, + /** + * 更新版本数据 + */ + async updateVersion({ commit, state }, version) { + commit(VERSION, version == null ? state[VERSION] + 1 : version); + await localforage.setItem(VERSION, state[VERSION]); + }, + /** + * 新增书签、文件夹 + */ + async [addNode](context, { sourceNode, targetNode }) { + if (sourceNode === null) { + if (context.state[TOTAL_TREE_DATA][""] === undefined) { + context.state[TOTAL_TREE_DATA][""] = []; + } + context.state[TOTAL_TREE_DATA][""].push(targetNode); + } else { + if (sourceNode.children === undefined) { + sourceNode.children = []; + } + sourceNode.children.push(targetNode); + } + if (targetNode.type === 0) { + context.state[TOTAL_TREE_DATA][targetNode.path + "." + targetNode.bookmarkId] = []; + } + targetNode.isLeaf = targetNode.type === 0; + targetNode.class = "treeNodeItem"; + targetNode.scopedSlots = { title: "nodeTitle" }; + context.commit(TOTAL_TREE_DATA, context.state[TOTAL_TREE_DATA]); + await context.dispatch("updateVersion", null); + await localforage.setItem(TOTAL_TREE_DATA, state[TOTAL_TREE_DATA]); + }, + /** + * 删除节点数据 + */ + async [deleteData](context, { pathList, bookmarkIdList }) { + //待删除的书签 + let bookmarkIdSet = new Set(); + bookmarkIdList.forEach(item => bookmarkIdSet.add(item)); + //删除子节点 + pathList.forEach(item => { + delete state[TOTAL_TREE_DATA][item]; + Object.keys(context.state[TOTAL_TREE_DATA]) + .filter(key => key.startsWith(item + ".")) + .forEach(key => delete state[TOTAL_TREE_DATA][key]); + bookmarkIdSet.add(parseInt(item.split(".").reverse())); + }); + //删除直接选中的节点 + Object.keys(context.state[TOTAL_TREE_DATA]).forEach(item => { + let list = context.state[TOTAL_TREE_DATA][item]; + for (let i = list.length - 1; i >= 0; i--) { + if (bookmarkIdSet.has(list[i].bookmarkId)) { + list.splice(i, 1); + } + } + }); + context.commit(TOTAL_TREE_DATA, context.state[TOTAL_TREE_DATA]); + await context.dispatch("updateVersion", null); + await localforage.setItem(TOTAL_TREE_DATA, state[TOTAL_TREE_DATA]); + }, + /** + * 编辑书签节点 + */ + async editNode({ dispatch, state, commit }, { node, newName, newUrl, newIcon }) { + node.name = newName; + node.url = newUrl; + node.icon = newIcon; + commit(TOTAL_TREE_DATA, state[TOTAL_TREE_DATA]); + await dispatch("updateVersion", null); + await localforage.setItem(TOTAL_TREE_DATA, state[TOTAL_TREE_DATA]); + } }; const mutations = { - [TOTAL_TREE_DATA]: (state, totalTreeData) => { - state.totalTreeData = totalTreeData; - }, - [IS_INIT] (state, isInit) { - state.isInit = isInit; - }, - [IS_INITING] (state, isIniting) { - state.isIniting = isIniting; - }, - [VERSION]: (state, version) => { - state[VERSION] = version; - }, - [SHOW_REFRESH_TOAST]: (state, val) => { - state[SHOW_REFRESH_TOAST] = val; - }, - [HOME_PIN_LIST]: (state, val) => { - state[HOME_PIN_LIST] = val; - }, - [HOME_PIN_BOOKMARK_ID_MAP]: (state, val) => { - state[HOME_PIN_BOOKMARK_ID_MAP] = val; - } + [TOTAL_TREE_DATA]: (state, totalTreeData) => { + state.totalTreeData = totalTreeData; + }, + [IS_INIT](state, isInit) { + state.isInit = isInit; + }, + [IS_INITING](state, isIniting) { + state.isIniting = isIniting; + }, + [VERSION]: (state, version) => { + state[VERSION] = version; + }, + [SHOW_REFRESH_TOAST]: (state, val) => { + state[SHOW_REFRESH_TOAST] = val; + }, + [HOME_PIN_LIST]: (state, val) => { + state[HOME_PIN_LIST] = val; + }, + [HOME_PIN_BOOKMARK_ID_MAP]: (state, val) => { + state[HOME_PIN_BOOKMARK_ID_MAP] = val; + } }; - /** * 检查书签缓存是否最新 - * - * @param {*} context - * @param {*} isFirst - * @returns + * + * @param {*} context + * @param {*} isFirst + * @returns */ -async function treeDataCheck (context, isFirst) { - if (toastShow || !checkJwtValid(context.rootState.globalConfig.token)) { - return; - } - let realVersion = await HttpUtil.get("/user/version"); - if (realVersion !== context.state[VERSION]) { - if (context.state[SHOW_REFRESH_TOAST] && !isFirst) { - //如果在书签管理页面需要弹窗提示 - window.vueInstance.$confirm({ - title: "书签数据有更新，是否立即刷新？", - cancelText: "稍后提醒", - closable: false, - keyboard: false, - maskClosable: false, - onOk () { - toastShow = false; - return new Promise(async (resolve) => { - await context.dispatch(refresh); - resolve(); - }); - }, - onCancel () { - toastShow = false; - } - }); - toastShow = true; - } else { - await context.dispatch(refresh); - } - } +async function treeDataCheck(context, isFirst) { + if (toastShow || !checkJwtValid(context.rootState.globalConfig.token)) { + return; + } + let realVersion = await HttpUtil.get("/user/version"); + if (realVersion !== context.state[VERSION]) { + if (context.state[SHOW_REFRESH_TOAST] && !isFirst) { + //如果在书签管理页面需要弹窗提示 + window.vueInstance.$confirm({ + title: "书签数据有更新，是否立即刷新？", + cancelText: "稍后提醒", + closable: false, + keyboard: false, + maskClosable: false, + onOk() { + toastShow = false; + return new Promise(async resolve => { + await context.dispatch(refresh); + resolve(); + }); + }, + onCancel() { + toastShow = false; + } + }); + toastShow = true; + } else { + await context.dispatch(refresh); + } + } } export const store = { - namespaced: true, - state, - getters, - actions, - mutations + namespaced: true, + state, + getters, + actions, + mutations }; - diff --git a/bookmark_front/src/views/manage/bookmarkTree/index.vue b/bookmark_front/src/views/manage/bookmarkTree/index.vue index 892b890..1e4442e 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,14 +147,21 @@ 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); @@ -168,7 +175,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]) { @@ -212,9 +219,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(); @@ -228,7 +235,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 ); } @@ -248,9 +255,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 { @@ -273,7 +280,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) ); } @@ -290,7 +297,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) { @@ -322,13 +329,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; }, /** @@ -344,7 +351,7 @@ export default { this.addModal = { show: false, targetNode: null, - isAdd: false, + isAdd: false }; }, async onDrop(info) { @@ -388,12 +395,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 { @@ -411,8 +418,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 1e9c1bc..c7596dd 100644 --- a/bookmark_front/src/views/noHead/addBookmark/index.vue +++ b/bookmark_front/src/views/noHead/addBookmark/index.vue @@ -1,17 +1,17 @@ diff --git a/浏览器插件/bookmarkBrowserPlugin/background.js b/浏览器插件/bookmarkBrowserPlugin/background.js index 0cbee6b..d42af06 100644 --- a/浏览器插件/bookmarkBrowserPlugin/background.js +++ b/浏览器插件/bookmarkBrowserPlugin/background.js @@ -15,7 +15,6 @@ 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") }); }); diff --git a/浏览器插件/bookmarkBrowserPlugin/manifest.json b/浏览器插件/bookmarkBrowserPlugin/manifest.json index ca0f0e9..1e99669 100644 --- a/浏览器插件/bookmarkBrowserPlugin/manifest.json +++ b/浏览器插件/bookmarkBrowserPlugin/manifest.json @@ -1,6 +1,6 @@ { - "name": "bookmark-chrome", - "description": "A Vue.js web extension", + "name": "签签世界", + "description": "云书签管理平台", "version": "1.0", "manifest_version": 3, "permissions": ["contextMenus", "storage"], @@ -8,8 +8,8 @@ "default_popup": "popup/index.html" }, "icons": { - "48": "static/icons/icon_48.png", - "128": "static/icons/icon_128.png" + "48": "static/icons/favicon.png", + "128": "static/icons/favicon.png" }, "background": { "service_worker": "background.js" diff --git a/浏览器插件/bookmarkBrowserPlugin/popup/index.html b/浏览器插件/bookmarkBrowserPlugin/popup/index.html index a3b8ae9..d82fbaa 100644 --- a/浏览器插件/bookmarkBrowserPlugin/popup/index.html +++ b/浏览器插件/bookmarkBrowserPlugin/popup/index.html @@ -19,10 +19,11 @@ 点击登录

+
插件版本：
diff --git a/浏览器插件/bookmarkBrowserPlugin/popup/index.js b/浏览器插件/bookmarkBrowserPlugin/popup/index.js index 5869476..04e6582 100644 --- a/浏览器插件/bookmarkBrowserPlugin/popup/index.js +++ b/浏览器插件/bookmarkBrowserPlugin/popup/index.js @@ -8,6 +8,7 @@ var action = document.getElementById("action"); (async () => { //初始化 login.href = bookmarkHost + "/manage/sso/auth"; + document.getElementById("version").innerText = version; sendToBg("getToken", null); })(); diff --git a/浏览器插件/bookmarkBrowserPlugin/static/icons/favicon.ico b/浏览器插件/bookmarkBrowserPlugin/static/icons/favicon.ico new file mode 100644 index 0000000..f354250 Binary files /dev/null and b/浏览器插件/bookmarkBrowserPlugin/static/icons/favicon.ico differ diff --git a/浏览器插件/bookmarkBrowserPlugin/static/icons/favicon.png b/浏览器插件/bookmarkBrowserPlugin/static/icons/favicon.png new file mode 100644 index 0000000..a3dff88 Binary files /dev/null and b/浏览器插件/bookmarkBrowserPlugin/static/icons/favicon.png differ diff --git a/浏览器插件/bookmarkBrowserPlugin/static/icons/icon.xcf b/浏览器插件/bookmarkBrowserPlugin/static/icons/icon.xcf deleted file mode 100644 index e1cde95..0000000 Binary files a/浏览器插件/bookmarkBrowserPlugin/static/icons/icon.xcf and /dev/null differ diff --git a/浏览器插件/bookmarkBrowserPlugin/static/icons/icon_128.png b/浏览器插件/bookmarkBrowserPlugin/static/icons/icon_128.png deleted file mode 100644 index c4ed868..0000000 Binary files a/浏览器插件/bookmarkBrowserPlugin/static/icons/icon_128.png and /dev/null differ diff --git a/浏览器插件/bookmarkBrowserPlugin/static/icons/icon_48.png b/浏览器插件/bookmarkBrowserPlugin/static/icons/icon_48.png deleted file mode 100644 index e2d41f1..0000000 Binary files a/浏览器插件/bookmarkBrowserPlugin/static/icons/icon_48.png and /dev/null differ diff --git a/浏览器插件/bookmarkBrowserPlugin/static/js/config.js b/浏览器插件/bookmarkBrowserPlugin/static/js/config.js index ca2605b..bc1301e 100644 --- a/浏览器插件/bookmarkBrowserPlugin/static/js/config.js +++ b/浏览器插件/bookmarkBrowserPlugin/static/js/config.js @@ -1,6 +1,7 @@ -// var bookmarkHost = "https://fleyx.com"; -var bookmarkHost = "http://localhost:8080"; +var bookmarkHost = "https://fleyx.com"; +// var bookmarkHost = "http://localhost:8080"; +var version = "0.1"; window.token = localStorage.getItem('token'); axios.defaults.baseURL = bookmarkHost + '/bookmark/api';