diff --git a/README.md b/README.md index c474e55..d6e8646 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ 部署教程:[docker-compose 部署](https://github.com/FleyX/bookmark/blob/master/DEPLOY.md) +**为获得更好的体验,建议将主页设置为 fleyx.com,并安装浏览器拓展** + # 缘由 1. 主要用的是 chrome,但是有时候需要用其他的浏览器:Firefox,ie 等。然后这些浏览器上没有书签,想进个网站还得打开 chrome 复制 url,太麻烦。 diff --git a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/dao/GlobalConfigDao.java b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/dao/GlobalConfigDao.java new file mode 100644 index 0000000..983012d --- /dev/null +++ b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/dao/GlobalConfigDao.java @@ -0,0 +1,14 @@ +package com.fanxb.bookmark.common.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fanxb.bookmark.common.entity.po.GlobalConfigPo; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @author fanxb + */ +@Mapper +public interface GlobalConfigDao extends BaseMapper { +} diff --git a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/po/GlobalConfigPo.java b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/po/GlobalConfigPo.java new file mode 100644 index 0000000..28f3e4d --- /dev/null +++ b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/po/GlobalConfigPo.java @@ -0,0 +1,20 @@ +package com.fanxb.bookmark.common.entity.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * 全局配置表 + * + * @author FleyX + */ +@Data +@TableName("global_config") +public class GlobalConfigPo { + @TableId(value = "code") + private String code; + private String value; + private String description; +} diff --git a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/vo/GlobalConfigVo.java b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/vo/GlobalConfigVo.java index 30a52bd..821510e 100644 --- a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/vo/GlobalConfigVo.java +++ b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/vo/GlobalConfigVo.java @@ -2,6 +2,8 @@ package com.fanxb.bookmark.common.entity.vo; import lombok.Data; +import java.util.Map; + /** * 全局公共配置 * @@ -17,4 +19,8 @@ public class GlobalConfigVo { * bing每日一图地址 */ private String bingImgSrc; + /** + * 浏览器插件版本plugin + */ + private Map map; } diff --git a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/service/impl/ConfigServiceImpl.java b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/service/impl/ConfigServiceImpl.java index 26c0866..7384f46 100644 --- a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/service/impl/ConfigServiceImpl.java +++ b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/service/impl/ConfigServiceImpl.java @@ -6,6 +6,8 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.fanxb.bookmark.common.constant.NumberConstant; import com.fanxb.bookmark.common.constant.RedisConstant; +import com.fanxb.bookmark.common.dao.GlobalConfigDao; +import com.fanxb.bookmark.common.entity.po.GlobalConfigPo; import com.fanxb.bookmark.common.entity.vo.GlobalConfigVo; import com.fanxb.bookmark.common.service.ConfigService; import com.fanxb.bookmark.common.util.HttpUtil; @@ -15,10 +17,9 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; +import java.util.*; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; /** * @author fanxb @@ -30,10 +31,12 @@ public class ConfigServiceImpl implements ConfigService { private final StringRedisTemplate stringRedisTemplate; + private final GlobalConfigDao globalConfigDao; @Autowired - public ConfigServiceImpl(StringRedisTemplate stringRedisTemplate) { + public ConfigServiceImpl(StringRedisTemplate stringRedisTemplate, GlobalConfigDao globalConfigDao) { this.stringRedisTemplate = stringRedisTemplate; + this.globalConfigDao = globalConfigDao; } @Value("${bing.host}") @@ -43,9 +46,12 @@ public class ConfigServiceImpl implements ConfigService { @Override public GlobalConfigVo getGlobalConfig() { + List pos = globalConfigDao.selectByMap(Collections.emptyMap()); + Map map = pos.stream().collect(Collectors.toMap(GlobalConfigPo::getCode, GlobalConfigPo::getValue)); GlobalConfigVo vo = new GlobalConfigVo(); vo.setProxyExist(HttpUtil.getProxyExist()); vo.setBingImgSrc(getCacheBingImg()); + vo.setMap(map); return vo; } diff --git a/bookMarkService/web/src/main/resources/db/migration/V22__新增全局配置表.sql b/bookMarkService/web/src/main/resources/db/migration/V22__新增全局配置表.sql new file mode 100644 index 0000000..6abeec2 --- /dev/null +++ b/bookMarkService/web/src/main/resources/db/migration/V22__新增全局配置表.sql @@ -0,0 +1,13 @@ +CREATE TABLE bookmark.global_config +( + code varchar(20) NOT NULL, + value varchar(100) NOT NULL COMMENT '值', + description varchar(100) NOT NULL COMMENT '描述', + CONSTRAINT global_config_pk PRIMARY KEY (code) +) ENGINE=InnoDB +DEFAULT CHARSET=utf8mb4 +COLLATE=utf8mb4_0900_ai_ci +COMMENT='全局配置表'; + +insert into global_config +values ("pluginVersion", "0.1.1", "浏览器插件版本"); diff --git a/bookmark_front/src/views/public/about/index.vue b/bookmark_front/src/views/public/about/index.vue index 6aa8563..9c866be 100644 --- a/bookmark_front/src/views/public/about/index.vue +++ b/bookmark_front/src/views/public/about/index.vue @@ -11,7 +11,7 @@
浏览器插件: - 点击下载 + 最新版本{{ serverConfig.map.pluginVersion }}(注意更新) ,使用详情请参考使用教程
交流反馈qq群:150056494,邮箱:fleyx20@outlook.com
@@ -34,8 +34,14 @@ diff --git a/浏览器插件/bookmarkBrowserPlugin/popup/index.html b/浏览器插件/bookmarkBrowserPlugin/popup/index.html index d82fbaa..43bed80 100644 --- a/浏览器插件/bookmarkBrowserPlugin/popup/index.html +++ b/浏览器插件/bookmarkBrowserPlugin/popup/index.html @@ -8,7 +8,7 @@ html, body { padding: 0.2em; - width: 8em; + min-width: 8em; } #content { color: red; @@ -23,7 +23,11 @@

-
插件版本:
+
+
插件版本:
+
最新版本:最新版本
+ +
diff --git a/浏览器插件/bookmarkBrowserPlugin/popup/index.js b/浏览器插件/bookmarkBrowserPlugin/popup/index.js index 04e6582..3aeeb0d 100644 --- a/浏览器插件/bookmarkBrowserPlugin/popup/index.js +++ b/浏览器插件/bookmarkBrowserPlugin/popup/index.js @@ -9,7 +9,13 @@ var action = document.getElementById("action"); //初始化 login.href = bookmarkHost + "/manage/sso/auth"; document.getElementById("version").innerText = version; + document.getElementById("about").href = bookmarkHost + "/public/about"; sendToBg("getToken", null); + let newestBlock = document.getElementById("newestVersion"); + newestBlock.href = bookmarkHost + "/static/bookmarkBrowserPlugin.zip"; + let res = await axios.get("/common/config/global"); + console.log(res); + newestBlock.innerText = res.data.data.map.pluginVersion; })(); /**