This commit is contained in:
choweli
2025-04-15 17:02:41 +08:00
parent b0e37e3ef3
commit 22d487624d
2867 changed files with 9839 additions and 10677 deletions

View File

@@ -23,9 +23,9 @@
<packaging>jar</packaging>
<parent>
<groupId>org.dromara.hutool</groupId>
<groupId>cn.hutool.v7</groupId>
<artifactId>hutool-parent</artifactId>
<version>6.0.0-M22</version>
<version>7.0.0.M1</version>
</parent>
<artifactId>hutool-setting</artifactId>
@@ -33,18 +33,18 @@
<description>Hutool 配置文件增强</description>
<properties>
<Automatic-Module-Name>org.dromara.hutool.setting</Automatic-Module-Name>
<Automatic-Module-Name>cn.hutool.v7.setting</Automatic-Module-Name>
<snakeyaml.version>2.3</snakeyaml.version>
</properties>
<dependencies>
<dependency>
<groupId>org.dromara.hutool</groupId>
<groupId>cn.hutool.v7</groupId>
<artifactId>hutool-core</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.dromara.hutool</groupId>
<groupId>cn.hutool.v7</groupId>
<artifactId>hutool-log</artifactId>
<version>${project.parent.version}</version>
</dependency>

View File

@@ -14,20 +14,20 @@
* limitations under the License.
*/
package org.dromara.hutool.setting;
package cn.hutool.v7.setting;
import org.dromara.hutool.core.bean.BeanUtil;
import org.dromara.hutool.core.bean.copier.CopyOptions;
import org.dromara.hutool.core.bean.copier.ValueProvider;
import org.dromara.hutool.core.func.LambdaInfo;
import org.dromara.hutool.core.func.LambdaUtil;
import org.dromara.hutool.core.func.SerFunction;
import org.dromara.hutool.core.lang.getter.GroupedTypeGetter;
import org.dromara.hutool.core.lang.getter.TypeGetter;
import org.dromara.hutool.core.reflect.ConstructorUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.core.text.split.SplitUtil;
import org.dromara.hutool.core.util.ObjUtil;
import cn.hutool.v7.core.bean.BeanUtil;
import cn.hutool.v7.core.bean.copier.CopyOptions;
import cn.hutool.v7.core.bean.copier.ValueProvider;
import cn.hutool.v7.core.func.LambdaInfo;
import cn.hutool.v7.core.func.LambdaUtil;
import cn.hutool.v7.core.func.SerFunction;
import cn.hutool.v7.core.lang.getter.GroupedTypeGetter;
import cn.hutool.v7.core.lang.getter.TypeGetter;
import cn.hutool.v7.core.reflect.ConstructorUtil;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.core.text.split.SplitUtil;
import cn.hutool.v7.core.util.ObjUtil;
import java.io.Serializable;
import java.lang.reflect.Type;

View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.dromara.hutool.setting;
package cn.hutool.v7.setting;
import org.dromara.hutool.core.map.MapUtil;
import org.dromara.hutool.core.text.StrUtil;
import cn.hutool.v7.core.map.MapUtil;
import cn.hutool.v7.core.text.StrUtil;
import java.util.Collection;
import java.util.Collections;

View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.dromara.hutool.setting;
package cn.hutool.v7.setting;
import org.dromara.hutool.core.collection.CollUtil;
import org.dromara.hutool.core.io.IoUtil;
import org.dromara.hutool.core.net.url.UrlUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.core.util.CharsetUtil;
import cn.hutool.v7.core.collection.CollUtil;
import cn.hutool.v7.core.io.IoUtil;
import cn.hutool.v7.core.net.url.UrlUtil;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.core.array.ArrayUtil;
import cn.hutool.v7.core.util.CharsetUtil;
import java.io.BufferedReader;
import java.io.File;

View File

