Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat:#1225 #1235

Merged
merged 20 commits into from
Jan 31, 2021
Merged

feat:#1225 #1235

merged 20 commits into from
Jan 31, 2021

Conversation

yuanzhixiang
Copy link

@yuanzhixiang yuanzhixiang commented Jan 23, 2021

  • 讨论链接
  • 体验包
    • 目前密码的过期条件是关闭浏览器 or 更新分类 or 一天的超时时间
    • 以下是体验包下载地址
    • 使用体验包建议备份博客文件后再使用

@JohnNiang
Copy link
Member

JDK 最低标准:

sourceCompatibility = JavaVersion.VERSION_11

@yuanzhixiang
Copy link
Author

JDK 最低标准:

sourceCompatibility = JavaVersion.VERSION_11

虽然 gradle 上指定了最低 jdk11,但是我看之前发布的版本都能在 jdk1.8 下面运行,所以我将我这次改动的代码中用到的非 jdk1.8 的代码用等价代码进行了替换,否则下次发布的时候用 1.8 编译会报错

@ruibaby
Copy link
Member

ruibaby commented Jan 23, 2021

JDK 最低标准:

sourceCompatibility = JavaVersion.VERSION_11

虽然 gradle 上指定了最低 jdk11,但是我看之前发布的版本都能在 jdk1.8 下面运行,所以我将我这次改动的代码中用到的非 jdk1.8 的代码用等价代码进行了替换,否则下次发布的时候用 1.8 编译会报错

我们已经决定在 1.4.3 的时候包含这次 JDK 版本变化的破坏更新。也就是用户必须升级。

@ruibaby
Copy link
Member

ruibaby commented Jan 23, 2021

你这次 PR 应该不会包含在 1.4.3 版本中,所以无需担心。

@yuanzhixiang
Copy link
Author

JDK 最低标准:

sourceCompatibility = JavaVersion.VERSION_11

我这次提交中代码缩进和你们的标准不太一样,请问你们格式化是用的什么标准,有的话我去配置一下,然后把格式不对的代码格式化一下。

@yuanzhixiang
Copy link
Author

你这次 PR 应该不会包含在 1.4.3 版本中,所以无需担心。

了解了

@JohnNiang
Copy link
Member

JDK 最低标准:

sourceCompatibility = JavaVersion.VERSION_11

我这次提交中代码缩进和你们的标准不太一样,请问你们格式化是用的什么标准,有的话我去配置一下,然后把格式不对的代码格式化一下。

可以先尝试把 checkstyle 文件:https://github.com/halo-dev/halo/blob/master/config/checkstyle/checkstyle.xml 导入到 IDEA 中试试。如果格式还是会出问题,我晚上将重新整理并上传 .editorconfig。

@cetr
Copy link
Member

cetr commented Jan 23, 2021

刚才我试了下,从首页展示的文章进分类被加密的文章可以直接进,是代码没写完,还是遗漏了

@yuanzhixiang
Copy link
Author

刚才我试了下,从首页展示的文章进分类被加密的文章可以直接进,是代码没写完,还是遗漏了

你说的这个问题我没有复现出来,正常来说直接拉取文章列表是不会展示加密文章的。你可以先建一个分类,然后给分类设置上密码,再将文章归到该分类下,然后进博客访问该分类,访问的时候会找你要密码,输入正确密码后即可看到分类下的文章。

你说的这个问题后续如果复现出来了麻烦详细说一下复现的流程,我这边会跟进处理掉。

@guqing
Copy link
Member

guqing commented Jan 23, 2021

经测试没有发现功能问题

@yuanzhixiang
Copy link
Author

@guqing 同学,你这边发起的 requested changes 我修复掉之后这个 requested changes 还是在,这个是你这边关掉还是我这边关掉,还是不用管?

image

@yuanzhixiang
Copy link
Author

@zhixiangyuan 你只需要持续 commit 就好了。

👌

@guqing
Copy link
Member

guqing commented Jan 24, 2021

@guqing 同学,你这边发起的 requested changes 我修复掉之后这个 requested changes 还是在,这个是你这边关掉还是我这边关掉,还是不用管?

image

不用管 等最终审批后就可以 每个人只有审批通过最终才能合并 一会儿我重新审核一下

@ruibaby ruibaby added the kind/feature Categorizes issue or PR as related to a new feature. label Jan 24, 2021
Copy link
Member

