From d1b750069e14014d833bd646a76a1037276024f8 Mon Sep 17 00:00:00 2001 From: smallchill Date: Sat, 29 Dec 2018 18:46:01 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E6=9B=B4=E6=96=B0license=E8=AF=B4?= =?UTF-8?q?=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/boot/config/BladeBootAutoConfiguration.java | 2 +- .../springblade/core/boot/config/BladeWebMvcConfiguration.java | 2 +- .../springblade/core/boot/config/MybatisPlusConfiguration.java | 2 +- .../core/boot/config/RedisTemplateConfiguration.java | 2 +- .../org/springblade/core/boot/config/RetryConfiguration.java | 2 +- .../java/org/springblade/core/boot/ctrl/BladeController.java | 2 +- .../core/boot/feign/BladeFeignRequestHeaderInterceptor.java | 2 +- .../core/boot/feign/FeignHystrixConcurrencyStrategy.java | 2 +- .../src/main/java/org/springblade/core/boot/file/BladeFile.java | 2 +- .../org/springblade/core/boot/file/BladeFileProxyFactory.java | 2 +- .../main/java/org/springblade/core/boot/file/BladeFileUtil.java | 2 +- .../java/org/springblade/core/boot/file/FileProxyManager.java | 2 +- .../main/java/org/springblade/core/boot/file/IFileProxy.java | 2 +- .../org/springblade/core/boot/redis/RedisKeySerializer.java | 2 +- .../springblade/core/boot/resolver/TokenArgumentResolver.java | 2 +- blade-core-boot/src/main/resources/log/logback_dev.xml | 2 +- blade-core-boot/src/main/resources/log/logback_prod.xml | 2 +- blade-core-boot/src/main/resources/log/logback_test.xml | 2 +- .../main/java/org/springblade/core/launch/BladeApplication.java | 2 +- .../main/java/org/springblade/core/launch/BladeLineRunner.java | 2 +- .../java/org/springblade/core/launch/StartEventListener.java | 2 +- .../launch/config/BladeConsulServiceRegistryConfiguration.java | 2 +- .../core/launch/config/BladeLaunchConfiguration.java | 2 +- .../java/org/springblade/core/launch/constant/AppConstant.java | 2 +- .../core/launch/consul/BladeConsulServiceRegistry.java | 2 +- .../core/launch/consul/ConsulLauncherServiceImpl.java | 2 +- .../java/org/springblade/core/launch/props/BladeProperties.java | 2 +- .../java/org/springblade/core/launch/server/ServerInfo.java | 2 +- .../org/springblade/core/launch/service/LauncherService.java | 2 +- .../main/java/org/springblade/core/log/annotation/ApiLog.java | 2 +- .../main/java/org/springblade/core/log/aspect/ApiLogAspect.java | 2 +- .../core/log/config/BladeErrorMvcAutoConfiguration.java | 2 +- .../core/log/config/BladeLogToolAutoConfiguration.java | 2 +- .../java/org/springblade/core/log/constant/EventConstant.java | 2 +- .../org/springblade/core/log/error/BladeErrorAttributes.java | 2 +- .../org/springblade/core/log/error/BladeErrorController.java | 2 +- .../core/log/error/BladeRestExceptionTranslator.java | 2 +- .../main/java/org/springblade/core/log/event/ApiLogEvent.java | 2 +- .../java/org/springblade/core/log/event/ApiLogListener.java | 2 +- .../main/java/org/springblade/core/log/event/ErrorLogEvent.java | 2 +- .../java/org/springblade/core/log/event/ErrorLogListener.java | 2 +- .../main/java/org/springblade/core/log/event/UsualLogEvent.java | 2 +- .../java/org/springblade/core/log/event/UsualLogListener.java | 2 +- .../org/springblade/core/log/exception/ServiceException.java | 2 +- .../main/java/org/springblade/core/log/feign/ILogClient.java | 2 +- .../main/java/org/springblade/core/log/logger/BladeLogger.java | 2 +- .../src/main/java/org/springblade/core/log/model/LogApi.java | 2 +- .../src/main/java/org/springblade/core/log/model/LogApiVo.java | 2 +- .../src/main/java/org/springblade/core/log/model/LogError.java | 2 +- .../main/java/org/springblade/core/log/model/LogErrorVo.java | 2 +- .../src/main/java/org/springblade/core/log/model/LogUsual.java | 2 +- .../main/java/org/springblade/core/log/model/LogUsualVo.java | 2 +- .../org/springblade/core/log/publisher/ApiLogPublisher.java | 2 +- .../org/springblade/core/log/publisher/BladeLogPublisher.java | 2 +- .../org/springblade/core/log/publisher/ErrorLogPublisher.java | 2 +- .../java/org/springblade/core/mp/BladeMetaObjectHandler.java | 2 +- .../src/main/java/org/springblade/core/mp/base/BaseEntity.java | 2 +- .../src/main/java/org/springblade/core/mp/base/BaseService.java | 2 +- .../main/java/org/springblade/core/mp/base/BaseServiceImpl.java | 2 +- .../java/org/springblade/core/mp/support/BaseEntityWrapper.java | 2 +- .../main/java/org/springblade/core/mp/support/Condition.java | 2 +- .../src/main/java/org/springblade/core/mp/support/Query.java | 2 +- .../src/main/java/org/springblade/core/secure/AuthInfo.java | 2 +- .../src/main/java/org/springblade/core/secure/BladeUser.java | 2 +- .../java/org/springblade/core/secure/annotation/PreAuth.java | 2 +- .../java/org/springblade/core/secure/aspect/AuthAspect.java | 2 +- .../src/main/java/org/springblade/core/secure/auth/AuthFun.java | 2 +- .../springblade/core/secure/config/RegistryConfiguration.java | 2 +- .../org/springblade/core/secure/config/SecureConfiguration.java | 2 +- .../org/springblade/core/secure/exception/SecureException.java | 2 +- .../springblade/core/secure/interceptor/SecureInterceptor.java | 2 +- .../org/springblade/core/secure/registry/SecureRegistry.java | 2 +- .../main/java/org/springblade/core/secure/utils/SecureUtil.java | 2 +- .../org/springblade/core/swagger/SwaggerAutoConfiguration.java | 2 +- .../java/org/springblade/core/swagger/SwaggerProperties.java | 2 +- .../main/java/org/springblade/core/tool/api/IResultCode.java | 2 +- .../src/main/java/org/springblade/core/tool/api/R.java | 2 +- .../src/main/java/org/springblade/core/tool/api/ResultCode.java | 2 +- .../org/springblade/core/tool/config/JacksonConfiguration.java | 2 +- .../org/springblade/core/tool/config/MessageConfiguration.java | 2 +- .../org/springblade/core/tool/config/ToolConfiguration.java | 2 +- .../java/org/springblade/core/tool/constant/BladeConstant.java | 2 +- .../java/org/springblade/core/tool/constant/RoleConstant.java | 2 +- .../java/org/springblade/core/tool/constant/SystemConstant.java | 2 +- .../jackson/AbstractReadWriteJackson2HttpMessageConverter.java | 2 +- .../core/tool/jackson/BladeBeanSerializerModifier.java | 2 +- .../org/springblade/core/tool/jackson/BladeJavaTimeModule.java | 2 +- .../main/java/org/springblade/core/tool/jackson/JsonUtil.java | 2 +- .../tool/jackson/MappingApiJackson2HttpMessageConverter.java | 2 +- .../src/main/java/org/springblade/core/tool/node/BaseNode.java | 2 +- .../main/java/org/springblade/core/tool/node/ForestNode.java | 2 +- .../java/org/springblade/core/tool/node/ForestNodeManager.java | 2 +- .../java/org/springblade/core/tool/node/ForestNodeMerger.java | 2 +- .../src/main/java/org/springblade/core/tool/node/INode.java | 2 +- .../src/main/java/org/springblade/core/tool/node/TreeNode.java | 2 +- .../java/org/springblade/core/tool/support/BaseBeanCopier.java | 2 +- .../org/springblade/core/tool/support/IMultiOutputStream.java | 2 +- .../java/org/springblade/core/tool/support/ImagePosition.java | 2 +- .../src/main/java/org/springblade/core/tool/support/Kv.java | 2 +- .../java/org/springblade/core/tool/support/xss/XssFilter.java | 2 +- .../core/tool/support/xss/XssHttpServletRequestWrapper.java | 2 +- .../src/main/java/org/springblade/core/tool/utils/AesUtil.java | 2 +- .../main/java/org/springblade/core/tool/utils/Base64Util.java | 2 +- .../src/main/java/org/springblade/core/tool/utils/BeanUtil.java | 2 +- .../src/main/java/org/springblade/core/tool/utils/Charsets.java | 2 +- .../main/java/org/springblade/core/tool/utils/ClassUtil.java | 2 +- .../java/org/springblade/core/tool/utils/CollectionUtil.java | 2 +- .../org/springblade/core/tool/utils/ConcurrentDateFormat.java | 2 +- .../main/java/org/springblade/core/tool/utils/DateTimeUtil.java | 2 +- .../src/main/java/org/springblade/core/tool/utils/DateUtil.java | 2 +- .../main/java/org/springblade/core/tool/utils/DigestUtil.java | 2 +- .../main/java/org/springblade/core/tool/utils/Exceptions.java | 2 +- .../src/main/java/org/springblade/core/tool/utils/Func.java | 2 +- .../main/java/org/springblade/core/tool/utils/ImageUtil.java | 2 +- .../src/main/java/org/springblade/core/tool/utils/IoUtil.java | 2 +- .../src/main/java/org/springblade/core/tool/utils/Lazy.java | 2 +- .../main/java/org/springblade/core/tool/utils/NumberUtil.java | 2 +- .../main/java/org/springblade/core/tool/utils/ObjectUtil.java | 2 +- .../main/java/org/springblade/core/tool/utils/OkHttpUtil.java | 2 +- .../src/main/java/org/springblade/core/tool/utils/PathUtil.java | 2 +- .../java/org/springblade/core/tool/utils/ProtostuffUtil.java | 2 +- .../main/java/org/springblade/core/tool/utils/RandomType.java | 2 +- .../main/java/org/springblade/core/tool/utils/RegexUtil.java | 2 +- .../main/java/org/springblade/core/tool/utils/ResourceUtil.java | 2 +- .../main/java/org/springblade/core/tool/utils/SpringUtil.java | 2 +- .../main/java/org/springblade/core/tool/utils/StringPool.java | 2 +- .../main/java/org/springblade/core/tool/utils/StringUtil.java | 2 +- .../java/org/springblade/core/tool/utils/SuffixFileFilter.java | 2 +- .../src/main/java/org/springblade/core/tool/utils/UrlUtil.java | 2 +- .../src/main/java/org/springblade/core/tool/utils/WebUtil.java | 2 +- .../src/main/java/org/springblade/core/tool/utils/XmlUtil.java | 2 +- 131 files changed, 131 insertions(+), 131 deletions(-) diff --git a/blade-core-boot/src/main/java/org/springblade/core/boot/config/BladeBootAutoConfiguration.java b/blade-core-boot/src/main/java/org/springblade/core/boot/config/BladeBootAutoConfiguration.java index af8daa0..1cf86b3 100644 --- a/blade-core-boot/src/main/java/org/springblade/core/boot/config/BladeBootAutoConfiguration.java +++ b/blade-core-boot/src/main/java/org/springblade/core/boot/config/BladeBootAutoConfiguration.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). *

- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE; + * 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 *

diff --git a/blade-core-boot/src/main/java/org/springblade/core/boot/config/BladeWebMvcConfiguration.java b/blade-core-boot/src/main/java/org/springblade/core/boot/config/BladeWebMvcConfiguration.java index ce66ae9..16581fb 100644 --- a/blade-core-boot/src/main/java/org/springblade/core/boot/config/BladeWebMvcConfiguration.java +++ b/blade-core-boot/src/main/java/org/springblade/core/boot/config/BladeWebMvcConfiguration.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). *

- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE; + * 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 *

diff --git a/blade-core-boot/src/main/java/org/springblade/core/boot/config/MybatisPlusConfiguration.java b/blade-core-boot/src/main/java/org/springblade/core/boot/config/MybatisPlusConfiguration.java index f3d25b3..61ef35f 100644 --- a/blade-core-boot/src/main/java/org/springblade/core/boot/config/MybatisPlusConfiguration.java +++ b/blade-core-boot/src/main/java/org/springblade/core/boot/config/MybatisPlusConfiguration.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). *

- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE; + * 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 *

diff --git a/blade-core-boot/src/main/java/org/springblade/core/boot/config/RedisTemplateConfiguration.java b/blade-core-boot/src/main/java/org/springblade/core/boot/config/RedisTemplateConfiguration.java index 58d8cef..48fb910 100644 --- a/blade-core-boot/src/main/java/org/springblade/core/boot/config/RedisTemplateConfiguration.java +++ b/blade-core-boot/src/main/java/org/springblade/core/boot/config/RedisTemplateConfiguration.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). *

- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE; + * 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 *

diff --git a/blade-core-boot/src/main/java/org/springblade/core/boot/config/RetryConfiguration.java b/blade-core-boot/src/main/java/org/springblade/core/boot/config/RetryConfiguration.java index f0aed4f..8530cf6 100644 --- a/blade-core-boot/src/main/java/org/springblade/core/boot/config/RetryConfiguration.java +++ b/blade-core-boot/src/main/java/org/springblade/core/boot/config/RetryConfiguration.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). *

- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE; + * 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 *

diff --git a/blade-core-boot/src/main/java/org/springblade/core/boot/ctrl/BladeController.java b/blade-core-boot/src/main/java/org/springblade/core/boot/ctrl/BladeController.java index f6e9163..48cea25 100644 --- a/blade-core-boot/src/main/java/org/springblade/core/boot/ctrl/BladeController.java +++ b/blade-core-boot/src/main/java/org/springblade/core/boot/ctrl/BladeController.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). *

- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE; + * 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 *

diff --git a/blade-core-boot/src/main/java/org/springblade/core/boot/feign/BladeFeignRequestHeaderInterceptor.java b/blade-core-boot/src/main/java/org/springblade/core/boot/feign/BladeFeignRequestHeaderInterceptor.java index b85d56e..6148b3d 100644 --- a/blade-core-boot/src/main/java/org/springblade/core/boot/feign/BladeFeignRequestHeaderInterceptor.java +++ b/blade-core-boot/src/main/java/org/springblade/core/boot/feign/BladeFeignRequestHeaderInterceptor.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). *

- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE; + * 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 *

diff --git a/blade-core-boot/src/main/java/org/springblade/core/boot/feign/FeignHystrixConcurrencyStrategy.java b/blade-core-boot/src/main/java/org/springblade/core/boot/feign/FeignHystrixConcurrencyStrategy.java index ed09f4a..5492316 100644 --- a/blade-core-boot/src/main/java/org/springblade/core/boot/feign/FeignHystrixConcurrencyStrategy.java +++ b/blade-core-boot/src/main/java/org/springblade/core/boot/feign/FeignHystrixConcurrencyStrategy.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). *

- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE; + * 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 *

diff --git a/blade-core-boot/src/main/java/org/springblade/core/boot/file/BladeFile.java b/blade-core-boot/src/main/java/org/springblade/core/boot/file/BladeFile.java index 4e84701..740c824 100644 --- a/blade-core-boot/src/main/java/org/springblade/core/boot/file/BladeFile.java +++ b/blade-core-boot/src/main/java/org/springblade/core/boot/file/BladeFile.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). *

- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE; + * 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 *

diff --git a/blade-core-boot/src/main/java/org/springblade/core/boot/file/BladeFileProxyFactory.java b/blade-core-boot/src/main/java/org/springblade/core/boot/file/BladeFileProxyFactory.java index 786921b..42e805e 100644 --- a/blade-core-boot/src/main/java/org/springblade/core/boot/file/BladeFileProxyFactory.java +++ b/blade-core-boot/src/main/java/org/springblade/core/boot/file/BladeFileProxyFactory.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). *

- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE; + * 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 *

diff --git a/blade-core-boot/src/main/java/org/springblade/core/boot/file/BladeFileUtil.java b/blade-core-boot/src/main/java/org/springblade/core/boot/file/BladeFileUtil.java index aa6024f..fc7a922 100644 --- a/blade-core-boot/src/main/java/org/springblade/core/boot/file/BladeFileUtil.java +++ b/blade-core-boot/src/main/java/org/springblade/core/boot/file/BladeFileUtil.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). *

- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE; + * 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 *

diff --git a/blade-core-boot/src/main/java/org/springblade/core/boot/file/FileProxyManager.java b/blade-core-boot/src/main/java/org/springblade/core/boot/file/FileProxyManager.java index 984ec44..ca79736 100644 --- a/blade-core-boot/src/main/java/org/springblade/core/boot/file/FileProxyManager.java +++ b/blade-core-boot/src/main/java/org/springblade/core/boot/file/FileProxyManager.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). *

- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE; + * 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 *

diff --git a/blade-core-boot/src/main/java/org/springblade/core/boot/file/IFileProxy.java b/blade-core-boot/src/main/java/org/springblade/core/boot/file/IFileProxy.java index c7a09ee..6da15fd 100644 --- a/blade-core-boot/src/main/java/org/springblade/core/boot/file/IFileProxy.java +++ b/blade-core-boot/src/main/java/org/springblade/core/boot/file/IFileProxy.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). *

- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE; + * 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 *

diff --git a/blade-core-boot/src/main/java/org/springblade/core/boot/redis/RedisKeySerializer.java b/blade-core-boot/src/main/java/org/springblade/core/boot/redis/RedisKeySerializer.java index 5b11cdd..cee1747 100644 --- a/blade-core-boot/src/main/java/org/springblade/core/boot/redis/RedisKeySerializer.java +++ b/blade-core-boot/src/main/java/org/springblade/core/boot/redis/RedisKeySerializer.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2018-2028, DreamLu 卢春梦 (qq596392912@gmail.com). *

- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE; + * 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 *

diff --git a/blade-core-boot/src/main/java/org/springblade/core/boot/resolver/TokenArgumentResolver.java b/blade-core-boot/src/main/java/org/springblade/core/boot/resolver/TokenArgumentResolver.java index 74a4b05..099ba8f 100644 --- a/blade-core-boot/src/main/java/org/springblade/core/boot/resolver/TokenArgumentResolver.java +++ b/blade-core-boot/src/main/java/org/springblade/core/boot/resolver/TokenArgumentResolver.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). *

- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE; + * 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 *

diff --git a/blade-core-boot/src/main/resources/log/logback_dev.xml b/blade-core-boot/src/main/resources/log/logback_dev.xml index 4faf6ed..0135fc0 100644 --- a/blade-core-boot/src/main/resources/log/logback_dev.xml +++ b/blade-core-boot/src/main/resources/log/logback_dev.xml @@ -2,7 +2,7 @@