@@ -14,25 +14,25 @@
* limitations under the License.
*/
package org.dromara.hutool.setting;
package cn.hutool.v7.setting;
import org.dromara.hutool.core.collection.ListUtil;
import org.dromara.hutool.core.convert.ConvertUtil;
import org.dromara.hutool.core.func.LambdaUtil;
import org.dromara.hutool.core.func.SerSupplier;
import org.dromara.hutool.core.io.IoUtil;
import org.dromara.hutool.core.io.file.FileUtil;
import org.dromara.hutool.core.io.resource.Resource;
import org.dromara.hutool.core.io.resource.ResourceUtil;
import org.dromara.hutool.core.io.watch.WatchMonitor;
import org.dromara.hutool.core.io.watch.WatchUtil;
import org.dromara.hutool.core.io.watch.watchers.SimpleWatcher;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.text.CharUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.core.util.CharsetUtil;
import org.dromara.hutool.log.LogUtil;
import org.dromara.hutool.setting.props.Props;
import cn.hutool.v7.core.collection.ListUtil;
import cn.hutool.v7.core.convert.ConvertUtil;
import cn.hutool.v7.core.func.LambdaUtil;
import cn.hutool.v7.core.func.SerSupplier;
import cn.hutool.v7.core.io.IoUtil;
import cn.hutool.v7.core.io.file.FileUtil;
import cn.hutool.v7.core.io.resource.Resource;
import cn.hutool.v7.core.io.resource.ResourceUtil;
import cn.hutool.v7.core.io.watch.WatchMonitor;
import cn.hutool.v7.core.io.watch.WatchUtil;
import cn.hutool.v7.core.io.watch.watchers.SimpleWatcher;
import cn.hutool.v7.core.lang.Assert;
import cn.hutool.v7.core.text.CharUtil;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.core.util.CharsetUtil;
import cn.hutool.v7.log.LogUtil;
import cn.hutool.v7.setting.props.Props;
import java.io.File;
import java.net.URL;

View File

@@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.dromara.hutool.setting;
package cn.hutool.v7.setting;
import org.dromara.hutool.core.exception.HutoolException;
import cn.hutool.v7.core.exception.HutoolException;
/**
* 设置异常

View File

@@ -14,20 +14,20 @@
* limitations under the License.
*/
package org.dromara.hutool.setting;
package cn.hutool.v7.setting;
import org.dromara.hutool.core.io.IoUtil;
import org.dromara.hutool.core.io.LineReader;
import org.dromara.hutool.core.io.file.FileUtil;
import org.dromara.hutool.core.io.resource.NoResourceException;
import org.dromara.hutool.core.io.resource.Resource;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.regex.ReUtil;
import org.dromara.hutool.core.text.CharUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.core.text.split.SplitUtil;
import org.dromara.hutool.core.util.SystemUtil;
import org.dromara.hutool.log.Log;
import cn.hutool.v7.core.io.IoUtil;
import cn.hutool.v7.core.io.LineReader;
import cn.hutool.v7.core.io.file.FileUtil;
import cn.hutool.v7.core.io.resource.NoResourceException;
import cn.hutool.v7.core.io.resource.Resource;
import cn.hutool.v7.core.lang.Assert;
import cn.hutool.v7.core.regex.ReUtil;
import cn.hutool.v7.core.text.CharUtil;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.core.text.split.SplitUtil;
import cn.hutool.v7.core.util.SystemUtil;
import cn.hutool.v7.log.Log;
import java.io.File;
import java.io.IOException;

View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
package org.dromara.hutool.setting;
package cn.hutool.v7.setting;
import org.dromara.hutool.core.io.file.FileNameUtil;
import org.dromara.hutool.core.io.resource.NoResourceException;
import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap;
import org.dromara.hutool.core.text.StrUtil;
import cn.hutool.v7.core.io.file.FileNameUtil;
import cn.hutool.v7.core.io.resource.NoResourceException;
import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap;
import cn.hutool.v7.core.text.StrUtil;
import java.util.Map;

View File

@@ -20,4 +20,4 @@
* @author Looly
*
*/
package org.dromara.hutool.setting;
package cn.hutool.v7.setting;

View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.dromara.hutool.setting.profile;
package cn.hutool.v7.setting.profile;
import org.dromara.hutool.core.lang.Singleton;
import org.dromara.hutool.setting.Setting;
import cn.hutool.v7.core.lang.Singleton;
import cn.hutool.v7.setting.Setting;
/**
* 全局的Profile配置中心

View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
package org.dromara.hutool.setting.profile;
package cn.hutool.v7.setting.profile;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.setting.Setting;
import cn.hutool.v7.core.lang.Assert;
import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.setting.Setting;
import java.io.Serializable;
import java.nio.charset.Charset;

View File

@@ -20,4 +20,4 @@
* @author Looly
*
*/
package org.dromara.hutool.setting.profile;
package cn.hutool.v7.setting.profile;

View File

@@ -14,29 +14,29 @@
* limitations under the License.
*/
package org.dromara.hutool.setting.props;
package cn.hutool.v7.setting.props;
import org.dromara.hutool.core.bean.BeanUtil;
import org.dromara.hutool.core.func.LambdaInfo;
import org.dromara.hutool.core.func.LambdaUtil;
import org.dromara.hutool.core.func.SerFunction;
import org.dromara.hutool.core.func.SerSupplier;
import org.dromara.hutool.core.io.IORuntimeException;
import org.dromara.hutool.core.io.IoUtil;
import org.dromara.hutool.core.io.file.FileUtil;
import org.dromara.hutool.core.io.resource.Resource;
import org.dromara.hutool.core.io.resource.ResourceUtil;
import org.dromara.hutool.core.io.watch.WatchMonitor;
import org.dromara.hutool.core.io.watch.WatchUtil;
import org.dromara.hutool.core.io.watch.watchers.SimpleWatcher;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.lang.getter.TypeGetter;
import org.dromara.hutool.core.map.MapUtil;
import org.dromara.hutool.core.reflect.ConstructorUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.core.util.CharsetUtil;
import org.dromara.hutool.core.util.ObjUtil;
import org.dromara.hutool.log.LogUtil;
import cn.hutool.v7.core.bean.BeanUtil;
import cn.hutool.v7.core.func.LambdaInfo;
import cn.hutool.v7.core.func.LambdaUtil;
import cn.hutool.v7.core.func.SerFunction;
import cn.hutool.v7.core.func.SerSupplier;
import cn.hutool.v7.core.io.IORuntimeException;
import cn.hutool.v7.core.io.IoUtil;
import cn.hutool.v7.core.io.file.FileUtil;
import cn.hutool.v7.core.io.resource.Resource;
import cn.hutool.v7.core.io.resource.ResourceUtil;
import cn.hutool.v7.core.io.watch.WatchMonitor;
import cn.hutool.v7.core.io.watch.WatchUtil;
import cn.hutool.v7.core.io.watch.watchers.SimpleWatcher;
import cn.hutool.v7.core.lang.Assert;
import cn.hutool.v7.core.lang.getter.TypeGetter;
import cn.hutool.v7.core.map.MapUtil;
import cn.hutool.v7.core.reflect.ConstructorUtil;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.core.util.CharsetUtil;
import cn.hutool.v7.core.util.ObjUtil;
import cn.hutool.v7.log.LogUtil;
import java.io.File;
import java.io.IOException;

View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
package org.dromara.hutool.setting.props;
package cn.hutool.v7.setting.props;
import org.dromara.hutool.core.io.file.FileNameUtil;
import org.dromara.hutool.core.io.resource.NoResourceException;
import org.dromara.hutool.core.map.concurrent.SafeConcurrentHashMap;
import org.dromara.hutool.core.text.StrUtil;
import cn.hutool.v7.core.io.file.FileNameUtil;
import cn.hutool.v7.core.io.resource.NoResourceException;
import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap;
import cn.hutool.v7.core.text.StrUtil;
import java.util.Map;

View File

@@ -20,4 +20,4 @@
* @author Looly
*
*/
package org.dromara.hutool.setting.props;
package cn.hutool.v7.setting.props;

View File

@@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.dromara.hutool.setting.toml;
package cn.hutool.v7.setting.toml;
import org.dromara.hutool.core.io.resource.Resource;
import cn.hutool.v7.core.io.resource.Resource;
import java.io.Writer;
import java.time.format.DateTimeFormatter;

View File

@@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.dromara.hutool.setting.toml;
package cn.hutool.v7.setting.toml;
import org.dromara.hutool.setting.SettingException;
import cn.hutool.v7.setting.SettingException;
import java.time.LocalDate;
import java.time.LocalDateTime;

