github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity
2,211 Commits
26 Branches
208 Tags
128 MiB
Commit Graph

1868 Commits (9fdc9c1bb7a4d305808080184711833c702918c8)

Author SHA1 Message Date
肥鱼先生 cdb7e2cdc1
style: set the color of log to default after banner (#1321) 2021-03-24 00:50:44 +08:00
知雨 54b409ac2b
feat: add index page to sitemap.xml (#1318) 2021-03-17 18:31:57 +08:00
Ryan Wang 30c50f61f8 release: 1.4.7 2021-03-14 12:53:07 +08:00
Ryan Wang a72131de85 release: 1.4.7-beta.1 2021-03-14 12:34:56 +08:00
Ryan Wang 3235179ac2
feat: #1313 (#1315) 2021-03-14 11:49:10 +08:00
Ryan Wang 8e9f8007ca release: 1.4.6. 2021-03-07 22:42:08 +08:00
John Niang 7ba2377ae8
Remove random theme folder generation (#1305) 2021-03-07 22:39:38 +08:00
John Niang caab2f3b93
Refactor system configuration (#1303) 
* Refactor application*.yml

* Remove application-user.yaml

* Fix invalid config for aspect
 2021-03-07 21:43:18 +08:00
Ryan Wang c6a8757436
chore: sync default theme. (#1304) 2021-03-07 21:31:57 +08:00
John Niang 2b7ae41c02
Fix error about response committed (#1301) 
* Add index page request test

* Add test for first page request

* Create session before requesting content
 2021-03-07 15:48:24 +08:00
John Niang 38093df0c0
Fix error for updating activated theme (#1300) 2021-03-07 11:38:11 +08:00
John Niang 3019fe0d34
Make more tolerant of reading image (#1298) 2021-03-06 01:10:52 +08:00
John Niang c22348e03a
Upgrade spring boot version (#1289) 
* Update gradle wrapper version

* Update spring boot version to 2.5.0-M2

* Fix wrong const of temp_dir

* Refactor error controller

* Fix startup error due to theme not found

* Refine error controller handler

* Refine multipart resolver config

* Fix ThemeRepositoryImplTest error

* Fix freemarker not found error

* chore: change jetty to undertow.

* Remove useless throws

Co-authored-by: Ryan Wang <i@ryanc.cc>
 2021-03-06 00:58:12 +08:00
Li 696a9ad2ee
feat: 扩展 freemarker 实现 block (#1295) 
* fix #950 附件不存在时删除报错的问题

* pref: 扩展 freemarker 增加 block 功能

close #1292

* checkStyle

* add unit test

* update test
 2021-03-05 23:37:02 +08:00
Ryan Wang 3571b3f0af
pref: init default theme. (#1297) 2021-03-05 23:36:39 +08:00
Ryan Wang ae73515537
pref: #1050 (#1287) 2021-02-27 13:34:37 +08:00
John Niang 65ed8b84af
Cache current theme in theme repository (#1286) 2021-02-25 22:39:40 +08:00
Ryan Wang 29466c5c76
fix: theme update by upload. (#1284) 2021-02-25 20:32:39 +08:00
Ryan Wang 867d1703ae
feat: support import user. (#1283) 2021-02-24 18:21:24 +08:00
Ryan Wang a848b734b7
fix: fetch work dir backup api. (#1282) 2021-02-22 09:22:23 +08:00
John Niang b412d5da2d
Fix incorrect cache lock of journal like api (#1279) 2021-02-19 23:32:57 +08:00
John Niang b57712e23e
Provide backup dto fetch api (#1278) 
* Fix swagger security reference config error

* Add backup dto fetch api

* Rearrange fetch api
 2021-02-19 23:26:17 +08:00
John Niang 49a461f245
Fix Page response model inconsistent in swagger ui (#1277) 2021-02-19 21:35:37 +08:00
Elvys Soares cdc15942cf
pref: grouping assertions (#1273) 
* Grouping assertions

Signed-off-by: Elvys Soares <eas5@cin.ufpe.br>

* Grouping assertions

Signed-off-by: Elvys Soares <eas5@cin.ufpe.br>

* Grouping assertions

Signed-off-by: Elvys Soares <eas5@cin.ufpe.br>

* fix: code style check.

Co-authored-by: Ryan Wang <i@ryanc.cc>
 2021-02-19 21:14:51 +08:00
Ryan Wang b591595541 release: 1.4.5. 2021-02-08 20:20:06 +08:00
Ryan Wang d508948dea
pref: sitemap.xml (#1267) 2021-02-08 19:56:36 +08:00
Ryan Wang 48ca0492d1
pref: journals likes api. (#1266) 2021-02-08 19:24:07 +08:00
Ryan Wang f567b94f91
fix: category authentication redirect url. (#1264) 2021-02-08 19:22:20 +08:00
Ryan Wang d509305998 release: 1.4.4. 2021-02-07 21:26:08 +08:00
Ryan Wang 92503e3822
fix: #1255. (#1256) 
* fix: #1255.

* fix: #1255.
 2021-02-05 23:22:04 +08:00
zhixiangyuan 7b88fcab5f
feat: #1225 (#1235) 
* feat: #1225

* fix: compatible with jdk1.8

* fix: format code

* fix: fix the problem that the status of the recycle bin file is incorrect when revocering

* fix: format code

* fix: format code

* fix: fix the post cannot be converted to recyling mode

* fix: post cannot be published on deleting the category password

* fix: fix jpa error

* fix: format code

* fix: encryption type extracted into enum

* fix: format code

* fix: format code

* fix: changes requested

* fix: format code

* fix: revert checkstyle.xml

* fix: change request

* fix: not encrypt 方法改为重载方法

* fix: 修复因调整 git 版本被回退的代码

Co-authored-by: xiangbei.yzx <xiangbei.yzx@alibaba-inc.com>
 2021-01-31 14:48:52 +08:00
Ryan Wang a854adf53a release: 1.4.3. 2021-01-28 00:46:35 +08:00
Ryan Wang bbde1a7727
doc: add document website. (#1215) 
* doc: add document website.

* doc: add document website.

* doc: add document website.
 2021-01-28 00:42:16 +08:00
Ryan Wang 17b847082a
fix: unable to access custom sheet. (#1246) 2021-01-28 00:20:46 +08:00
John Niang be5c60083c
Fix folder copy error: ProviderMismatchException (#1249) 2021-01-28 00:19:22 +08:00
John Niang 30c9baf92b
Fix theme updation error (#1217) 
* Make rest controller loggable

* Refactor pull from git process

* Replace Callback interface with Consumer

* Tag theme fetch apis and services deprecated

* Add getAllBranchesTest

* Refactor theme fetcher partially

* Refactor theme property scanner

* Add ThemeFetcherComposite

* Add InputStreamThemeFetcher

* Accomplish multipart zip file theme fetcher

* Reformat ThemeServiceImpl

* Reformat codes

* Provide ThemeRepository

* Complete MultipartFileThemeUpdater

* Make CommonsMultipartResolver support put request method

* Replace some methods with ThemeRepository

* Add GitThemeUpdater

* Add merge two local repo test

* Refine merge process with two repos

* Add more test entry point in GitTest

* Add shutdown hook after creating temporary directory

* Add test: find commit by tag

* Refactor git clone process in GitThemeFetcher

* Refine merge process of two repo

* Make sure that RevWalk closed

* Fix FileUtils#findRootPath bug

* Add clean task before gradle check

* Add fallback theme fetcher

* Disable logback-test.xml

* Set testLogging.showStandardStreams with true

* Fix test error while missing halo-test folder

* Enhance git theme fetcher

* Add copy hidden folder test

* Refine GitThemeFetcherTest

* Accomplish GitThemeUpdater

* Accomplish theme update

* Fix checkstyle error

* Add more deprecated details
 2021-01-27 00:16:31 +08:00
Ryan Wang d1258c831d release: 1.4.3-beta.1. 2021-01-25 21:28:17 +08:00
Ryan Wang afe501f233
fix: #1214. (#1242) 2021-01-24 21:35:48 +08:00
John Niang feab7c4b5f
Refactor checkstyle (#1241) 
* Refactor checkstyle.xml and add .editorconfig

* Optimized imports

* Rearrange codes

* Fix check sytle error in source codes

* Reformat test codes

* Fix check style error in test codes

* Config checkstyle plugin

* Fix merge conflicts
 2021-01-24 17:11:10 +08:00
Ryan Wang de5e968025
pref: clean unnecessary code. (#1237) 
* pref: clean unnecessary code.

* chore: change org.jetbrains.annotations.NotNull to org.springframework.lang.NonNull.
 2021-01-24 14:53:32 +08:00
Ryan Wang 8bb416db1a
feat: support custom post password template. (#1236) 2021-01-24 14:50:24 +08:00
guqing 042e72f224
perft: Reduce the scope of pointcut to make the package scope of tangent point as small as possible (#1238) 2021-01-24 12:18:37 +08:00
Raremaa 8ba115ffb6
feat: add api for markdown export (#1199) 
* add API for markdown-export

* add front-matter support

* optimize fileName for markdown-export

* fornt-matter与正文中间增加换行符
 2020-12-27 23:58:52 +08:00
Ryan Wang 276aea4bdd
feat: #766 (#1210) 2020-12-25 22:02:50 +08:00
Ryan Wang 913bc6042e
fix: #1180 (#1209) 2020-12-25 22:00:31 +08:00
Ryan Wang 6b8cf2f57e
feat: #1160. (#1203) 2020-12-25 21:40:04 +08:00
Raremaa 625a89de77
fix: #1200 (#1207) 2020-12-25 21:36:39 +08:00
John Niang 6fb65d0128
Make more friendly error track (#1191) 
* Update gradle wrapper version to 6.6.1

* Upgrade h2 version to 1.4.197

* Make controller log more details

* Refactor FileHandler

* Fix image reader error
 2020-12-12 23:47:06 +08:00
Ryan Wang 9951a83ad6
chore: remove redis cache store (#1190) 
* chore: remove redis cache store.

* chore: remove redis cache store.

* chore: update build.gradle.
 2020-12-09 10:44:40 +08:00
John Niang 30e28b5257
Upgrade dependencies (#1184) 
* Update spring boot version and source compatibility version

* Rearrange some configs

* Upgrade swagger to 3.0.0

* Make swagger configurable

* Make swagger-ui.html path backward compatible

* Change jdk version into 11 in ci/cd scripts and Dockerfile
 2020-12-08 01:20:19 +08:00
Ryan Wang 7c0be43c0d
feat: #1158 (#1176) 2020-12-02 10:24:14 +08:00
Ryan Wang 7de339571d
feat: #1174 (#1177) 2020-12-02 10:23:49 +08:00
Ryan Wang dccd213e72
feat: #1103 (#1173) 2020-12-01 14:11:11 +08:00
Ryan Wang 6c04d5a30d
doc: update swagger contact email. (#1147) 2020-11-12 02:20:14 +08:00
Ryan Wang fa3fad1725 release: 1.4.2 2020-11-02 23:33:44 +08:00
John Niang 92eda2faf8
Fix failing tests (#1131) 2020-11-02 22:35:40 +08:00
Ryan Wang c9ce7d29fd
feat: #1119 (#1120) 
* feat: #1119

* feat: #1119

* pref: allows multiple same menus.

* feat: support create menu in batch.

* feat: support delete menu in batch.

* feat: #1119
 2020-11-02 22:33:23 +08:00
Wh1te ff734ed153
feat: support automatic cleaning recycled posts. #1031 (#1114) 2020-10-25 21:23:14 +08:00
johnwonder b5f742582c
fix bug #1085 (#1122) 
* fix bug #1085

* move exclude to Application class

* enable multipart configuration

* fixt multipart config error and catch MaxUploadSizeExceededException

* fix checkstyle error

* fix if not followed by whitespace

* fix checkstyle error

* modify multipart exception handling to  global exception handling

* remove unnecessary catch

* remove unnecessary catch
 2020-10-25 13:56:01 +08:00
John Niang 2ca92b5391
Refactor AbstractConverter constructor (#1110) 2020-10-14 23:42:33 +08:00
Wh1te 036644bf10
feat: 删除主题时可选是否删除配置 (#1105) 
* feat: 删除主题时可选是否删除配置

* doc: add java doc for run/halo/app/repository/ThemeSettingRepository.java#deleteByThemeId

Co-authored-by: Ryan Wang <i@ryanc.cc>
 2020-10-12 22:30:31 +08:00
Ryan Wang 5520baf046
fix: #1098 (#1099) 2020-10-07 16:00:46 +08:00
Wh1te ab74d8c28b
feat: add MinIO support for attachment management. #1024 (#1097) 2020-10-07 10:52:20 +08:00
Wh1te a4da9a7d58
feat: 文章固定链接类型增加年型 #1026 (#1095) 2020-10-01 10:29:20 +08:00
Wh1te e58d8fbe73
feat: 添加或修改友链时校验 name 和 url 是否重复 (#997) (#1079) 2020-09-30 00:25:26 +08:00
Dylan·Yuan 868efecdce
pref: 添加错误码&修改过时方法 (#1089) 2020-09-30 00:15:55 +08:00
Ryan Wang 5828516733 release: 1.4.1 2020-09-29 23:58:51 +08:00
Ryan Wang 683caf7a85
fix: #1082 (#1083) 2020-09-25 09:24:23 +08:00
Ryan Wang a69168e764 release: 1.4.0 2020-09-24 00:20:50 +08:00
John Niang 845fe1114f
Fix handling root theme folder unexpectedly (#1081) 
* Fix handling root theme folder unexpectedly

* Ignore .git folder while finding root path
 2020-09-24 00:16:02 +08:00
John Niang d0568686c0
Fix theme zip file upload bug and provide finding root folder function (#1080) 
* Fix theme zip file upload bug and provide finding root folder function

* Update ThemeServiceImpl.java

Co-authored-by: Ryan Wang <i@ryanc.cc>
 2020-09-23 20:20:52 +08:00
Ryan Wang fc5742eae8
chore: remove hazelcast cache store. (#1076) 2020-09-22 01:20:05 +08:00
manjusaka d60a940a62
Update BaseCommentParam.java (#1072) 
兼容微信头像长度
 2020-09-18 08:27:24 +08:00
王存露 ed46ab7031
fix: #1068 (#1070) 
* fix: #1068

* add: ThemeSettingService.save add SERIALIZABLE level

* add: saveSettingsByThemeId Api add @CacheLock
 2020-09-15 00:13:01 +08:00
王存露 504e6e187e
fix: #897 && fix: halo-dev/halo-admin#236 (#1057) 
* fix: #897

* fix: 网站备份时，上级目录不存在的问题 (#1056)

* 增加网站备份，临时文件不存在时创建

* 增加数据导出，临时文件不存在时创建

* 修改整站备份,数据导出，临时文件不存在时创建

* add: file upload unit test

* change : FileHandlersTest.java file format

* feat: #1065 (#1066)

* feat: #1065

* feat: #1065

* fix: #897

* add: file upload unit test

* change : FileHandlersTest.java file format

* fix: https://github.com/halo-dev/halo-admin/issues/236

* delete : FileHandlersTest.java
change : FilenameUtilsTest.java add file name double suffix test

Co-authored-by: bruin-sxk <45200590+bruin-sxk@users.noreply.github.com>
Co-authored-by: Ryan Wang <i@ryanc.cc>
 2020-09-14 13:14:59 +08:00
Ryan Wang ac8b43a30e
feat: #1065 (#1066) 
* feat: #1065

* feat: #1065
 2020-09-13 10:29:51 +08:00
bruin-sxk 236b3c418f
fix: 网站备份时，上级目录不存在的问题 (#1056) 
* 增加网站备份，临时文件不存在时创建

* 增加数据导出，临时文件不存在时创建

* 修改整站备份,数据导出，临时文件不存在时创建
 2020-09-12 17:54:45 +08:00
Ryan Wang dd4c602526 release: 1.4.0-beta.3 2020-09-06 20:53:38 +08:00
Turgay Can 437d4bd81b
Add hazelcast cache store, revised the cache implementation (#1047) 
* Add hazelcast cache store, revised the cache implementation

* Remove unsued import

Co-authored-by: Turgay Can <turgay.can@inomera.com>
 2020-08-29 14:28:55 +08:00
宅家小能手 8c948fd670
feat: 通过 slug 获取 sheet 或者文章 (#1044) 
* ✨ Feat: 通过fullpath获取sheet或者文章

* 🚀 Deploy: Fix CI

* ✨ Feat: 通过slug获取文章详情

* 🔨 Refactor: 删除多余的import

* ⚡️ Update: 重写自定义页面的接口,只使用slug获取页面

* Update: Remove unused import
 2020-08-28 00:08:19 +08:00
Ryan Wang 6f88eeda32
typo: change theme repos url. (#1041) 2020-08-23 22:37:39 +08:00
John Niang 60ad4dad80
Fix an error about version comparision in development environment (#1039) 
* Let unknown version as maximum version

* Fix VersionUtilTest error

* Remove deprecated version comparision method and related test
 2020-08-23 17:47:52 +08:00
zhixiangyuan a318abcdc2
fix: #1022 (#1025) 
Co-authored-by: xiangbei.yzx <xiangbei.yzx@alibaba-inc.com>
 2020-08-10 23:04:47 +08:00
Junyi Ao 3f2fefaf22
pref: 预览草稿时，不会增加访问量 (#834) 2020-08-06 22:35:30 +08:00
ruibaby 782079dc9f release: 1.4.0-beta.2 2020-08-04 21:53:48 +08:00
John Niang 3bfb60d5fb
Enable beta version comparable (#1011) 
* Ensure whitespace after comma

* Provide version resolver

* Make version comparable

* Refactor version util with version resolver
 2020-08-03 02:07:03 +08:00
John Niang 60b2527003
Reformat all codes with newly checkstyle(more strict indentation check) (#1009) 
* Reformat all codes with newly checkstyle

* Fix invalid indentation of code comment

* Fix indentation error of test source codes
 2020-08-02 09:41:36 +08:00
Ryan Wang 21ed13aff6
fix: #988 (#1008) 
* fix: #988

* refactor: word count

* refactor: word count.

* fix: index posts sort field.
 2020-08-01 23:58:35 +08:00
OlegPt d824ccac29
fix: the problem of no spaces in the summary (#1003) 2020-08-01 23:18:45 +08:00
coortop 41edec8213
feat: 文章表添加字数统计字段，主题可使用${post.wordCount}调用 (#965) 2020-07-21 21:58:04 +08:00
Aaro0n 0dbbef919c
fix error description (#983) 2020-07-20 14:20:15 +08:00
zhixiangyuan 91a54a4bb3
fix: #975 (#977) 
* chore: build.gradle add mavenLocal()(#975)

* feat: markdown import compatible with hugo(#975)
 2020-07-19 23:09:38 +08:00
ruibaby 46000fd0d0 release: 1.4.0-beta.1 2020-07-19 22:43:28 +08:00
Ryan Wang 69018e85d3
fix: #853 (#979) 2020-07-19 22:04:43 +08:00
Ryan Wang 23789b7acd
fix: #822 (#981) 2020-07-19 22:04:31 +08:00
John Niang 50b19f8d3a
pref: make some unnecessary error detail hide (#962) 2020-07-14 00:57:24 +08:00
John Niang 7a71c85862
Add iterable objects validation (#970) 2020-07-14 00:15:16 +08:00
sheiy d4b23afb55
pref: 如果系统设置了http代理则创建httpClient时设置代理 (#956) 
* 修改缓存时长

* 如果系统设置了http代理则创建httpClient时设置代理

* 如果系统设置了http代理则创建httpClient时设置代理

* 如果系统设置了http代理则创建httpClient时设置代理

* 如果系统设置了http代理则创建httpClient时设置代理

* 如果系统设置了http代理则创建httpClient时设置代理
添加注释

* 添加单元测试
没有useJUnitPlatform()单元测试跑不起来

* 修改单元测试，删除zxing的依赖

* 修正错误的http配置格式

Co-authored-by: Sheiy <35429674@qq.com>
 2020-07-10 12:04:43 +08:00
sheiy feefebe07f
修改缓存时长 (#954) 2020-07-09 10:59:18 +08:00
coortop 8734e99445
perfect: Link random order display,listByRandom and listTeamsByRandom. (#952) 2020-07-09 01:08:21 +08:00
Li 65c1424086
fix #950 附件不存在时删除报错的问题 (#951) 2020-07-08 11:21:47 +08:00
John Niang 11f48781cb
Upgrade spring boot dependency and change some mockito tests (#943) 
* Upgrade spring boot dependency and change some mockito tests

* Refactor all test with junit5

Co-authored-by: Ryan Wang <i@ryanc.cc>
 2020-07-05 13:36:57 +08:00
BigBang019 2b99bd599f
Fix issue #515 & #592 (#835) 
* add release access and branch access(#515)

* add release and branch access(#515)

* always update to latest release(#515)

* #515

* #515

* add testcases(#515)

* fix 515

* fix 515

* deal with connection refused

* disable disk operation related test

* fix #592

* fix #515 & #592

* mockito test

* ignored network related test

* resolve conflict
 2020-07-02 23:34:47 +08:00
John Niang a179f4fc9c
Add top priority sort at post list in category and tag (#918) 2020-06-16 14:37:43 +08:00
John Niang aee79ef7b4
Remove restart feature (#917) 
* Ignore application-local file

* Remove restart feature
 2020-06-15 23:43:02 +08:00
John Niang 658f0a2b3f
fix: Fix startup exception and theme imports in dev environment (#916) 
* Log error instead of throwing while starting halo

* Provide unknown version support

* Fix code format
 2020-06-15 21:45:01 +08:00
John Niang 73362869b7
Perfect checkstyle.xml (#915) 2020-06-14 12:40:04 +08:00
coortop 4ee9e151d4
feat: add links sort by random (#912) 
* feat: add links sort by random

* feat: add links sort by random
 2020-06-13 22:29:10 +08:00
John Niang ccea5ed6c3
Refactor theme sacn (#869) 
* Provide theme collector

* Refactor theme property scan

* Refactor ThemePropertyScanner

* Rectify return type

* Change activated theme fetch strategy

* Refactor theme service

* Reformat unexpected codes

* Remove unused imports

Co-authored-by: johnniang <johnniang@fastmail.com>
 2020-06-08 10:26:32 +08:00
John Niang cf6cd7c3d2
Remove redundant annotations (#880) 2020-05-29 00:18:53 +08:00
giveup bc30ab7c03
改进脱敏 (#874) 
* fixed typos

* 改进脱敏

* 改进脱敏

* 添加脱敏单元测试

Co-authored-by: Your Name <you@example.com>
 2020-05-27 23:29:00 +08:00
giveup b40c3f7ed9
fixed typos (#873) 
Co-authored-by: Your Name <you@example.com>
 2020-05-25 17:58:34 +08:00
Ryan Wang 2b8f218c8f
chore: remove fastjson dependency. (#871) 
* chore: remove fastjson dependency.

* fix: test.
 2020-05-23 15:17:30 +08:00
Ryan Wang f383cd4aa3
fix: #785 (#854) 2020-05-16 19:21:42 +08:00
sebastiancoteanu c3f777fba3
pref: replace == usage with equals to avoid bugs. (#851) 
Co-authored-by: sebastiancoteanu <sebastian.coteanu@arnia.ro>
 2020-05-15 16:55:07 +08:00
Ryan Wang ecc97c207f
chore: remove useless code and dependencies. (#845) 
* chore: remove useless code and dependencies.

* Update build.gradle
 2020-05-15 11:40:02 +08:00
Ryan Wang e7addd41f9
fix: rollback #714 pull request. (#838) 2020-05-12 11:49:40 +08:00
Yqhg8Nt4tuu 4197ca33d8
feat: Support Rename and Edit Staitc Files (#573) (#819) 
* Add rename API

* Add save API

* Add unit test for rename API

* Fix an indentation

* Add a space before '{'

* Add a Param and some invalid checks

* Change comments

* Change test annotation

* Delete impl test unit

* Add directory traversal check for static file operations

Co-authored-by: Rokita <35868425+Ruukita@users.noreply.github.com>
 2020-05-11 22:25:08 +08:00
Gxz-NGU a81f335ee8
pref: 删除冗余注解 (#827) (#830) 2020-05-07 15:20:24 +08:00
chaos.su 9ec3088f1e
support distributed cache and customized halo home. (#754) 
* support distributed cache with redis

* fix HOME_DIR; theme configurations auto update in distributed deployment; update redis cache configuration demo

* remove redundant const of WORK_DIR

Co-authored-by: John Niang <johnniang@riseup.net>
 2020-05-01 14:43:01 +08:00
liaozan f0f354af07
抽取 yyyy-MM-dd-HH-mm-ss- 格式的日期pattern到工具类中 (#813) 
* 排序使用Comparator静态方法实现

* 修复排序逻辑错误

* fix compile error

* 抽取 yyyy-MM-dd-HH-mm-ss- 格式的日期pattern到工具类中
 2020-05-01 00:30:23 +08:00
liaozan 36b3a2d3b4
排序使用Comparator静态方法实现 (#812) 
* 排序使用Comparator静态方法实现

* 修复排序逻辑错误

* fix compile error
 2020-04-30 22:25:37 +08:00
Wu Yuncheng 532b7f0532
fix: volatile in double-checked locking (#799) 2020-04-28 17:58:37 +08:00
ruibaby 11cbe95ed5 release: 1.3.2 2020-04-12 13:32:36 +08:00
jinqilin721 246930ecbe
feat: 附件上传增加华为云OBS支持 (#756) 
* 附件上传增加华为云OBS支持

* Revert "附件上传增加华为云OBS支持"

This reverts commit cad9a352

* 附件上传增加华为云OBS支持
 2020-04-09 10:03:37 +08:00
Ryan Wang ba1eb8fc50
fix: #748 (#749) 2020-04-05 14:51:07 +08:00
bear 3a45b7a5ed
Support MFA-TOTP Auth (#745) 
* add tfa utils

* MFA check api completed

* adminController add loginPreCheck api

* halo-admin test

* checkstyle

* add unit test

* reset MFA
 2020-04-04 19:41:22 +08:00
Ryan Wang b3dafa195a
feat: add switch type for theme settings. (#735) 2020-03-29 11:48:37 +08:00
ruibaby c353411997 release: 1.3.1 2020-03-28 16:03:03 +08:00
Lei XinXin b4ebf7218e
新增DateTimeUtils (#731) 
* 新增DateTimeUtils

* 提交测试用例
 2020-03-28 15:08:24 +08:00
ming 49486198df
fix: #713, 开发环境也能获取版本信息了 (#714) 
* fix #713, 开发环境也能获取版本信息了

* banner version show ok
 2020-03-28 14:33:23 +08:00
wtune f21f5933bf
feat: add index on attachments.create_time (#725) 2020-03-28 00:16:12 +08:00
wtune 51e0620393
feat: add index on photos.create_time (#727) 2020-03-28 00:15:45 +08:00
wtune 4f99e72669
feat: add index on menus.name (#722) 2020-03-27 17:07:25 +08:00
wtune 01e4e5e271
feat: add index on attachments.media_type (#718) 2020-03-27 12:58:27 +08:00
ruibaby 89dc411b0f release: 1.3.0 2020-03-25 18:15:09 +08:00
iwangbingzhi abaaadafe8
update some chinese descriptions (#711) 
Co-authored-by: wangbingzhi <853244870@qq.com>
 2020-03-25 09:01:07 +08:00
ruibaby 8f2894a2a4 release: 1.3.0-beta.4 2020-03-24 23:02:53 +08:00
Ryan Wang bc75275815
feat: provide static mapping feature (#710) 
* Provide static mapping feature

* feat: filter inner mapping for static storage.
 2020-03-24 22:48:58 +08:00
Ryan Wang 2792d11cd2
Fix installation bug (#708) 2020-03-24 20:42:15 +08:00
Ryan Wang ac52e7f677
fix: #703 (#705) 2020-03-22 22:15:52 +08:00
Ryan Wang bee21d7de8
refactor: get database version. (#698) 2020-03-20 22:54:05 +08:00
Ryan Wang 40f510f371
refactor: independent sheet. (#697) 2020-03-20 20:34:51 +08:00
Ryan Wang 26fdbb2cf3
chore: upgrade flexmark version. (#695) 
* chore: upgrade flexmark version.

* fix: test case.
 2020-03-19 17:01:17 +08:00
Ryan Wang a70780c5df
style: code. (#692) 2020-03-18 21:44:46 +08:00
Ryan Wang c847bef498
feat: support custom email templates. (#691) 2020-03-18 21:38:26 +08:00
ruibaby 8eac5716f1 release: 1.3.0-beta.3. 2020-03-18 01:19:25 +08:00
Ryan Wang fc989c965c
chore: upgrade gradle and dependencies. (#688) 2020-03-17 23:56:24 +08:00
Ryan Wang d4cfc3ae7f
feat: #598 (#689) 2020-03-17 23:56:01 +08:00
Ryan Wang a77ebed299
refactor: backup service. (#687) 
* refactor: backup service.

* fix: test case error.
 2020-03-17 20:22:51 +08:00
wtune 03a43fb245
feat: add Index on comments.(type,status) and comments.parent_id (#686) 2020-03-17 15:18:56 +08:00
wtune 9ccd23d730
feat: add Index on posts.(type,status) and posts.create_time (#684) 2020-03-17 15:17:51 +08:00
Ryan Wang 4bc8ad44da
feat: add data export and import api. (#672) 
* feat: add data export and import api.

* refactor: data export and import api.
 2020-03-17 13:14:15 +08:00
Ryan Wang d6b3d6cb5d
fix: #547 (#677) 2020-03-16 23:43:25 +08:00
Ryan Wang fae1df3859
fix: post query sql. (#676) 2020-03-16 22:04:44 +08:00
wtune 4d431fd85d
feat: add Index on theme_settings.setting_key and theme_settings.theme_id (#681) 2020-03-16 22:03:44 +08:00
wtune 2363f4adf7
feat: add Index on post_tags.post_id and post_tags.tag.id (#675) 2020-03-16 14:11:58 +08:00
wtune 1248cb7b14
feat: add Index on post_categories.post_id and post_categories.category_id (#671) 2020-03-16 13:22:24 +08:00
wtune 839a029012
feat: add Index on logs.create_time (#668) 2020-03-16 11:21:35 +08:00
bestsort fe65eccdf7
reduce: memory usage during image upload (#659) 
* optimize FileHandler's logic

* fix code style

* fix: maybe happen OOM when file upload, see #529

* refactor: HashMap -> ConcurrentHashMap

* remove unused class

* reduce memory usage during image upload

* code clean
 2020-03-14 19:19:35 +08:00
wtune e357b7a462
feat: add Index on comments.post_id (#649) 2020-03-14 19:16:33 +08:00
wtune c1f01df394
feat: add index on categories.name and categories.parent_id (#658) 
* Add Index on categories.name

* Add Index on categories.name and categories.parent_id
 2020-03-14 19:10:32 +08:00
wtune 124f352ebb
feat: add Index on links.name (#651) 2020-03-14 17:52:10 +08:00
wtune b2b349ae27
feat: add Index on menus.parent_id (#655) 2020-03-14 17:51:40 +08:00
wtune ee4bc01f65
feat: add Index on photos.team (#657) 2020-03-14 17:50:47 +08:00
wtune fc37803e73
feat: add Index on tags.name (#653) 2020-03-14 17:50:01 +08:00
Ryan Wang c5af5d787d
refactor: hibernate column build. (#638) 
* refactor: hibernate column build.

* feat: after the database migration fails, the record table is automatically cleaned up.
 2020-03-14 11:10:34 +08:00
Ryan Wang 7ae722e6fd
fix: #629 (#641) 2020-03-14 11:09:48 +08:00
bestsort 1d020ff550
Optimize FileHandler's logic (#639) 
* optimize FileHandler's logic

* fix code style

* fix: maybe happen OOM when file upload, see #529

* refactor: HashMap -> ConcurrentHashMap

* remove unused class
 2020-03-14 10:05:53 +08:00
Ryan Wang 153f8ebbef
refactor: attachment month path. (#636) 2020-03-12 15:04:35 +08:00
Ryan Wang 437e59d8a2
refactor: post month path type. (#635) 2020-03-12 14:43:16 +08:00
Ryan Wang 22b24835aa
refactor: banner info. (#634) 2020-03-11 20:09:59 +08:00
Ryan Wang 6b967ad256
refactor: remove recovery api. (#633) 
* refactor: remove recovery api.

* refactor: remove recovery api.
 2020-03-11 13:50:53 +08:00
Ryan Wang a563c493e0
refactor: metas variable. (#632) 
* refactor: metas variable.

* refactor: metas variable.
 2020-03-11 13:49:37 +08:00
ruibaby 378049ba21 release: 1.3.0-beta.2 2020-03-08 11:45:10 +08:00
John Niang 55a9d573bc
fix: a fatal filter bug (#626) 2020-03-08 11:27:41 +08:00
Ryan Wang fd251a4724
refactor: pagination tag. (#625) 2020-03-08 11:25:44 +08:00
Ryan Wang 38b4bb4aeb
chore: upgrade default theme. (#624) 2020-03-07 22:54:52 +08:00
Ryan Wang fa50d2d5d6
refactor: freemarker pagination tag. (#621) 2020-03-07 10:53:13 +08:00
Ryan Wang eb71e98087
refactor: modify the address of the default comment plugin. (#620) 2020-03-06 14:10:00 +08:00
Ryan Wang 491b8c89e8
fix: failure of suffixes in posts. (#619) 2020-03-06 14:09:36 +08:00
Ryan Wang d82f3847c2
feat: support meta_keywords and meta_description in every page. (#612) 2020-03-04 20:03:08 +08:00
Ryan Wang a9fedef8b2
feat: support set archives page size. (#610) 2020-03-02 14:41:16 +08:00
Ryan Wang b70806960b
fix: attachment upload to sm.ms failed. (#609) 
* fix: attachment upload to sm.ms failed.

* fix: attachment upload to sm.ms failed.

* refactor: SmmsFileHandler.

* refactor: SmmsFileHandler.
 2020-03-02 13:04:53 +08:00
Ryan Wang b23755a568
feat: support paging of archive pages. (#608) 
* feat: support paging of archive pages.

* fix: test case.
 2020-03-01 13:52:27 +08:00
Ryan Wang 62eba99d21
feat: add editorType for post. (#605) 
* feat: add editorType for post.

* fix: test case failed.
 2020-02-28 23:17:07 +08:00
Ryan Wang 949a3da3de
refactor: installation data. (#600) 2020-02-27 16:23:22 +08:00
Ryan Wang 136b1fb3b9
refactor: change url field to slug in post. (#597) 2020-02-25 19:44:30 +08:00
Ryan Wang f4a4d5f250
feat: #586 (#595) 2020-02-25 16:08:59 +08:00
ruibaby 7166829d87 release: 1.3.0-beta.1. 2020-02-25 15:30:19 +08:00
Ryan Wang ca33475e31
chore: upgrade default theme. (#594) 
* chore: upgrade default theme.

* Update anatole
 2020-02-25 13:18:55 +08:00
Ryan Wang 72d59a5617
refactor: stop supporting admin folder mapping in workspace. (#593) 2020-02-25 12:52:17 +08:00
John Niang e8db12a93d
Enable code style check available (#590) 
* Add check style plugin and remove halo code style

* Reformat codes for whole project

* Resolve conflicts due to provided checkstyle.xml
 2020-02-25 00:24:51 +08:00
Ryan Wang c224b68fbc
feat: supports setting the post path type and path suffix. (#563) 
* feat: build full path for category and tag.

* feat: build full path for post.

* feat: build full path for sheet.

* feat: build full path for post.

* feat: change post url for rss sitemap pages.

* feat: support set links/photos/journal page prefix.

* feat: support set internal sheet's title.

* refactor: build full path method.

* refactor: archives post full path.

* feat: support nextPageFullPath and prePageFullPath variable in pageable pages.

* Update CommentEventListener.java

* feat: make rss formats more standard.

* feat: add some useful freemarker variable.

* feat: add some useful freemarker variable.

* feat: add some useful freemarker variable.

* refactor: preview post and password post.
 2020-02-24 23:42:54 +08:00
Ryan Wang 8f36a5d124
fix: #549 (#587) 
* fix: #549

* style: change normalizeImageUrl to normalizeUrl.
 2020-02-23 23:34:20 +08:00
John Niang b7b11e2c8f
Refactor email service and remove oh-my-email dependency (#584) 
* Refactor email service

* Remove oh-my-email dependency

* Add mail dependency

* Provide connection test with email server

* Enable send message asynchronously

* Make more friendly information.
 2020-02-21 21:21:28 +08:00
John Niang 4092ed1633
Fix typo about login translate (#583) 2020-02-21 12:19:48 +08:00
John Niang 50af1ec1aa
Fix file upload exception (#581) 
* Refactor FileHandler and related implementations

* Add more friendly error throw

* Make tmp directory as default location for multipart file

* Change error message in Chinese
 2020-02-20 14:47:57 +08:00
John Niang 594923ebd8
Fix installation on the first startup (#578) 2020-02-18 23:39:17 +08:00
Ryan Wang bffd213a55
Correct demo configuration. (#575) 2020-02-15 20:50:36 +08:00
Ryan Wang 78c389b2d4
Support set thumbnail to category and tag. (#574) 
* feat: support set thumbnail to category and tag.

* style: reformat code.
 2020-02-15 20:48:04 +08:00
guqing b78e2161e5
feat: add basic functions of demo mode (#569) 
* feat: add basic functions of demo mode

* feat: add @disableApi annotation to some API that should be disabled

* feat: add DisableApi test case

* fix: change DisableApi annotation name to DisableOnConditation

* Fix test cases

* Add more strict test on failing case

Co-authored-by: John Niang <johnniang@foxmail.com>
 2020-02-14 22:08:38 +08:00
John Niang df3601a751
Refactor halo mode (#571) 2020-02-14 20:57:41 +08:00
Ryan Wang baa2f1ecfd
style: modify email copy. (#568) 
* style: modify email copy.

* style: modify email copy.
 2020-02-14 16:33:40 +08:00
johnniang 118aaf8ddc Create one-time token mechanism 2020-02-12 21:10:00 +08:00
johnniang e0c12a23ee Merge branch 'master' of github.com:halo-dev/halo into fix-backup-function 2020-02-11 21:32:56 +08:00
John Niang 84b6c2aa14
Fix admin index page redirect (#566) 
* Add custom RequestMappingHandlerMapping for enable static resources access

* Fix admin index page redirect
 2020-02-11 21:29:01 +08:00
johnniang 078e3b3013 Remove temp token mechanism 2020-02-11 19:57:07 +08:00
johnniang 5bd9472f9d Merge remote-tracking branch 'upstream/dev' into fix-backup-function 2020-02-11 11:28:16 +08:00
John Niang 49494abbbd
Add custom RequestMappingHandlerMapping for enable static resources access (#558) 2020-02-10 23:48:07 +08:00
Ryan Wang 028268c698
fix: Incorrect sequence of tailing log file#517 (#556) 2020-02-10 21:47:54 +08:00
Ryan Wang 491ff98916 fix: Theme refresh issue #553 (#554) 2020-02-10 16:20:13 +08:00
John Niang 2327aafc1c
Configure halo.workDir into application-test.yaml (#550) 2020-02-09 21:06:59 +08:00
John Niang 44a6c46620
feat: enable default theme submodule support. (#548) 
* Remove anatole theme for submodule

* Enable submodule support

* Enable submodule support for checkouting by github action
 2020-02-09 11:43:00 +08:00
johnniang e365537b70 Create temporary file after halo is started 2020-02-05 18:08:29 +08:00
Ryan Wang 08c579a095
feat: support theme require halo version. (#544) 
* feat: support theme require halo version.

* fix: com.sun.xml.internal.ws.util does not exist error.

* fix: com.sun.xml.internal.ws.util does not exist error again.

* Update ThemeServiceImpl.java
 2020-02-04 16:35:02 +08:00
Ryan Wang bb8ee0f074
feat: support set attachment path type. (#539) 2020-02-02 16:16:20 +08:00
Ryan Wang 32ed3a9a11
style: collate configuration files. (#540) 2020-02-02 16:09:53 +08:00
Ryan Wang e40de371d1
feat: change themes assets base path (#538) 
* feat: change theme resources base path.

* feat: add new variable about theme base path.
 2020-02-01 21:07:58 +08:00
Ryan Wang 63122ef625
feat: support freemarker template Inheritance #534 (#537) 
* feat: #534

* fix: HashMap initialCapacity
 2020-02-01 17:14:36 +08:00
Ryan Wang 28553042cf
Fix wordpress importor. (#536) 2020-02-01 17:09:13 +08:00
Ryan Wang 6f6ed9ee07
feat: support set theme static source path type. (#535) 
* feat: support set theme static source path type.

* refactor: global_absolute_path_enabled property.
 2020-02-01 15:39:21 +08:00
John Niang bc129977d9
Fix test error (#528) 2020-01-31 11:05:15 +08:00
John Niang 6b0804a7b8
Close file input stream after reading image file (#527) 2020-01-31 00:37:45 +08:00
John Niang d47f0f29e6
Uncomment content url mappings (#523) 2020-01-31 00:35:26 +08:00
guqing 61f0748a6a refactor: WordPress data import (#506) 
* refactor: WordPress data import

* refactor: change wordpress convert class to interface and add wordpress convert null judgment

* fix: add some class doc

* fix: exclude commons io

* feat: add custom annotation: @PropertyMappingTo and reflection utils, It can be used to mapping the relationship between source model and target model

* feat: replace the original wordpressconvert implementation with a custom annotation

* fix: change wordpress convert method name

* fix: change wordpress convert method name

* fix: merger conflict
 2020-01-20 15:23:48 +08:00
Ryan Wang 47e9563fe2 feat: create freemarker custom tag of tools. (#505) 
* feat: create freemarker custom tag of tools.
 2020-01-17 17:12:13 +08:00
Ryan Wang bd6cb393ff feat: create theme content api. (#503) 2020-01-17 12:47:55 +08:00
leozhou 89086dd345 fix: #489 
* Update FUNDING.yml

* merge from master

* feat: update page default sort && update the pre and next of posts

* feat: adapter dev branch

* Feat: update getAdjacentPosts return && update post ftl

* fix: revert gradle-wrapper.jar

Co-authored-by: Ryan Wang <i@ryanc.cc>
Co-authored-by: Jiahuan Shen <shenjiahuan1999@hotmail.com>
Co-authored-by: John Niang <johnniang@riseup.net>
Co-authored-by: weiwensangsang <weiwensangsang@users.noreply.github.com>
Co-authored-by: Lei XinXin <40338580+NGLSL@users.noreply.github.com>
Co-authored-by: 寒山 <ms915818993@163.com>
Co-authored-by: IJKZEN <ijkzen@outlook.com>
 2020-01-16 18:00:33 +08:00
John Niang f4c2ca2f8d
Fix vulnerability due to uncheck theme id (#499) 2020-01-16 16:46:16 +08:00
johnniang 23d0a2e01d Disable url regex match temporarily 2020-01-15 23:04:12 +08:00
johnniang dc166d0b4a none: add some test case, but ignored 2020-01-15 23:04:12 +08:00
Lei XinXin 11c32ffdca feat:(add comment blacklist) (#465) 
* feat:(add comment blacklist)

* update enum name

* update enum

* fix:(update pom)

* 优化相关的细节
 2020-01-15 22:43:55 +08:00
pencilso d867f4cca3 feat: add leveldb cache store impl (#494) 
add leveldb config by yaml dev
add cache impl test
 2020-01-12 19:41:09 +08:00
ruibaby de796b35d6 feat: support set categories and tags mapping prefix. 2020-01-11 20:30:57 +08:00
ruibaby 62153403df feat: support /year/month/day/url and /year/month/url mapping. 2020-01-11 12:29:54 +08:00
ruibaby 76dd2b2c72 feat: create get by date api for post. 2020-01-08 12:28:25 +08:00
ruibaby bb58dd5ec4 feat: support set path suffix. 2020-01-07 20:16:11 +08:00
ruibaby 13ab09b799 feat: custom permalink. 2020-01-07 18:46:19 +08:00
ruibaby f975a20fea Merge branch 'static-page' into dev 2020-01-06 20:30:48 +08:00
ruibaby 753a3bc998 release: 1.2.0. 2020-01-05 22:41:54 +08:00
guqing 202cf59128 release: 1.2.0. 2020-01-05 22:26:40 +08:00
ruibaby f24c90b514 fix: content api token name error. 2020-01-04 22:21:23 +08:00
ruibaby 28b4d384dd release: 1.2.0-beta.5. 2020-01-04 21:34:39 +08:00
ruibaby ad4da6366b feat: support set summary for sheet. 2020-01-04 15:26:20 +08:00
Evan Wang 0ce380072e fix:repeated updates of visits and private article visits abnorm… (#463) 2020-01-02 23:52:52 +08:00
ruibaby 6c7968cc2b feat: add archive freemarker custom tag. 2020-01-02 20:33:14 +08:00
ruibaby d3ef9c4a7a pref: remove useless code. 2020-01-01 22:42:50 +08:00
ruibaby e13c014a6b style: remove useless code. 2020-01-01 21:47:51 +08:00
ruibaby 013fa1fdcb fix: the problem that meta is not deleted when the sheet is deleted. 2020-01-01 21:39:52 +08:00