Browse Source

2.1.0.RELEASE

test
smallchill 6 years ago
parent
commit
74638f095a
  1. 2
      blade-auth/pom.xml
  2. 2
      blade-common/pom.xml
  3. 2
      blade-gateway/pom.xml
  4. 2
      blade-ops-api/blade-flow-api/pom.xml
  5. 4
      blade-ops-api/pom.xml
  6. 2
      blade-ops/blade-admin/pom.xml
  7. 2
      blade-ops/blade-develop/pom.xml
  8. 2
      blade-ops/blade-flow-design/pom.xml
  9. 2
      blade-ops/blade-flow/pom.xml
  10. 2
      blade-ops/blade-log/pom.xml
  11. 2
      blade-ops/blade-resource/pom.xml
  12. 63
      blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/AliBuilder.java
  13. 2
      blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/OssBuilder.java
  14. 4
      blade-ops/pom.xml
  15. 2
      blade-service-api/blade-desk-api/pom.xml
  16. 2
      blade-service-api/blade-dict-api/pom.xml
  17. 2
      blade-service-api/blade-scope-api/pom.xml
  18. 2
      blade-service-api/blade-system-api/pom.xml
  19. 2
      blade-service-api/blade-user-api/pom.xml
  20. 4
      blade-service-api/pom.xml
  21. 2
      blade-service/blade-desk/pom.xml
  22. 2
      blade-service/blade-system/pom.xml
  23. 2
      blade-service/blade-user/pom.xml
  24. 4
      blade-service/pom.xml
  25. 9
      doc/sql/update/mysql-update-2.0.7~2.0.8.sql
  26. 8
      doc/sql/update/oracle-update-2.0.7~2.0.8.sql
  27. 9
      doc/sql/update/postgresql-update-2.0.7~2.0.8.sql
  28. 6
      pom.xml
  29. 2
      script/docker/.env

2
blade-auth/pom.xml

@ -8,7 +8,7 @@
<parent> <parent>
<artifactId>BladeX</artifactId> <artifactId>BladeX</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
</parent> </parent>
<artifactId>blade-auth</artifactId> <artifactId>blade-auth</artifactId>

2
blade-common/pom.xml

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>BladeX</artifactId> <artifactId>BladeX</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-gateway/pom.xml

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>BladeX</artifactId> <artifactId>BladeX</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-ops-api/blade-flow-api/pom.xml

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-ops-api</artifactId> <artifactId>blade-ops-api</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

4
blade-ops-api/pom.xml

@ -5,13 +5,13 @@
<parent> <parent>
<artifactId>BladeX</artifactId> <artifactId>BladeX</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-ops-api</artifactId> <artifactId>blade-ops-api</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<description>BladeX 微服务API集合</description> <description>BladeX 微服务API集合</description>

2
blade-ops/blade-admin/pom.xml

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-ops</artifactId> <artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-ops/blade-develop/pom.xml

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-ops</artifactId> <artifactId>blade-ops</artifactId>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-ops/blade-flow-design/pom.xml

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-ops</artifactId> <artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-ops/blade-flow/pom.xml

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-ops</artifactId> <artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-ops/blade-log/pom.xml

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-ops</artifactId> <artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-ops/blade-resource/pom.xml

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-ops</artifactId> <artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

63
blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/AliBuilder.java

@ -0,0 +1,63 @@
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package org.springblade.resource.builder;
import com.aliyun.oss.ClientConfiguration;
import com.aliyun.oss.OSSClient;
import com.aliyun.oss.common.auth.CredentialsProvider;
import com.aliyun.oss.common.auth.DefaultCredentialProvider;
import lombok.SneakyThrows;
import org.springblade.core.alioss.AliossTemplate;
import org.springblade.core.oss.OssTemplate;
import org.springblade.core.oss.props.OssProperties;
import org.springblade.core.oss.rule.OssRule;
import org.springblade.resource.entity.Oss;
/**
* QiniuBuilder
*
* @author Chill
*/
public class AliBuilder {
@SneakyThrows
public static OssTemplate template(Oss oss, OssRule ossRule) {
// 创建ClientConfiguration。ClientConfiguration是OSSClient的配置类,可配置代理、连接超时、最大连接数等参数。
ClientConfiguration conf = new ClientConfiguration();
// 设置OSSClient允许打开的最大HTTP连接数,默认为1024个。
conf.setMaxConnections(1024);
// 设置Socket层传输数据的超时时间,默认为50000毫秒。
conf.setSocketTimeout(50000);
// 设置建立连接的超时时间,默认为50000毫秒。
conf.setConnectionTimeout(50000);
// 设置从连接池中获取连接的超时时间(单位:毫秒),默认不超时。
conf.setConnectionRequestTimeout(1000);
// 设置连接空闲超时时间。超时则关闭连接,默认为60000毫秒。
conf.setIdleConnectionTime(60000);
// 设置失败请求重试次数,默认为3次。
conf.setMaxErrorRetry(5);
OssProperties ossProperties = new OssProperties();
ossProperties.setEndpoint(oss.getEndpoint());
ossProperties.setAccessKey(oss.getAccessKey());
ossProperties.setSecretKey(oss.getSecretKey());
ossProperties.setBucketName(oss.getBucketName());
CredentialsProvider credentialsProvider = new DefaultCredentialProvider(ossProperties.getAccessKey(), ossProperties.getSecretKey());
OSSClient ossClient = new OSSClient(ossProperties.getEndpoint(), credentialsProvider, conf);
return new AliossTemplate(ossClient, ossProperties, ossRule);
}
}

