Skip to content

Dev#314

Merged
colorful3 merged 24 commits intomasterfrom
dev
Nov 29, 2022
Merged

Dev#314
colorful3 merged 24 commits intomasterfrom
dev

Conversation

@colorful3
Copy link
Copy Markdown
Member

No description provided.

colorful3 and others added 23 commits July 6, 2021 18:28
* chore: 修正README锚点不跳转的问题

* fix:#190

* fix:#184

* chore(deps-dev): bump freemarker from 2.3.30 to 2.3.31

Bumps freemarker from 2.3.30 to 2.3.31.

Signed-off-by: dependabot[bot] <support@github.com>

* chore(deps): bump lin-cms-spring-boot-starter

Bumps [lin-cms-spring-boot-starter](https://github.com/TaleLin/lin-cms-java-core) from 0.2.0-RC2 to 0.2.0-RELEASE.
- [Release notes](https://github.com/TaleLin/lin-cms-java-core/releases)
- [Commits](https://github.com/TaleLin/lin-cms-java-core/commits)

Signed-off-by: dependabot[bot] <support@github.com>

* Chore/upgrade version (#200)

* chore: 修正README锚点不跳转的问题

* fix:#190

* fix:#184

* chore: 升级主工程以及核心库版本号

Co-authored-by: ToWeLong <1191430240@qq.com>

* chore(deps): bump spring-boot-starter-parent from 2.4.3 to 2.5.0

Bumps [spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 2.4.3 to 2.5.0.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v2.4.3...v2.5.0)

Signed-off-by: dependabot[bot] <support@github.com>

* Dev (#226)

* chore(deps): bump spring-boot-starter-parent from 2.5.0 to 2.5.2 (#220)

Bumps [spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 2.5.0 to 2.5.2.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v2.5.0...v2.5.2)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-starter-parent
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* refactor: optimize ci action config

* Update maven.yml

* Update maven.yml

* fix issue #131

* chore(deps): bump qiniu-java-sdk from 7.4.0 to 7.8.0

Bumps [qiniu-java-sdk](https://github.com/qiniu/java-sdk) from 7.4.0 to 7.8.0.
- [Release notes](https://github.com/qiniu/java-sdk/releases)
- [Changelog](https://github.com/qiniu/java-sdk/blob/master/CHANGELOG.md)
- [Commits](qiniu/java-sdk@v7.4.0...v7.8.0)

---
updated-dependencies:
- dependency-name: com.qiniu:qiniu-java-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Chore/replace expired configurations (#222)

* chore: 修正README锚点不跳转的问题

* fix:#190

* fix:#184

* chore: 替换过期的配置项

* test: 临时解决 CI 单元测试异常(原因未明)

Co-authored-by: ToWeLong <1191430240@qq.com>
Co-authored-by: 华钦 <lucky.gui@clpsglobal.com>

* Docs/upgrade readme (#225)

* chore: 修正README锚点不跳转的问题

* fix:#190

* fix:#184

* docs: 更新 readme 中 springboot 版本号

Co-authored-by: ToWeLong <1191430240@qq.com>
Co-authored-by: 华钦 <lucky.gui@clpsglobal.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dengliming <liming.d.pro@gmail.com>
Co-authored-by: fuhao <fuhao@ifengyu.com>
Co-authored-by: ToWeLong <1191430240@qq.com>
Co-authored-by: 华钦 <lucky.gui@clpsglobal.com>

* refactor: 替换jackson已过期的配置引用

Co-authored-by: ToWeLong <1191430240@qq.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: 华钦 <lucky.gui@clpsglobal.com>
Co-authored-by: dengliming <liming.d.pro@gmail.com>
Co-authored-by: fuhao <fuhao@ifengyu.com>
配置文件中未配置字段时,spring不会调用set方法
* refactor: 数据库新增 is_deleted 字段,作为删除标识

* refactor: 整理代码规范
Copy link
Copy Markdown
Member Author

@colorful3 colorful3 left a comment

Choose a reason for hiding this comment

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

LGTM

# Conflicts:
#	src/main/java/io/github/talelin/latticy/common/configuration/LoginCaptchaProperties.java
@colorful3 colorful3 merged commit 3fc25bd into master Nov 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants