Commit Graph

1737 Commits (10b98252d22d2bfb29d1e3a86e557f077410a55e)

Author SHA1 Message Date
linshenkx 9de40a0a1c
Repair multi-level category incorrect handle while importing markdown(#1380)
* 修复导入markdown时多级分类无法正确识别的问题

* 1.修复导入markdown对单行多tag的支持
2.添加导入markdown时对单引号的正确识别和处理
3.添加导入hexo的markdown的分类列表、标签列表无缩进的支持
4.完善导入markdown文档的测试用例
2021-06-01 23:05:17 +08:00
Ryan Wang 0ade01c518
fix: #1386 (#1390) 2021-06-01 20:24:08 +08:00
zhaoguhong 27c715ac7f
fix: intimate posts should not be searchable in the category list (#1379) 2021-05-20 18:03:09 +08:00
CuiYuSong 4c68ae9e89
feat: modify the content api to support list posts with keyword and category params. (#1373)
* Modefy the content api to support list posts with new class PostQueryContent

* Modefy the content api to support list posts with new class PostQueryContent

* using parameters

* with categoryid

* checkstyle

Co-authored-by: Cui <11811305@mail.sustech.edu.cn>
2021-05-17 21:38:45 +08:00
Ryan Wang a2c9e42970
fix: checkstyle error. (#1375) 2021-05-16 17:03:58 +08:00
MasterWanna 15381e655e
Word count for markdown updated with test (#1354)
* Word count for markdown updated with test

* HTML word count updated with test

* Convert pattern to static final variable

* More HTML test added

* Workaround URL added

* CS304 issue link URL added

* Pure HTML Test added, checkstyle checked

Co-authored-by: MasterWanna <MasterWanna@users.noreply.github.com>
2021-05-02 13:10:17 +08:00
扶醉 bec10e9066
fix: Returns the result in the content api for options getby (#1353) 2021-04-15 00:57:40 +08:00
Ryan Wang 25bb253e82 release: 1.4.8 2021-04-09 15:15:23 +08:00
John Niang 47c2c36460
Add OptionFilter for bulk option api (#1345)
* Add OptionFilter for bulk option api

* Add another filter method for single option

* Restrict OptionController response

* Remove redundant api

* feat: complete private option keys.

* feat: complete private option keys.

Co-authored-by: Ryan Wang <i@ryanc.cc>
2021-04-09 13:19:15 +08:00
Lay 6ac9c7d231
pref: RSS/Atom (#1342)
* 1.Add the lastBuildDate in RSS.
2.Add the updated in Atom.
3.Change the date format in RSS and Atom
4.Add the lastModified in the response header.

* fix code style
2021-04-08 16:28:57 +08:00
Ryan Wang 1a3254deba
revert: #1297 (#1343) 2021-04-08 15:07:41 +08:00
Ryan Wang 9ba9dc40cc
chore: remove deprecated code. (#1334) 2021-03-29 16:57:21 +08:00
Ryan Wang 359c01c361
feat: add gravatar source field for comment options api. (#1333) 2021-03-29 12:02:41 +08:00
Ryan Wang 602f1704a1
fix: incorrect number of children comment. (#1332) 2021-03-28 22:11:34 +08:00
Ryan Wang f9a629c38f
feat: #1036 (#1331)
* feat: #1036

* revert: BaseCommentRepository.
2021-03-28 20:22:54 +08:00
Ryan Wang f0ba0fa606
fix: #1311 (#1327) 2021-03-28 11:21:47 +08:00
John Niang 8472a7b3d5
Automate attribute converter (#1325)
* Deprecate AbstractConverter

* Remove unused enum and attribute converter

* Add AttributeConverterApplyTest

* Add JpaConfiguration

* Add AttributeConverterAutoGenerator

* Integrate automate-attribute-converter

* Rename JpaConfiguration

* Remove useless attribute converters

* Exclude property enums for auto-generating

* Refine JournalType definition

* Fix an error about existing injected type
2021-03-27 23:05:27 +08:00
Ryan Wang e6b32ac8c2
feat: enable swagger configuration in development. (#1328) 2021-03-27 15:32:26 +08:00
Ryan Wang 444e649169 Merge branch '1.4.x' 2021-03-27 12:02:47 +08:00
肥鱼先生 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