View File

@@ -14,13 +14,13 @@
* limitations under the License.
*/
package org.dromara.hutool.setting.toml;
package cn.hutool.v7.setting.toml;
import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.core.io.IORuntimeException;
import org.dromara.hutool.core.text.CharUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.setting.SettingException;
import cn.hutool.v7.core.array.ArrayUtil;
import cn.hutool.v7.core.io.IORuntimeException;
import cn.hutool.v7.core.text.CharUtil;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.setting.SettingException;
import java.io.IOException;
import java.io.Writer;

View File

@@ -26,4 +26,4 @@
*
* @author Looly
*/
package org.dromara.hutool.setting.toml;
package cn.hutool.v7.setting.toml;

View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
package org.dromara.hutool.setting.yaml;
package cn.hutool.v7.setting.yaml;
import org.dromara.hutool.core.io.IoUtil;
import org.dromara.hutool.core.io.resource.ResourceUtil;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.map.Dict;
import cn.hutool.v7.core.io.IoUtil;
import cn.hutool.v7.core.io.resource.ResourceUtil;
import cn.hutool.v7.core.lang.Assert;
import cn.hutool.v7.core.map.Dict;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;

View File

@@ -20,4 +20,4 @@
* @author Looly
*
*/
package org.dromara.hutool.setting.yaml;
package cn.hutool.v7.setting.yaml;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.dromara.hutool.setting;
package cn.hutool.v7.setting;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.dromara.hutool.setting;
package cn.hutool.v7.setting;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.dromara.hutool.setting;
package cn.hutool.v7.setting;
import org.dromara.hutool.core.io.resource.ResourceUtil;
import org.dromara.hutool.core.util.CharsetUtil;
import cn.hutool.v7.core.io.resource.ResourceUtil;
import cn.hutool.v7.core.util.CharsetUtil;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

View File

@@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.dromara.hutool.setting;
package cn.hutool.v7.setting;
import org.dromara.hutool.core.lang.Console;
import cn.hutool.v7.core.lang.Console;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.dromara.hutool.setting;
package cn.hutool.v7.setting;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.dromara.hutool.setting.props;
package cn.hutool.v7.setting.props;
import lombok.Data;
import org.dromara.hutool.core.date.DateUtil;
import cn.hutool.v7.core.date.DateUtil;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

View File

@@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.dromara.hutool.setting.props;
package cn.hutool.v7.setting.props;
import org.dromara.hutool.setting.props.PropsUtil;
import cn.hutool.v7.setting.props.PropsUtil;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

View File

@@ -14,11 +14,11 @@
* limitations under the License.
*/
package org.dromara.hutool.setting.toml;
package cn.hutool.v7.setting.toml;
import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.setting.props.Props;
import org.dromara.hutool.setting.props.PropsUtil;
import cn.hutool.v7.core.array.ArrayUtil;
import cn.hutool.v7.setting.props.Props;
import cn.hutool.v7.setting.props.PropsUtil;
import lombok.Data;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

View File

@@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.dromara.hutool.setting.toml;
package cn.hutool.v7.setting.toml;
import org.dromara.hutool.core.io.resource.ResourceUtil;
import cn.hutool.v7.core.io.resource.ResourceUtil;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

View File

@@ -14,11 +14,11 @@
* limitations under the License.
*/
package org.dromara.hutool.setting.yaml;
package cn.hutool.v7.setting.yaml;
import org.dromara.hutool.core.io.file.FileUtil;
import org.dromara.hutool.core.map.Dict;
import org.dromara.hutool.core.util.CharsetUtil;
import cn.hutool.v7.core.io.file.FileUtil;
import cn.hutool.v7.core.map.Dict;
import cn.hutool.v7.core.util.CharsetUtil;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

View File

@@ -1,6 +1,6 @@
# -------------------------------------------------------------
# ----- GroupedSet File with UTF8-----
# @see org.dromara.hutool.setting.GroupedSet
# @see cn.hutool.v7.setting.GroupedSet
# -------------------------------------------------------------
无分组值1