@JohnNiang JohnNiang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

新的 checkstyle 和 .editorconfig 已合并。请重新导入 checkstyle 再格式化代码。

# Conflicts:
#	src/main/java/run/halo/app/controller/admin/api/CategoryController.java
#	src/main/java/run/halo/app/controller/admin/api/PostController.java
#	src/main/java/run/halo/app/controller/content/ContentContentController.java
#	src/main/java/run/halo/app/controller/content/api/CategoryController.java
#	src/main/java/run/halo/app/controller/content/model/CategoryModel.java
#	src/main/java/run/halo/app/controller/content/model/PostModel.java
#	src/main/java/run/halo/app/core/freemarker/tag/CategoryTagDirective.java
#	src/main/java/run/halo/app/core/freemarker/tag/PostTagDirective.java
#	src/main/java/run/halo/app/service/CategoryService.java
#	src/main/java/run/halo/app/service/PostService.java
#	src/main/java/run/halo/app/service/impl/CategoryServiceImpl.java
#	src/main/java/run/halo/app/service/impl/PostCategoryServiceImpl.java
#	src/main/java/run/halo/app/service/impl/PostServiceImpl.java
@yuanzhixiang
Copy link
Author

yuanzhixiang commented Jan 24, 2021

新的 checkstyle 和 .editorconfig 已合并。请重新导入 checkstyle 再格式化代码。

合并了 master,./gradlew check 报出了一堆代码格式问题,这个应该是 master 上就要修复的吧,是不是等你们修复了这些问题之后我再合并一次?

以下是部分报错

image

@JohnNiang
Copy link
Member

新的 checkstyle 和 .editorconfig 已合并。请重新导入 checkstyle 再格式化代码。

合并了 master,./gradlew check 报出了一堆代码格式问题,这个应该是 master 上就要修复的吧,是不是等你们修复了这些问题之后我再合并一次?

以下是部分报错

image

master 分支的代码已经是格式化之后的结果了,没有问题的。建议配合 checkstyle 插件(IDEA 插件)和格式化修正代码。

@yuanzhixiang
Copy link
Author

新的 checkstyle 和 .editorconfig 已合并。请重新导入 checkstyle 再格式化代码。

合并了 master,./gradlew check 报出了一堆代码格式问题,这个应该是 master 上就要修复的吧,是不是等你们修复了这些问题之后我再合并一次?
以下是部分报错

master 分支的代码已经是格式化之后的结果了,没有问题的。建议配合 checkstyle 插件(IDEA 插件)和格式化修正代码。

我看着上面报的错是缺少 javadoc 文档,不只是代码格式问题

@JohnNiang
Copy link
Member

新的 checkstyle 和 .editorconfig 已合并。请重新导入 checkstyle 再格式化代码。

合并了 master,./gradlew check 报出了一堆代码格式问题,这个应该是 master 上就要修复的吧,是不是等你们修复了这些问题之后我再合并一次?
以下是部分报错

master 分支的代码已经是格式化之后的结果了,没有问题的。建议配合 checkstyle 插件(IDEA 插件)和格式化修正代码。

我看着上面报的错是缺少 javadoc 文档,不只是代码格式问题

确实 javadoc 只会输出 warning 日志,不会认为是 error。

@yuanzhixiang
Copy link
Author

yuanzhixiang commented Jan 24, 2021

新的 checkstyle 和 .editorconfig 已合并。请重新导入 checkstyle 再格式化代码。

合并了 master,./gradlew check 报出了一堆代码格式问题,这个应该是 master 上就要修复的吧,是不是等你们修复了这些问题之后我再合并一次?
以下是部分报错

master 分支的代码已经是格式化之后的结果了,没有问题的。建议配合 checkstyle 插件(IDEA 插件)和格式化修正代码。

我看着上面报的错是缺少 javadoc 文档,不只是代码格式问题

确实 javadoc 只会输出 warning 日志,不会认为是 error。

但我看这上面报出来的确实是 error 而且很多都是我没改动的文件,是不是 checkstyle 配置的有问题?

image

image

@JohnNiang
Copy link
Member

你当前 IDEA 的版本和 checkstyle 版本是多少?

@JohnNiang
Copy link
Member

我的配置:

image

@yuanzhixiang
Copy link
Author

我的配置:

处理完了

