429 Commits

Author SHA1 Message Date
fanxb
c9429557b3 Merge pull request 'fix:修复bookmark缺陷' (#11) from dev into master
Reviewed-on: #11
2023-02-16 19:01:59 +08:00
fanxb
928e3fac48 fix:修复bookmark缺陷 2023-02-16 19:07:40 +08:00
fanxb
4bed4fd34d docs:修改文档 2022-12-05 19:09:28 +08:00
fanxb
5d52e389d6 Merge pull request 'docs:修改文档' (#10) from dev into master
Reviewed-on: #10
2022-12-05 19:05:42 +08:00
fanxb
767c26d89b docs:文档修改 2022-12-04 20:52:58 +08:00
fanxb
83125ae55a Merge pull request 'dev' (#9) from dev into master
Reviewed-on: #9
2022-12-04 20:49:07 +08:00
fanxb
b5f715eda6 Merge pull request 'master' (#8) from master into dev
Reviewed-on: #8
2022-12-04 19:04:45 +08:00
fanxb
cc3298f3b4 fix:修改arm上编译报错 2022-12-04 18:34:44 +08:00
fanxb
2b69814296 更新 'README.md' 2022-11-25 23:19:01 +08:00
fanxb
2880b6282c Merge pull request 'fix:修复定时任务线程池不起作用' (#7) from dev into master
Reviewed-on: #7
2022-09-24 18:50:34 +08:00
fanxb
ff560ae790 fix:修复定时任务线程池不起作用 2022-09-24 18:50:18 +08:00
fanxb
c5a35ea54e Merge pull request 'fix:修复定时任务线程池不起作用' (#6) from dev into master
Reviewed-on: #6
2022-09-24 18:44:57 +08:00
fanxb
22c2c48eea Merge branch 'master' into dev 2022-09-24 18:44:50 +08:00
fanxb
580d18a500 fix:修复定时任务线程池不起作用 2022-09-24 18:45:20 +08:00
fanxb
5868aa4a98 Merge pull request 'dev' (#5) from dev into master
Reviewed-on: #5
2022-09-24 17:19:27 +08:00
fanxb
42cbbe5999 deploy:增加drone部署 2022-09-24 17:15:51 +08:00
fanxb
9dc21ed87a Merge pull request 'master' (#3) from master into dev
Reviewed-on: #3
2022-09-24 17:00:35 +08:00
fanxb
32e63ed1fb Merge pull request 'deploy:增加drone部署' (#2) from dev into master
Reviewed-on: #2
2022-09-24 17:00:20 +08:00
fanxb
35ee930661 Merge remote-tracking branch 'origin/master' 2022-09-24 16:59:07 +08:00
fanxb
19aeab2856 deploy:增加drone部署 2022-09-24 16:56:21 +08:00
FleyX
866ce22bb5
Merge pull request #38 from FleyX/dev
Dev
2022-09-22 19:50:45 +08:00
FleyX
84c2c213a9
Merge pull request #37 from FleyX/dependabot/maven/bookMarkService/business/bookmark/org.jsoup-jsoup-1.15.3
build(deps): bump jsoup from 1.14.3 to 1.15.3 in /bookMarkService/business/bookmark
2022-09-21 16:35:44 +08:00
dependabot[bot]
9cc1a7b871
build(deps): bump jsoup in /bookMarkService/business/bookmark
Bumps [jsoup](https://github.com/jhy/jsoup) from 1.14.3 to 1.15.3.
- [Release notes](https://github.com/jhy/jsoup/releases)
- [Changelog](https://github.com/jhy/jsoup/blob/master/CHANGES)
- [Commits](https://github.com/jhy/jsoup/compare/jsoup-1.14.3...jsoup-1.15.3)

---
updated-dependencies:
- dependency-name: org.jsoup:jsoup
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-01 23:51:05 +00:00
fanxb
5e12b5a8b1 fix:修复定时任务线程池不起作用 2022-07-18 20:25:24 +08:00
fanxb
8ab7d0c341 Merge branch 'dev' of fanxb/bookmark into master 2022-07-10 13:18:36 +08:00
fanxb
4b9adc3acd Merge branch 'dev' of ssh://git.fleyx.com:2200/fanxb/bookmark into dev 2022-07-10 13:16:47 +08:00
fanxb
a67ef95b25 feat:修改域名 2022-07-10 13:16:44 +08:00
fanxb
39e9f8221a Merge branch 'dev' of fanxb/bookmark into master 2022-07-08 10:27:54 +08:00
fanxb
40cdb1f19e fix:样式细节修复 2022-07-08 10:27:20 +08:00
fanxb
106dccb68f Merge branch 'dev' of fanxb/bookmark into master 2022-07-08 10:22:49 +08:00
fanxb
5aeae15228 feat:增加背景下载按钮 2022-07-08 10:15:52 +08:00
FleyX
837a4a7650
Merge pull request #35 from FleyX/dev
fix:修复fastjsonbug
2022-05-28 20:34:05 +08:00
fanxb
8c81842571 Merge branch 'dev' of fanxb/bookmark into master 2022-05-28 20:33:26 +08:00
fanxb
64d4504178 fix:修复fastjsonbug 2022-05-28 20:33:07 +08:00
FleyX
3072d757f0
Merge pull request #34 from FleyX/dev
Dev
2022-05-12 16:39:36 +08:00
FleyX
62c88d78fc Update README.md 2022-05-12 16:38:32 +08:00
FleyX
ff323e6eea
Update README.md 2022-05-12 16:34:44 +08:00
fanxb
e240905d58 Merge branch 'dev' of fanxb/bookmark into master 2022-05-12 16:32:43 +08:00
fanxb
f23e720fb9 fix:修改注释 2022-05-12 16:30:28 +08:00
fanxb
faffadeba9 Merge branch 'dev' of fanxb/bookmark into master 2022-05-11 17:15:11 +08:00
fanxb
b2353a0ea1 feat:细节优化 2022-05-11 17:13:50 +08:00
fanxb
d5e2b55c28 refactor:日志打印级别改为debug 2022-05-11 14:30:38 +08:00
FleyX
35910c34e1
Merge pull request #33 from FleyX/dev
Dev
2022-04-28 10:46:28 +08:00
fanxb
d19325aaad Merge branch 'dev' of fanxb/bookmark into master 2022-04-28 10:45:39 +08:00
fanxb
df5578f267 refactor:优化请求,避免白屏时间过长 2022-04-28 10:43:05 +08:00
fanxb
9a5a4cae52 Merge branch 'dev' of fanxb/bookmark into master 2022-04-23 14:27:18 +08:00
fanxb
9a689cac65 fix:修复host_icon表数据重复问题 2022-04-23 14:26:29 +08:00
fanxb
238cc21ffa Merge branch 'dev' of fanxb/bookmark into master 2022-04-19 18:10:21 +08:00
fanxb
b950c666cc feat:新增书签可选择文件夹保持 2022-04-19 18:09:51 +08:00
fanxb
828207f672 temp 2022-04-19 17:17:34 +08:00