blade/blade-tool
1
0
Fork 0
mirror of https://github.com/chillzhuang/blade-tool synced 2024-11-16 23:49:34 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2 from chillzhuang/master

Browse Source 
update
This commit is contained in:
kk 2019-11-19 11:13:39 +08:00 committed by GitHub
commit b13533a4d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 108 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -1,7 +1,7 @@
<p align="center">
<img src="https://img.shields.io/badge/license-LGPL%20v3-blue.svg" alt="Build Status">
<img src="https://img.shields.io/badge/Spring%20Cloud-Greenwich.SR2-blue.svg" alt="Coverage Status">
<img src="https://img.shields.io/badge/Spring%20Boot-2.1.7.RELEASE-blue.svg" alt="Downloads">
<img src="https://img.shields.io/badge/Spring%20Cloud-Greenwich.SR3-blue.svg" alt="Coverage Status">
<img src="https://img.shields.io/badge/Spring%20Boot-2.1.9.RELEASE-blue.svg" alt="Downloads">
</p>
## SpringBlade微服务开发平台

2
blade-core-boot/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>blade-tool</artifactId>
<version>2.5.2</version>
<version>2.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-core-boot/src/main/resources/bootstrap.yml
View File

@ -100,7 +100,7 @@ mybatis-plus:
swagger:
title: SpringBlade 接口文档系统
description: SpringBlade 接口文档系统
version: 2.5.2
version: 2.5.4
license: Powered By SpringBlade
licenseUrl: https://bladex.vip
terms-of-service-url: https://bladex.vip

2
blade-core-cloud/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-tool</artifactId>
<groupId>org.springblade</groupId>
<version>2.5.2</version>
<version>2.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-core-develop/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-tool</artifactId>
<groupId>org.springblade</groupId>
<version>2.5.2</version>
<version>2.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-core-launch/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-tool</artifactId>
<groupId>org.springblade</groupId>
<version>2.5.2</version>
<version>2.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

6
blade-core-launch/src/main/java/org/springblade/core/launch/constant/AppConstant.java
View File

@ -25,7 +25,7 @@ public interface AppConstant {
/**
* 应用版本
*/
String APPLICATION_VERSION = "2.5.2";
String APPLICATION_VERSION = "2.5.4";
/**
* 基础包
@ -72,6 +72,10 @@ public interface AppConstant {
* 资源模块名称
*/
String APPLICATION_RESOURCE_NAME = APPLICATION_NAME_PREFIX + "resource";
/**
* 链路追踪模块名称
*/
String APPLICATION_ZIPKIN_NAME = APPLICATION_NAME_PREFIX + "zipkin";
/**
* 测试模块名称
*/

39
blade-core-launch/src/main/java/org/springblade/core/launch/constant/NacosConstant.java
View File

@ -41,4 +41,43 @@ public interface NacosConstant {
* nacos 配置文件类型
*/
String NACOS_CONFIG_FORMAT = "yaml";
/**
* nacos json配置文件类型
*/
String NACOS_CONFIG_JSON_FORMAT = "json";
/**
* nacos 是否刷新
*/
String NACOS_CONFIG_REFRESH = "true";
/**
* nacos 分组
*/
String NACOS_CONFIG_GROUP = "DEFAULT_GROUP";
/**
* 构建服务对应的 dataId
*
* @param appName 服务名
* @param profile 环境变量
* @return dataId
*/
static String dataId(String appName, String profile) {
return dataId(appName, profile, NACOS_CONFIG_FORMAT);
}
/**
* 构建服务对应的 dataId
*
* @param appName 服务名
* @param profile 环境变量
* @param format 文件类型
* @return dataId
*/
static String dataId(String appName, String profile, String format) {
return appName + "-" + profile + "." + format;
}
}

42
blade-core-launch/src/main/java/org/springblade/core/launch/utils/PropsUtil.java Normal file
View File

@ -0,0 +1,42 @@
/**
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* <p>
* Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* http://www.gnu.org/licenses/lgpl.html
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springblade.core.launch.utils;
import org.springframework.util.StringUtils;
import java.util.Properties;
/**
* 配置工具类
*
* @author Chill
*/
public class PropsUtil {
/**
* 设置配置值，已存在则跳过
*
* @param props property
* @param key key
* @param value value
*/
public static void setProperty(Properties props, String key, String value) {
if (StringUtils.isEmpty(props.getProperty(key))) {
props.setProperty(key, value);
}
}
}

2
blade-core-log/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-tool</artifactId>
<groupId>org.springblade</groupId>
<version>2.5.2</version>
<version>2.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-core-mybatis/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-tool</artifactId>
<groupId>org.springblade</groupId>
<version>2.5.2</version>
<version>2.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-core-mybatis/src/main/java/org/springblade/core/mp/support/Condition.java
View File

@ -65,6 +65,8 @@ public class Condition {
public static <T> QueryWrapper<T> getQueryWrapper(Map<String, Object> query, Class<T> clazz) {
query.remove("current");
query.remove("size");
query.remove("ascs");
query.remove("descs");
QueryWrapper<T> qw = new QueryWrapper<>();
qw.setEntity(BeanUtil.newInstance(clazz));
SqlKeyword.buildCondition(query, qw);

2
blade-core-oss/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-tool</artifactId>
<groupId>org.springblade</groupId>
<version>2.5.2</version>
<version>2.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-core-secure/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-tool</artifactId>
<groupId>org.springblade</groupId>
<version>2.5.2</version>
<version>2.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-core-swagger/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-tool</artifactId>
<groupId>org.springblade</groupId>
<version>2.5.2</version>
<version>2.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-core-swagger/src/main/java/org/springblade/core/swagger/SwaggerProperties.java
View File

@ -55,7 +55,7 @@ public class SwaggerProperties {
/**
* 版本
**/
private String version = "2.5.2";
private String version = "2.5.4";
/**
* 许可证
**/

2
blade-core-test/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>blade-tool</artifactId>
<version>2.5.2</version>
<version>2.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-core-tool/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>blade-tool</artifactId>
<version>2.5.2</version>
<version>2.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-core-transaction/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-tool</artifactId>
<groupId>org.springblade</groupId>
<version>2.5.2</version>
<version>2.5.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

8
pom.xml
View File

@ -5,7 +5,7 @@
<groupId>org.springblade</groupId>
<artifactId>blade-tool</artifactId>
<version>2.5.2</version>
<version>2.5.4</version>
<packaging>pom</packaging>
<name>blade-tool</name>
<description>
@ -36,7 +36,7 @@
</scm>
<properties>
<blade.tool.version>2.5.2</blade.tool.version>
<blade.tool.version>2.5.4</blade.tool.version>
<java.version>1.8</java.version>
<maven.plugin.version>3.8.0</maven.plugin.version>
@ -50,9 +50,9 @@
<spring.boot.admin.version>2.1.5</spring.boot.admin.version>
<mica.auto.version>1.1.0</mica.auto.version>
<alibaba.cloud.version>2.1.0.RELEASE</alibaba.cloud.version>
<alibaba.seata.version>0.8.1</alibaba.seata.version>
<alibaba.seata.version>0.9.0</alibaba.seata.version>
<spring.boot.version>2.1.8.RELEASE</spring.boot.version>
<spring.boot.version>2.1.9.RELEASE</spring.boot.version>
<spring.cloud.version>Greenwich.SR3</spring.cloud.version>
<spring.platform.version>Cairo-SR8</spring.platform.version>