config/checkstyle/checkstyle.xml Outdated Show resolved Hide resolved
src/main/java/run/halo/app/service/CategoryService.java Outdated Show resolved Hide resolved
@ruibaby ruibaby linked an issue Jan 28, 2021 that may be closed by this pull request
@yuanzhixiang
Copy link
Author

@ruibaby 同学,啥时候这个特性可以合到主干?

@ruibaby ruibaby merged commit 7b88fca into halo-dev:master Jan 31, 2021
@ruibaby
Copy link
Member

ruibaby commented Jan 31, 2021

@zhixiangyuan 已合并,感谢贡献。

@yuanzhixiang
Copy link
Author

yuanzhixiang commented Jan 31, 2021

@zhixiangyuan 已合并,感谢贡献。

还有一个 halo-dev/console#283,这个 admin 的 pull request,用于给用户输入分类密码

XuCpeng added a commit to XuCpeng/halo that referenced this pull request Apr 17, 2021
* Create SECURITY.md (halo-dev#1144)

* doc: update swagger contact email. (halo-dev#1147)

* Update README.md

* feat: halo-dev#1103 (halo-dev#1173)

* feat: halo-dev#1174 (halo-dev#1177)

* feat: halo-dev#1158 (halo-dev#1176)

* Upgrade dependencies (halo-dev#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

* chore: remove redis cache store (halo-dev#1190)

* chore: remove redis cache store.

* chore: remove redis cache store.

* chore: update build.gradle.

* Make more friendly error track (halo-dev#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

* fix: halo-dev#1200 (halo-dev#1207)

* feat: halo-dev#1160. (halo-dev#1203)

* fix: halo-dev#1180 (halo-dev#1209)

* feat: halo-dev#766 (halo-dev#1210)

* feat: add api for markdown export (halo-dev#1199)

* add API for markdown-export

* add front-matter support

* optimize fileName for markdown-export

* fornt-matter与正文中间增加换行符

* Replace travis ci with github action (halo-dev#1212)

* 1196 refactor/ci (#3)

* Remove .travis.yml

* Refactor github action partially

* Fix yaml syntax error

* Add run command for every step

* Set current branch name into halo.yml temporarily

* Test validation.yml

* Add upload-release-asset step into release.yml

* Perfect release.yml

* Fix indent error

* Refactor on condition in release.yml

* Refactor on condition in validation.yml

* Fix release.yml

* Fix upload_url value set

* Fix environment set error

* Change artifact variable from output into global environment

* Fix deprecated environment set method

* Fix environment variable set error

* Change assert_content_type with application/zip

* Refactor upload release step

* Fix release id set

* Fix release id set again

* Fix syntax error

* Refactor upload process

* Refactor halo ci

* Make build step rely on check step

* Inspect docker action

* Inspect docker action again

* Refine bootBuildImage config

* Refactor bootBuildImage config and halo ci

* Fix download artifact path error

* Fix docker image name concat error

* Remove downloaded files inspect tips

* perft: Reduce the scope of pointcut to make the package scope of tangent point as small as possible (halo-dev#1238)

* feat: support custom post password template. (halo-dev#1236)

* pref: clean unnecessary code. (halo-dev#1237)

* pref: clean unnecessary code.

* chore: change org.jetbrains.annotations.NotNull to org.springframework.lang.NonNull.

* Refactor checkstyle (halo-dev#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

* fix: halo-dev#1214. (halo-dev#1242)

* release: 1.4.3-beta.1.

* release: 1.4.3-beta.2.

* Update README.md

* Fix theme updation error (halo-dev#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

* Refactor Dockerfile with layered jar (halo-dev#1248)

* Refactor Dockerfile with layered jar

* Add projectVersion print task

* Refactor docker build process

* Remove aliyun maven mirror

* Correct multi platforms list

* Correct multi platforms list again

* Make docker platforms configurable

* Fix folder copy error: ProviderMismatchException (halo-dev#1249)

* fix: unable to access custom sheet. (halo-dev#1246)

* release: 1.4.3-beta.2.

* doc: add document website. (halo-dev#1215)

* doc: add document website.

* doc: add document website.

* doc: add document website.

* release: 1.4.3.

* Update README.md

* Update README.md

* feat: halo-dev#1225 (halo-dev#1235)

* feat: halo-dev#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 <[email protected]>

* fix: halo-dev#1255. (halo-dev#1256)

* fix: halo-dev#1255.

* fix: halo-dev#1255.

* release: 1.4.4.

* fix: category authentication redirect url. (halo-dev#1264)

* pref: journals likes api. (halo-dev#1266)

* pref: sitemap.xml (halo-dev#1267)

* release: 1.4.5.

* pref: grouping assertions (halo-dev#1273)

* Grouping assertions

Signed-off-by: Elvys Soares <[email protected]>

* Grouping assertions

Signed-off-by: Elvys Soares <[email protected]>

* Grouping assertions

Signed-off-by: Elvys Soares <[email protected]>

* fix: code style check.

Co-authored-by: Ryan Wang <[email protected]>

* Fix Page response model inconsistent in swagger ui (halo-dev#1277)

* Provide backup dto fetch api (halo-dev#1278)

* Fix swagger security reference config error

* Add backup dto fetch api

* Rearrange fetch api

* Fix incorrect cache lock of journal like api (halo-dev#1279)

* fix: fetch work dir backup api. (halo-dev#1282)

* feat: support import user. (halo-dev#1283)

* fix: theme update by upload. (halo-dev#1284)

* Cache current theme in theme repository (halo-dev#1286)

* pref: halo-dev#1050 (halo-dev#1287)

* Update FUNDING.yml

* pref: init default theme. (halo-dev#1297)

* feat: 扩展 freemarker 实现 block (halo-dev#1295)

* fix halo-dev#950 附件不存在时删除报错的问题

* pref: 扩展 freemarker 增加 block 功能

close halo-dev#1292

* checkStyle

* add unit test

* update test

* Upgrade spring boot version (halo-dev#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 <[email protected]>

* Make more tolerant of reading image (halo-dev#1298)

* Fix error for updating activated theme (halo-dev#1300)

* Fix error about response committed (halo-dev#1301)

* Add index page request test

* Add test for first page request

* Create session before requesting content

* chore: sync default theme. (halo-dev#1304)

* Refactor system configuration (halo-dev#1303)

* Refactor application*.yml

* Remove application-user.yaml

* Fix invalid config for aspect

* Remove random theme folder generation (halo-dev#1305)

* release: 1.4.6.

* feat: halo-dev#1313 (halo-dev#1315)

* release: 1.4.7-beta.1

* release: 1.4.7

* feat: add index page to sitemap.xml (halo-dev#1318)

* style: set the color of log to default after banner (halo-dev#1321)

* Upgrade to Spring Boot 2.5.0-M3 (halo-dev#1324)

* feat: enable swagger configuration in development. (halo-dev#1328)

* Automate attribute converter (halo-dev#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

* fix: halo-dev#1311 (halo-dev#1327)

* feat: halo-dev#1036 (halo-dev#1331)

* feat: halo-dev#1036

* revert: BaseCommentRepository.

* fix: incorrect number of children comment. (halo-dev#1332)

* feat: add gravatar source field for comment options api. (halo-dev#1333)

* chore: remove deprecated code. (halo-dev#1334)

* chore(deps): upgrade ali oss sdk dependency. (halo-dev#1335)

* revert: halo-dev#1297 (halo-dev#1343)

* pref: RSS/Atom (halo-dev#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

* Add OptionFilter for bulk option api (halo-dev#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 <[email protected]>

* release: 1.4.8

* doc: update readme.

* doc: update readme.

* fix: Returns the result in the content api for options getby (halo-dev#1353)

Co-authored-by: GalvinGao <[email protected]>
Co-authored-by: Ryan Wang <[email protected]>
Co-authored-by: John Niang <[email protected]>
Co-authored-by: Raremaa <[email protected]>
Co-authored-by: guqing <[email protected]>
Co-authored-by: zhixiangyuan <[email protected]>
Co-authored-by: xiangbei.yzx <[email protected]>
Co-authored-by: Elvys Soares <[email protected]>
Co-authored-by: Li <[email protected]>
Co-authored-by: 知雨 <[email protected]>
Co-authored-by: 肥鱼先生 <[email protected]>
Co-authored-by: Lay <[email protected]>
Co-authored-by: 扶醉 <[email protected]>
ruibaby pushed a commit to ruibaby/halo that referenced this pull request Jun 11, 2021
* feat: halo-dev#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 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/feature Categorizes issue or PR as related to a new feature.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

feat: 加密分类实现方案讨论
5 participants