2
blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/OssBuilder.java

@ -87,6 +87,8 @@ public class OssBuilder {
template = MinioBuilder.template(oss, ossRule); template = MinioBuilder.template(oss, ossRule);
} else if (oss.getCategory() == OssEnum.QINIU.getCategory()) { } else if (oss.getCategory() == OssEnum.QINIU.getCategory()) {
template = QiniuBuilder.template(oss, ossRule); template = QiniuBuilder.template(oss, ossRule);
} else if (oss.getCategory() == OssEnum.ALI.getCategory()) {
template = AliBuilder.template(oss, ossRule);
} }
templatePool.put(tenantId, template); templatePool.put(tenantId, template);
ossPool.put(tenantId, oss); ossPool.put(tenantId, oss);

4
blade-ops/pom.xml

@ -5,13 +5,13 @@
<parent> <parent>
<artifactId>BladeX</artifactId> <artifactId>BladeX</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-ops</artifactId> <artifactId>blade-ops</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>

2
blade-service-api/blade-desk-api/pom.xml

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-service-api</artifactId> <artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-service-api/blade-dict-api/pom.xml

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-service-api</artifactId> <artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-service-api/blade-scope-api/pom.xml

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-service-api</artifactId> <artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-service-api/blade-system-api/pom.xml

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-service-api</artifactId> <artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-service-api/blade-user-api/pom.xml

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-service-api</artifactId> <artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

4
blade-service-api/pom.xml

@ -5,13 +5,13 @@
<parent> <parent>
<artifactId>BladeX</artifactId> <artifactId>BladeX</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-service-api</artifactId> <artifactId>blade-service-api</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<description>BladeX 微服务API集合</description> <description>BladeX 微服务API集合</description>

2
blade-service/blade-desk/pom.xml

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-service</artifactId> <artifactId>blade-service</artifactId>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-service/blade-system/pom.xml

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-service</artifactId> <artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-service/blade-user/pom.xml

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-service</artifactId> <artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

4
blade-service/pom.xml

@ -6,14 +6,14 @@
<parent> <parent>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>BladeX</artifactId> <artifactId>BladeX</artifactId>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-service</artifactId> <artifactId>blade-service</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<description>BladeX 微服务集合</description> <description>BladeX 微服务集合</description>

9
doc/sql/update/mysql-update-2.0.7~2.0.8.sql

@ -14,3 +14,12 @@ INSERT INTO `blade_role_menu`(`id`,`menu_id`,`role_id`)
VALUES ('1161272593873322996', '1164733121140551682', '1123598816738675201'); VALUES ('1161272593873322996', '1164733121140551682', '1123598816738675201');
INSERT INTO `blade_role_menu`(`id`,`menu_id`,`role_id`) INSERT INTO `blade_role_menu`(`id`,`menu_id`,`role_id`)
VALUES ('1161272593873322997', '1164733349637844993', '1123598816738675201'); VALUES ('1161272593873322997', '1164733349637844993', '1123598816738675201');
-- ----------------------------
-- 重新配置oss字典
-- ----------------------------
DELETE FROM `blade_dict` WHERE CODE = 'oss';
INSERT INTO `blade_dict`(`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_deleted`) VALUES (1123598814738676224, 0, 'oss', -1, '对象存储类型', 6, NULL, 0);
INSERT INTO `blade_dict`(`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_deleted`) VALUES (1123598814738676225, 1123598814738676224, 'oss', 1, 'minio', 1, NULL, 0);
INSERT INTO `blade_dict`(`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_deleted`) VALUES (1123598814738676226, 1123598814738676224, 'oss', 2, 'qiniu', 2, NULL, 0);
INSERT INTO `blade_dict`(`id`, `parent_id`, `code`, `dict_key`, `dict_value`, `sort`, `remark`, `is_deleted`) VALUES (1123598814738676227, 1123598814738676224, 'oss', 3, 'qiniu', 3, NULL, 0);

