Skip to content

Commit

Permalink
Merge pull request #9 from buession/2.2.x
Browse files Browse the repository at this point in the history
Release 2.2.1
eduosi authored Mar 31, 2023
2 parents 636ef6f + 3535c0a commit fe4cd2e
Showing 23 changed files with 84 additions and 55 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,16 @@
===========================


## [2.2.1](https://github.com/buession/buession-springboot/releases/tag/v2.2.1) (2023-03-31)

### 🔨依赖升级

- [依赖库版本升级和安全漏洞修复](https://github.com/buession/buession-parent/releases/tag/v2.2.1)


---


## [2.2.0](https://github.com/buession/buession-springboot/releases/tag/v2.2.0) (2023-03-11)

### 🔨依赖升级
4 changes: 2 additions & 2 deletions buession-springboot-boot/pom.xml
Original file line number Diff line number Diff line change
@@ -7,10 +7,10 @@
<groupId>com.buession.springboot</groupId>
<artifactId>buession-springboot-parent</artifactId>
<relativePath>../buession-springboot-parent</relativePath>
<version>2.2.0</version>
<version>2.2.1</version>
</parent>
<artifactId>buession-springboot-boot</artifactId>
<url>https://github.com/buession/buession-springboot</url>
<url>https://springboot.buession.com/</url>
<description>Buession Framework Springboot Boot</description>
<packaging>jar</packaging>

Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
* +------------------------------------------------------------------------------------------------+
* | License: http://www.apache.org/licenses/LICENSE-2.0.txt |
* | Author: Yong.Teng <webmaster@buession.com> |
* | Copyright @ 2013-2022 Buession.com Inc. |
* | Copyright @ 2013-2023 Buession.com Inc. |
* +------------------------------------------------------------------------------------------------+
*/
package com.buession.springboot.boot.application;
@@ -120,7 +120,8 @@ public void doStartup(final Class<? extends Application> clazz, final WebApplica
final String[] args){
final SpringApplicationBuilder springApplicationBuilder = new SpringApplicationBuilder(clazz);

PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull();
final PropertyMapper propertyMapper = PropertyMapper.get().alwaysApplyingWhenNonNull();

propertyMapper.from(getBanner()).to(springApplicationBuilder::banner);
propertyMapper.from(getConfigurableApplicationContext()).to(springApplicationBuilder::contextClass);

Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
* +------------------------------------------------------------------------------------------------+
* | License: http://www.apache.org/licenses/LICENSE-2.0.txt |
* | Author: Yong.Teng <webmaster@buession.com> |
* | Copyright @ 2013-2022 Buession.com Inc. |
* | Copyright @ 2013-2023 Buession.com Inc. |
* +------------------------------------------------------------------------------------------------+
*/
package com.buession.springboot.boot.config;
@@ -55,7 +55,7 @@ public RuntimeProperties(Map<String, Object> m){
}

protected void putDefaults(){
put("X-Powered-By", Framework.NAME + "/" + Framework.VERSION);
put("X-Powered-By", Framework.NAME + '/' + Framework.VERSION);
}

}
4 changes: 2 additions & 2 deletions buession-springboot-cache/pom.xml
Original file line number Diff line number Diff line change
@@ -7,10 +7,10 @@
<groupId>com.buession.springboot</groupId>
<artifactId>buession-springboot-parent</artifactId>
<relativePath>../buession-springboot-parent</relativePath>
<version>2.2.0</version>
<version>2.2.1</version>
</parent>
<artifactId>buession-springboot-cache</artifactId>
<url>https://github.com/buession/buession-springboot</url>
<url>https://springboot.buession.com/</url>
<description>Buession Framework Springboot For Cache</description>
<packaging>jar</packaging>

Original file line number Diff line number Diff line change
@@ -19,12 +19,13 @@
* +-------------------------------------------------------------------------------------------------------+
* | License: http://www.apache.org/licenses/LICENSE-2.0.txt |
* | Author: Yong.Teng <webmaster@buession.com> |
* | Copyright @ 2013-2022 Buession.com Inc. |
* | Copyright @ 2013-2023 Buession.com Inc. |
* +-------------------------------------------------------------------------------------------------------+
*/
package com.buession.springboot.cache.redis.utils;

import com.buession.core.utils.StringUtils;
import com.buession.core.validator.Validate;
import com.buession.redis.core.RedisNode;

import java.text.ParseException;
@@ -47,7 +48,7 @@ public static RedisNode parse(final String str, final int defaultPort) throws Pa
try{
int port = Integer.parseInt(hostAndPort[1]);

if(port >= 0 && port <= 65535){
if(Validate.isPort(port)){
return new RedisNode(hostAndPort[0], port);
}
}catch(Exception e){
4 changes: 2 additions & 2 deletions buession-springboot-captcha/pom.xml
Original file line number Diff line number Diff line change
@@ -7,10 +7,10 @@
<groupId>com.buession.springboot</groupId>
<artifactId>buession-springboot-parent</artifactId>
<relativePath>../buession-springboot-parent</relativePath>
<version>2.2.0</version>
<version>2.2.1</version>
</parent>
<artifactId>buession-springboot-captcha</artifactId>
<url>https://github.com/buession/buession-springboot</url>
<url>https://springboot.buession.com/</url>
<description>Buession Framework Springboot Captcha</description>
<packaging>jar</packaging>

4 changes: 2 additions & 2 deletions buession-springboot-cli/pom.xml
Original file line number Diff line number Diff line change
@@ -7,10 +7,10 @@
<groupId>com.buession.springboot</groupId>
<artifactId>buession-springboot-parent</artifactId>
<relativePath>../buession-springboot-parent</relativePath>
<version>2.2.0</version>
<version>2.2.1</version>
</parent>
<artifactId>buession-springboot-cli</artifactId>
<url>https://github.com/buession/buession-springboot</url>
<url>https://springboot.buession.com/</url>
<description>Buession Framework Springboot Cli</description>
<packaging>jar</packaging>

4 changes: 2 additions & 2 deletions buession-springboot-datasource/pom.xml
Original file line number Diff line number Diff line change
@@ -7,10 +7,10 @@
<groupId>com.buession.springboot</groupId>
<artifactId>buession-springboot-parent</artifactId>
<relativePath>../buession-springboot-parent</relativePath>
<version>2.2.0</version>
<version>2.2.1</version>
</parent>
<artifactId>buession-springboot-datasource</artifactId>
<url>https://github.com/buession/buession-springboot</url>
<url>https://springboot.buession.com/</url>
<description>Buession Framework Springboot For DataSource</description>
<packaging>jar</packaging>

4 changes: 2 additions & 2 deletions buession-springboot-geoip/pom.xml
Original file line number Diff line number Diff line change
@@ -7,10 +7,10 @@
<groupId>com.buession.springboot</groupId>
<artifactId>buession-springboot-parent</artifactId>
<relativePath>../buession-springboot-parent</relativePath>
<version>2.2.0</version>
<version>2.2.1</version>
</parent>
<artifactId>buession-springboot-geoip</artifactId>
<url>https://github.com/buession/buession-springboot</url>
<url>https://springboot.buession.com/</url>
<description>Buession Framework Springboot For GeoIP</description>
<packaging>jar</packaging>

4 changes: 2 additions & 2 deletions buession-springboot-httpclient/pom.xml
Original file line number Diff line number Diff line change
@@ -7,10 +7,10 @@
<groupId>com.buession.springboot</groupId>
<artifactId>buession-springboot-parent</artifactId>
<relativePath>../buession-springboot-parent</relativePath>
<version>2.2.0</version>
<version>2.2.1</version>
</parent>
<artifactId>buession-springboot-httpclient</artifactId>
<url>https://github.com/buession/buession-springboot</url>
<url>https://springboot.buession.com/</url>
<description>Buession Framework Springboot For Http Client</description>
<packaging>jar</packaging>

4 changes: 2 additions & 2 deletions buession-springboot-mongodb/pom.xml
Original file line number Diff line number Diff line change
@@ -7,10 +7,10 @@
<groupId>com.buession.springboot</groupId>
<artifactId>buession-springboot-parent</artifactId>
<relativePath>../buession-springboot-parent</relativePath>
<version>2.2.0</version>
<version>2.2.1</version>
</parent>
<artifactId>buession-springboot-mongodb</artifactId>
<url>https://github.com/buession/buession-springboot</url>
<url>https://springboot.buession.com/</url>
<description>Buession Framework Springboot For MongoDB</description>
<packaging>jar</packaging>

4 changes: 2 additions & 2 deletions buession-springboot-mybatis/pom.xml
Original file line number Diff line number Diff line change
@@ -7,10 +7,10 @@
<groupId>com.buession.springboot</groupId>
<artifactId>buession-springboot-parent</artifactId>
<relativePath>../buession-springboot-parent</relativePath>
<version>2.2.0</version>
<version>2.2.1</version>
</parent>
<artifactId>buession-springboot-mybatis</artifactId>
<url>https://github.com/buession/buession-springboot</url>
<url>https://springboot.buession.com/</url>
<description>Buession Framework Springboot For Mybatis Support</description>
<packaging>jar</packaging>

Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
* +------------------------------------------------------------------------------------------------+
* | License: http://www.apache.org/licenses/LICENSE-2.0.txt |
* | Author: Yong.Teng <webmaster@buession.com> |
* | Copyright @ 2013-2018 Buession.com Inc. |
* | Copyright @ 2013-2023 Buession.com Inc. |
* +------------------------------------------------------------------------------------------------+
*/
package com.buession.springboot.mybatis;
@@ -31,8 +31,9 @@
/**
* @author Yong.Teng
*/
@FunctionalInterface
public interface ConfigurationCustomizer {

void customize(Configuration configuration);
void customize(Configuration configuration);

}
4 changes: 2 additions & 2 deletions buession-springboot-pac4j/pom.xml
Original file line number Diff line number Diff line change
@@ -7,10 +7,10 @@
<groupId>com.buession.springboot</groupId>
<artifactId>buession-springboot-parent</artifactId>
<relativePath>../buession-springboot-parent</relativePath>
<version>2.2.0</version>
<version>2.2.1</version>
</parent>
<artifactId>buession-springboot-pac4j</artifactId>
<url>https://github.com/buession/buession-springboot</url>
<url>https://springboot.buession.com/</url>
<description>Buession Framework Springboot Pac4j Client</description>
<packaging>jar</packaging>

Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
* +-------------------------------------------------------------------------------------------------------+
* | License: http://www.apache.org/licenses/LICENSE-2.0.txt |
* | Author: Yong.Teng <webmaster@buession.com> |
* | Copyright @ 2013-2022 Buession.com Inc. |
* | Copyright @ 2013-2023 Buession.com Inc. |
* +-------------------------------------------------------------------------------------------------------+
*/
package com.buession.springboot.pac4j.autoconfigure;
@@ -356,6 +356,10 @@ public void setName(String name){
*/
public final static class Security extends BaseFilter {

public Security(){
setName("securityFilter");
}

/**
* 认证器名称列表
*/
@@ -411,6 +415,10 @@ public void setMatchers(Set<String> matchers){
*/
public final static class Callback extends BaseFilter {

public Callback(){
setName("callbackFilter");
}

/**
* 默认跳转地址
*/
@@ -442,6 +450,10 @@ public void setDefaultUrl(String defaultUrl){
*/
public final static class Logout extends BaseFilter {

public Logout(){
setName("logoutFilter");
}

/**
* 登出成功默认跳转地址
*/
16 changes: 8 additions & 8 deletions buession-springboot-parent/pom.xml
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@
<groupId>com.buession</groupId>
<artifactId>parent</artifactId>
<relativePath/>
<version>2.2.0</version>
<version>2.2.1</version>
</parent>
<groupId>com.buession.springboot</groupId>
<artifactId>buession-springboot-parent</artifactId>
<url>https://github.com/buession/buession-springboot</url>
<url>https://springboot.buession.com/</url>
<description>Buession Springboot Framework Parent</description>
<version>2.2.0</version>
<version>2.2.1</version>
<packaging>pom</packaging>

<organization>
@@ -43,9 +43,9 @@
</licenses>

<scm>
<connection>scm:git:https://github.com/eduosi/buession-springboot.git</connection>
<developerConnection>scm:git:https://github.com/eduosi/buession-springboot.git</developerConnection>
<url>https://github.com/eduosi/buession-springboot</url>
<connection>scm:git:https://github.com/buession/buession-springboot.git</connection>
<developerConnection>scm:git:https://github.com/buession/buession-springboot.git</developerConnection>
<url>https://github.com/buession/buession-springboot</url>
</scm>

<issueManagement>
@@ -71,8 +71,8 @@
</modules>

<properties>
<buession.version>2.2.0</buession.version>
<buession.security.version>2.2.0</buession.security.version>
<buession.version>2.2.1</buession.version>
<buession.security.version>2.2.1</buession.security.version>
</properties>

<dependencyManagement>
4 changes: 2 additions & 2 deletions buession-springboot-session/pom.xml
Original file line number Diff line number Diff line change
@@ -7,10 +7,10 @@
<groupId>com.buession.springboot</groupId>
<artifactId>buession-springboot-parent</artifactId>
<relativePath>../buession-springboot-parent</relativePath>
<version>2.2.0</version>
<version>2.2.1</version>
</parent>
<artifactId>buession-springboot-session</artifactId>
<url>https://github.com/buession/buession-springboot</url>
<url>https://springboot.buession.com/</url>
<description>Buession Framework Springboot For Http Session</description>
<packaging>jar</packaging>

4 changes: 2 additions & 2 deletions buession-springboot-shiro/pom.xml
Original file line number Diff line number Diff line change
@@ -7,10 +7,10 @@
<groupId>com.buession.springboot</groupId>
<artifactId>buession-springboot-parent</artifactId>
<relativePath>../buession-springboot-parent</relativePath>
<version>2.2.0</version>
<version>2.2.1</version>
</parent>
<artifactId>buession-springboot-shiro</artifactId>
<url>https://github.com/buession/buession-springboot</url>
<url>https://springboot.buession.com/</url>
<description>Buession Framework Springboot For Shiro</description>
<packaging>jar</packaging>

4 changes: 2 additions & 2 deletions buession-springboot-velocity/pom.xml
Original file line number Diff line number Diff line change
@@ -7,10 +7,10 @@
<groupId>com.buession.springboot</groupId>
<artifactId>buession-springboot-parent</artifactId>
<relativePath>../buession-springboot-parent</relativePath>
<version>2.2.0</version>
<version>2.2.1</version>
</parent>
<artifactId>buession-springboot-velocity</artifactId>
<url>https://github.com/buession/buession-springboot</url>
<url>https://springboot.buession.com/</url>
<description>Buession Framework Springboot For Velocity Template Engine</description>
<packaging>jar</packaging>

Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
* +------------------------------------------------------------------------------------------------+
* | License: http://www.apache.org/licenses/LICENSE-2.0.txt |
* | Author: Yong.Teng <webmaster@buession.com> |
* | Copyright @ 2013-2022 Buession.com Inc. |
* | Copyright @ 2013-2023 Buession.com Inc. |
* +------------------------------------------------------------------------------------------------+
*/
package com.buession.springboot.velocity.autoconfigure;
@@ -198,8 +198,10 @@ public VelocityNonWebConfiguration(VelocityProperties properties){
@Bean
@ConditionalOnMissingBean
public VelocityEngineFactoryBean velocityConfiguration(){
VelocityEngineFactoryBean velocityEngineFactoryBean = new VelocityEngineFactoryBean();
final VelocityEngineFactoryBean velocityEngineFactoryBean = new VelocityEngineFactoryBean();

applyProperties(velocityEngineFactoryBean);

return velocityEngineFactoryBean;
}

4 changes: 2 additions & 2 deletions buession-springboot-web/pom.xml
Original file line number Diff line number Diff line change
@@ -7,10 +7,10 @@
<groupId>com.buession.springboot</groupId>
<artifactId>buession-springboot-parent</artifactId>
<relativePath>../buession-springboot-parent</relativePath>
<version>2.2.0</version>
<version>2.2.1</version>
</parent>
<artifactId>buession-springboot-web</artifactId>
<url>https://github.com/buession/buession-springboot</url>
<url>https://springboot.buession.com/</url>
<description>Buession Framework Springboot Web</description>
<packaging>jar</packaging>

Loading
Oops, something went wrong.

0 comments on commit fe4cd2e

Please sign in to comment.