8
doc/sql/update/oracle-update-2.0.7~2.0.8.sql

@ -15,3 +15,11 @@ VALUES ('1161272593873322996', '1164733121140551682', '1123598816738675201');
INSERT INTO "BLADEX"."BLADE_ROLE_MENU"(ID,MENU_ID,ROLE_ID) INSERT INTO "BLADEX"."BLADE_ROLE_MENU"(ID,MENU_ID,ROLE_ID)
VALUES ('1161272593873322997', '1164733349637844993', '1123598816738675201'); VALUES ('1161272593873322997', '1164733349637844993', '1123598816738675201');
-- ----------------------------
-- 重新配置oss字典
-- ----------------------------
DELETE FROM "BLADEX"."BLADE_DICT" WHERE CODE = 'oss';
INSERT INTO "BLADEX"."BLADE_DICT"(ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_DELETED) VALUES (1123598814738676224, 0, 'oss', -1, '对象存储类型', 6, NULL, 0);
INSERT INTO "BLADEX"."BLADE_DICT"(ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_DELETED) VALUES (1123598814738676225, 1123598814738676224, 'oss', 1, 'minio', 1, NULL, 0);
INSERT INTO "BLADEX"."BLADE_DICT"(ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_DELETED) VALUES (1123598814738676226, 1123598814738676224, 'oss', 2, 'qiniu', 2, NULL, 0);
INSERT INTO "BLADEX"."BLADE_DICT"(ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_DELETED) VALUES (1123598814738676227, 1123598814738676224, 'oss', 3, 'qiniu', 3, NULL, 0);

9
doc/sql/update/postgresql-update-2.0.7~2.0.8.sql

@ -14,3 +14,12 @@ INSERT INTO "blade_role_menu"("id","menu_id","role_id")
VALUES ('1161272593873322996', '1164733121140551682', '1123598816738675201'); VALUES ('1161272593873322996', '1164733121140551682', '1123598816738675201');
INSERT INTO "blade_role_menu"("id","menu_id","role_id") INSERT INTO "blade_role_menu"("id","menu_id","role_id")
VALUES ('1161272593873322997', '1164733349637844993', '1123598816738675201'); VALUES ('1161272593873322997', '1164733349637844993', '1123598816738675201');
-- ----------------------------
-- 重新配置oss字典
-- ----------------------------
DELETE FROM "blade_dict" WHERE CODE = 'oss';
INSERT INTO "blade_dict"("id", "parent_id", "code", "dict_key", "dict_value", "sort", "remark", "is_deleted") VALUES (1123598814738676224, 0, 'oss', -1, '对象存储类型', 6, NULL, 0);
INSERT INTO "blade_dict"("id", "parent_id", "code", "dict_key", "dict_value", "sort", "remark", "is_deleted") VALUES (1123598814738676225, 1123598814738676224, 'oss', 1, 'minio', 1, NULL, 0);
INSERT INTO "blade_dict"("id", "parent_id", "code", "dict_key", "dict_value", "sort", "remark", "is_deleted") VALUES (1123598814738676226, 1123598814738676224, 'oss', 2, 'qiniu', 2, NULL, 0);
INSERT INTO "blade_dict"("id", "parent_id", "code", "dict_key", "dict_value", "sort", "remark", "is_deleted") VALUES (1123598814738676227, 1123598814738676224, 'oss', 3, 'qiniu', 3, NULL, 0);

6
pom.xml

@ -5,12 +5,12 @@
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>BladeX</artifactId> <artifactId>BladeX</artifactId>
<version>2.0.7.RELEASE</version> <version>2.1.0.RELEASE</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>
<bladex.tool.version>2.0.7.RELEASE</bladex.tool.version> <bladex.tool.version>2.1.0.RELEASE</bladex.tool.version>
<bladex.project.version>2.0.7.RELEASE</bladex.project.version> <bladex.project.version>2.1.0.RELEASE</bladex.project.version>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<maven.plugin.version>3.8.1</maven.plugin.version> <maven.plugin.version>3.8.1</maven.plugin.version>

2
script/docker/.env

@ -1,2 +1,2 @@
REGISTER=192.168.0.157/blade REGISTER=192.168.0.157/blade
TAG=2.0.7.RELEASE TAG=2.1.0.RELEASE

Loading…
Cancel
Save