map, String key, BigDecimal defaultValue) {
+ if (map == null) {
+ return defaultValue;
+ }
+ Object value = map.get(key);
+ if (value == null) {
+ return defaultValue;
+ }
+ if (value instanceof BigDecimal) {
+ return (BigDecimal) value;
+ }
+ if (value instanceof Number) {
+ return BigDecimal.valueOf(((Number) value).doubleValue());
+ }
+ if (value instanceof String) {
+ try {
+ return new BigDecimal((String) value);
+ } catch (NumberFormatException e) {
+ return defaultValue;
+ }
+ }
+ return defaultValue;
+ }
+
}
diff --git a/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/date/LocalDateTimeUtils.java b/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/date/LocalDateTimeUtils.java
index 7f13756..6aeb0b5 100644
--- a/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/date/LocalDateTimeUtils.java
+++ b/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/date/LocalDateTimeUtils.java
@@ -17,7 +17,8 @@ import java.time.temporal.TemporalAdjusters;
import java.util.ArrayList;
import java.util.List;
-import static cn.hutool.core.date.DatePattern.*;
+import static cn.hutool.core.date.DatePattern.UTC_MS_WITH_XXX_OFFSET_PATTERN;
+import static cn.hutool.core.date.DatePattern.createFormatter;
/**
* 时间工具类，用于 {@link LocalDateTime}
diff --git a/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/io/IoUtils.java b/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/io/IoUtils.java
index 3545833..093046a 100644
--- a/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/io/IoUtils.java
+++ b/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/io/IoUtils.java
@@ -7,7 +7,7 @@ import cn.hutool.core.util.StrUtil;
import java.io.InputStream;
/**
- * IO 工具类，用于 {@link cn.hutool.core.io.IoUtil} 缺失的方法
+ * IO 工具类，用于 {@link IoUtil} 缺失的方法
*
* @author hongawen
*/
diff --git a/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/json/JsonUtils.java b/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/json/JsonUtils.java
index 77425da..d2404e9 100644
--- a/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/json/JsonUtils.java
+++ b/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/json/JsonUtils.java
@@ -3,8 +3,6 @@ package com.njcn.msgpush.framework.common.util.json;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
-import com.njcn.msgpush.framework.common.util.json.databind.TimestampLocalDateTimeDeserializer;
-import com.njcn.msgpush.framework.common.util.json.databind.TimestampLocalDateTimeSerializer;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.DeserializationFeature;
@@ -13,6 +11,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.njcn.msgpush.framework.common.util.json.databind.TimestampLocalDateTimeDeserializer;
+import com.njcn.msgpush.framework.common.util.json.databind.TimestampLocalDateTimeSerializer;
import lombok.Getter;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
@@ -229,4 +229,53 @@ public class JsonUtils {
return JSONUtil.isTypeJSONObject(str);
}
+ /**
+ * 将 Object 转换为目标类型
+ *
+ * 避免先转 jsonString 再 parseObject 的性能损耗
+ *
+ * @param obj 源对象（可以是 Map、POJO 等）
+ * @param clazz 目标类型
+ * @return 转换后的对象
+ */
+ public static T convertObject(Object obj, Class clazz) {
+ if (obj == null) {
+ return null;
+ }
+ if (clazz.isInstance(obj)) {
+ return clazz.cast(obj);
+ }
+ return objectMapper.convertValue(obj, clazz);
+ }
+
+ /**
+ * 将 Object 转换为目标类型（支持泛型）
+ *
+ * @param obj 源对象
+ * @param typeReference 目标类型引用
+ * @return 转换后的对象
+ */
+ public static T convertObject(Object obj, TypeReference typeReference) {
+ if (obj == null) {
+ return null;
+ }
+ return objectMapper.convertValue(obj, typeReference);
+ }
+
+ /**
+ * 将 Object 转换为 List 类型
+ *
+ * 避免先转 jsonString 再 parseArray 的性能损耗
+ *
+ * @param obj 源对象（可以是 List、数组等）
+ * @param clazz 目标元素类型
+ * @return 转换后的 List
+ */
+ public static List convertList(Object obj, Class clazz) {
+ if (obj == null) {
+ return new ArrayList<>();
+ }
+ return objectMapper.convertValue(obj, objectMapper.getTypeFactory().constructCollectionType(List.class, clazz));
+ }
+
}
diff --git a/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/number/NumberUtils.java b/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/number/NumberUtils.java
index d1c9142..eac002c 100644
--- a/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/number/NumberUtils.java
+++ b/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/number/NumberUtils.java
@@ -8,7 +8,7 @@ import java.math.BigDecimal;
import java.util.List;
/**
- * 数字的工具类，补全 {@link cn.hutool.core.util.NumberUtil} 的功能
+ * 数字的工具类，补全 {@link NumberUtil} 的功能
*
* @author hongawen
*/
diff --git a/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/object/BeanUtils.java b/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/object/BeanUtils.java
index 6d30f19..6c58cae 100644
--- a/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/object/BeanUtils.java
+++ b/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/object/BeanUtils.java
@@ -10,7 +10,7 @@ import java.util.function.Consumer;
/**
* Bean 工具类
*
- * 1. 默认使用 {@link cn.hutool.core.bean.BeanUtil} 作为实现类，虽然不同 bean 工具的性能有差别，但是对绝大多数同学的项目，不用在意这点性能
+ * 1. 默认使用 {@link BeanUtil} 作为实现类，虽然不同 bean 工具的性能有差别，但是对绝大多数同学的项目，不用在意这点性能
* 2. 针对复杂的对象转换，可以搜参考 AuthConvert 实现，通过 mapstruct + default 配合实现
*
* @author hongawen
diff --git a/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/object/PageUtils.java b/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/object/PageUtils.java
index e9cb1cc..1ecbea1 100644
--- a/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/object/PageUtils.java
+++ b/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/object/PageUtils.java
@@ -13,7 +13,7 @@ import org.springframework.util.Assert;
import static java.util.Collections.singletonList;
/**
- * {@link com.njcn.msgpush.framework.common.pojo.PageParam} 工具类
+ * {@link PageParam} 工具类
*
* @author hongawen
*/
diff --git a/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/validation/ValidationUtils.java b/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/validation/ValidationUtils.java
index f9d8514..4b099b3 100644
--- a/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/validation/ValidationUtils.java
+++ b/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/util/validation/ValidationUtils.java
@@ -2,12 +2,12 @@ package com.njcn.msgpush.framework.common.util.validation;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
-import org.springframework.util.StringUtils;
-
import jakarta.validation.ConstraintViolation;
import jakarta.validation.ConstraintViolationException;
import jakarta.validation.Validation;
import jakarta.validation.Validator;
+import org.springframework.util.StringUtils;
+
import java.util.Set;
import java.util.regex.Pattern;
diff --git a/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/validation/Mobile.java b/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/validation/Mobile.java
index 843b335..83be617 100644
--- a/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/validation/Mobile.java
+++ b/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/validation/Mobile.java
@@ -2,6 +2,7 @@ package com.njcn.msgpush.framework.common.validation;
import jakarta.validation.Constraint;
import jakarta.validation.Payload;
+
import java.lang.annotation.*;
@Target({
diff --git a/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/validation/MobileValidator.java b/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/validation/MobileValidator.java
index c65722f..bc4dc0f 100644
--- a/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/validation/MobileValidator.java
+++ b/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/validation/MobileValidator.java
@@ -2,7 +2,6 @@ package com.njcn.msgpush.framework.common.validation;
import cn.hutool.core.util.StrUtil;
import com.njcn.msgpush.framework.common.util.validation.ValidationUtils;
-
import jakarta.validation.ConstraintValidator;
import jakarta.validation.ConstraintValidatorContext;
diff --git a/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/validation/Telephone.java b/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/validation/Telephone.java
index 158b203..1e7906d 100644
--- a/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/validation/Telephone.java
+++ b/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/validation/Telephone.java
@@ -2,6 +2,7 @@ package com.njcn.msgpush.framework.common.validation;
import jakarta.validation.Constraint;
import jakarta.validation.Payload;
+
import java.lang.annotation.*;
@Target({
diff --git a/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/validation/TelephoneValidator.java b/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/validation/TelephoneValidator.java
index 8032ff4..515bb8c 100644
--- a/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/validation/TelephoneValidator.java
+++ b/msgpush-framework/msgpush-common/src/main/java/com/njcn/msgpush/framework/common/validation/TelephoneValidator.java
@@ -2,7 +2,6 @@ package com.njcn.msgpush.framework.common.validation;
import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.util.PhoneUtil;
-
import jakarta.validation.ConstraintValidator;
import jakarta.validation.ConstraintValidatorContext;
diff --git a/msgpush-framework/msgpush-common/src/test/java/com/njcn/msgpush/framework/common/util/collection/CollectionUtilsTest.java b/msgpush-framework/msgpush-common/src/test/java/com/njcn/msgpush/framework/common/util/collection/CollectionUtilsTest.java
deleted file mode 100644
index 4ac750d..0000000
--- a/msgpush-framework/msgpush-common/src/test/java/com/njcn/msgpush/framework/common/util/collection/CollectionUtilsTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.njcn.msgpush.framework.common.util.collection;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import org.junit.jupiter.api.Test;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.function.BiFunction;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-/**
- * {@link CollectionUtils} 的单元测试
- */
-public class CollectionUtilsTest {
-
- @Data
- @AllArgsConstructor
- private static class Dog {
-
- private Integer id;
- private String name;
- private String code;
-
- }
-
- @Test
- public void testDiffList() {
- // 准备参数
- Collection oldList = Arrays.asList(
- new Dog(1, "花花", "hh"),
- new Dog(2, "旺财", "wc")
- );
- Collection newList = Arrays.asList(
- new Dog(null, "花花2", "hh"),
- new Dog(null, "小白", "xb")
- );
- BiFunction sameFunc = (oldObj, newObj) -> {
- boolean same = oldObj.getCode().equals(newObj.getCode());
- // 如果相等的情况下，需要设置下 id，后续好更新
- if (same) {
- newObj.setId(oldObj.getId());
- }
- return same;
- };
-
- // 调用
- List> result = CollectionUtils.diffList(oldList, newList, sameFunc);
- // 断言
- assertEquals(result.size(), 3);
- // 断言 create
- assertEquals(result.get(0).size(), 1);
- assertEquals(result.get(0).get(0), new Dog(null, "小白", "xb"));
- // 断言 update
- assertEquals(result.get(1).size(), 1);
- assertEquals(result.get(1).get(0), new Dog(1, "花花2", "hh"));
- // 断言 delete
- assertEquals(result.get(2).size(), 1);
- assertEquals(result.get(2).get(0), new Dog(2, "旺财", "wc"));
- }
-
-}
diff --git a/msgpush-framework/msgpush-spring-boot-starter-biz-ip/pom.xml b/msgpush-framework/msgpush-spring-boot-starter-biz-ip/pom.xml
index af228bf..abc57df 100644
--- a/msgpush-framework/msgpush-spring-boot-starter-biz-ip/pom.xml
+++ b/msgpush-framework/msgpush-spring-boot-starter-biz-ip/pom.xml
@@ -2,21 +2,20 @@
+ 4.0.0
com.njcn
msgpush-framework
${revision}
- 4.0.0
msgpush-spring-boot-starter-biz-ip
jar
-
${project.artifactId}
IP 拓展，支持如下功能：
1. IP 功能：查询 IP 对应的城市信息
- 基于 https://gitee.com/lionsoul/ip2region 实现
+ 基于 https://gitee.com/lionsoul/ip2region 实现
2. 城市功能：查询城市编码对应的城市信息
- 基于 https://github.com/modood/Administrative-divisions-of-China 实现
+ 基于 https://github.com/modood/Administrative-divisions-of-China 实现
@@ -50,5 +49,4 @@
test
-
-
+
\ No newline at end of file
diff --git a/msgpush-framework/msgpush-spring-boot-starter-biz-ip/src/main/java/com/njcn/msgpush/framework/ip/core/utils/IPUtils.java b/msgpush-framework/msgpush-spring-boot-starter-biz-ip/src/main/java/com/njcn/msgpush/framework/ip/core/utils/IPUtils.java
index bd758f9..885eb99 100644
--- a/msgpush-framework/msgpush-spring-boot-starter-biz-ip/src/main/java/com/njcn/msgpush/framework/ip/core/utils/IPUtils.java
+++ b/msgpush-framework/msgpush-spring-boot-starter-biz-ip/src/main/java/com/njcn/msgpush/framework/ip/core/utils/IPUtils.java
@@ -13,7 +13,7 @@ import java.io.IOException;
*
* IP 数据源来自 ip2region.xdb 精简版，基于 项目
*
- * @author wanglhup
+ * @author hongawen
*/
@Slf4j
public class IPUtils {
diff --git a/msgpush-framework/msgpush-spring-boot-starter-biz-ip/src/main/java/com/njcn/msgpush/framework/ip/package-info.java b/msgpush-framework/msgpush-spring-boot-starter-biz-ip/src/main/java/com/njcn/msgpush/framework/ip/package-info.java
deleted file mode 100644
index 2f5a6ee..0000000
--- a/msgpush-framework/msgpush-spring-boot-starter-biz-ip/src/main/java/com/njcn/msgpush/framework/ip/package-info.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * IP 拓展，支持如下功能：
- *
- * 1. IP 功能：查询 IP 对应的城市信息
- * 基于 https://gitee.com/lionsoul/ip2region 实现
- * 2. 城市功能：查询城市编码对应的城市信息
- * 基于 https://github.com/modood/Administrative-divisions-of-China 实现
- *
- * @author hongawen
- */
-package com.njcn.msgpush.framework.ip;
diff --git a/msgpush-framework/msgpush-spring-boot-starter-biz-ip/src/test/java/com/njcn/msgpush/framework/ip/core/utils/AreaUtilsTest.java b/msgpush-framework/msgpush-spring-boot-starter-biz-ip/src/test/java/com/njcn/msgpush/framework/ip/core/utils/AreaUtilsTest.java
deleted file mode 100644
index 4563047..0000000
--- a/msgpush-framework/msgpush-spring-boot-starter-biz-ip/src/test/java/com/njcn/msgpush/framework/ip/core/utils/AreaUtilsTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.njcn.msgpush.framework.ip.core.utils;
-
-
-import com.njcn.msgpush.framework.ip.core.Area;
-import com.njcn.msgpush.framework.ip.core.enums.AreaTypeEnum;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-/**
- * {@link AreaUtils} 的单元测试
- *
- * @author hongawen
- */
-public class AreaUtilsTest {
-
- @Test
- public void testGetArea() {
- // 调用：北京
- Area area = AreaUtils.getArea(110100);
- // 断言
- assertEquals(area.getId(), 110100);
- assertEquals(area.getName(), "北京市");
- assertEquals(area.getType(), AreaTypeEnum.CITY.getType());
- assertEquals(area.getParent().getId(), 110000);
- assertEquals(area.getChildren().size(), 16);
- }
-
- @Test
- public void testFormat() {
- assertEquals(AreaUtils.format(110105), "北京市 北京市 朝阳区");
- assertEquals(AreaUtils.format(1), "中国");
- assertEquals(AreaUtils.format(2), "蒙古");
- }
-
-}
diff --git a/msgpush-framework/msgpush-spring-boot-starter-biz-ip/src/test/java/com/njcn/msgpush/framework/ip/core/utils/IPUtilsTest.java b/msgpush-framework/msgpush-spring-boot-starter-biz-ip/src/test/java/com/njcn/msgpush/framework/ip/core/utils/IPUtilsTest.java
deleted file mode 100644
index 497cfc7..0000000
--- a/msgpush-framework/msgpush-spring-boot-starter-biz-ip/src/test/java/com/njcn/msgpush/framework/ip/core/utils/IPUtilsTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.njcn.msgpush.framework.ip.core.utils;
-
-import com.njcn.msgpush.framework.ip.core.Area;
-import org.junit.jupiter.api.Test;
-import org.lionsoul.ip2region.xdb.Searcher;
-
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-/**
- * {@link IPUtils} 的单元测试
- *
- * @author wanglhup
- */
-public class IPUtilsTest {
-
- @Test
- public void testGetAreaId_string() {
- // 120.202.4.0|120.202.4.255|420600
- Integer areaId = IPUtils.getAreaId("120.202.4.50");
- assertEquals(420600, areaId);
- }
-
- @Test
- public void testGetAreaId_long() throws Exception {
- // 120.203.123.0|120.203.133.255|360900
- long ip = Searcher.checkIP("120.203.123.250");
- Integer areaId = IPUtils.getAreaId(ip);
- assertEquals(360900, areaId);
- }
-
- @Test
- public void testGetArea_string() {
- // 120.202.4.0|120.202.4.255|420600
- Area area = IPUtils.getArea("120.202.4.50");
- assertEquals("襄阳市", area.getName());
- }
-
- @Test
- public void testGetArea_long() throws Exception {
- // 120.203.123.0|120.203.133.255|360900
- long ip = Searcher.checkIP("120.203.123.252");
- Area area = IPUtils.getArea(ip);
- assertEquals("宜春市", area.getName());
- }
-
-}
diff --git a/msgpush-framework/msgpush-spring-boot-starter-env/pom.xml b/msgpush-framework/msgpush-spring-boot-starter-env/pom.xml
index d01c5a0..212973c 100644
--- a/msgpush-framework/msgpush-spring-boot-starter-env/pom.xml
+++ b/msgpush-framework/msgpush-spring-boot-starter-env/pom.xml
@@ -2,27 +2,20 @@
+ 4.0.0
com.njcn
msgpush-framework
${revision}
- 4.0.0
msgpush-spring-boot-starter-env
jar
${project.artifactId}
开发环境拓展，实现类似阿里的特性环境的能力
- 1. https://segmentfault.com/a/1190000018022987
-
-
- 8
- 8
-
-
com.njcn
@@ -62,5 +55,4 @@
spring-cloud-starter-alibaba-nacos-discovery
-
-
+
\ No newline at end of file
diff --git a/msgpush-framework/msgpush-spring-boot-starter-env/src/main/java/com/njcn/msgpush/framework/env/config/EnvEnvironmentPostProcessor.java b/msgpush-framework/msgpush-spring-boot-starter-env/src/main/java/com/njcn/msgpush/framework/env/config/EnvEnvironmentPostProcessor.java
index d119b52..47e368b 100644
--- a/msgpush-framework/msgpush-spring-boot-starter-env/src/main/java/com/njcn/msgpush/framework/env/config/EnvEnvironmentPostProcessor.java
+++ b/msgpush-framework/msgpush-spring-boot-starter-env/src/main/java/com/njcn/msgpush/framework/env/config/EnvEnvironmentPostProcessor.java
@@ -21,7 +21,6 @@ public class EnvEnvironmentPostProcessor implements EnvironmentPostProcessor {
private static final Set TARGET_TAG_KEYS = SetUtils.asSet(
"spring.cloud.nacos.discovery.metadata.tag" // Nacos 注册中心
- // MQ TODO
);
@Override
@@ -29,7 +28,6 @@ public class EnvEnvironmentPostProcessor implements EnvironmentPostProcessor {
// 0. 设置 ${HOST_NAME} 兜底的环境变量
String hostNameKey = StrUtil.subBetween(HOST_NAME_VALUE, "{", "}");
if (!environment.containsProperty(hostNameKey)) {
- System.out.println(EnvUtils.getHostName());
environment.getSystemProperties().put(hostNameKey, EnvUtils.getHostName());
}
diff --git a/msgpush-framework/msgpush-spring-boot-starter-env/src/main/java/com/njcn/msgpush/framework/env/core/fegin/EnvLoadBalancerClient.java b/msgpush-framework/msgpush-spring-boot-starter-env/src/main/java/com/njcn/msgpush/framework/env/core/fegin/EnvLoadBalancerClient.java
index e26e9d8..fe07ccd 100644
--- a/msgpush-framework/msgpush-spring-boot-starter-env/src/main/java/com/njcn/msgpush/framework/env/core/fegin/EnvLoadBalancerClient.java
+++ b/msgpush-framework/msgpush-spring-boot-starter-env/src/main/java/com/njcn/msgpush/framework/env/core/fegin/EnvLoadBalancerClient.java
@@ -76,9 +76,9 @@ public class EnvLoadBalancerClient implements ReactorServiceInstanceLoadBalancer
chooseInstances = instances;
}
- // TODO 芋艿：https://juejin.cn/post/7056770721858469896 相同网段
+ // TODO https://juejin.cn/post/7056770721858469896 相同网段
- // 随机 + 权重获取实例列表 TODO 芋艿：目前直接使用 Nacos 提供的方法，如果替换注册中心，需要重新失败该方法
+ // 随机 + 权重获取实例列表 TODO 目前直接使用 Nacos 提供的方法，如果替换注册中心，需要重新失败该方法
return new DefaultResponse(NacosBalancer.getHostByRandomWeight3(chooseInstances));
}
diff --git a/msgpush-framework/msgpush-spring-boot-starter-env/src/main/java/com/njcn/msgpush/framework/env/core/package-info.java b/msgpush-framework/msgpush-spring-boot-starter-env/src/main/java/com/njcn/msgpush/framework/env/core/package-info.java
index 121d8fc..e69de29 100644
--- a/msgpush-framework/msgpush-spring-boot-starter-env/src/main/java/com/njcn/msgpush/framework/env/core/package-info.java
+++ b/msgpush-framework/msgpush-spring-boot-starter-env/src/main/java/com/njcn/msgpush/framework/env/core/package-info.java
@@ -1 +0,0 @@
-package com.njcn.msgpush.framework.env.core;
diff --git a/msgpush-framework/msgpush-spring-boot-starter-env/src/main/java/com/njcn/msgpush/framework/env/package-info.java b/msgpush-framework/msgpush-spring-boot-starter-env/src/main/java/com/njcn/msgpush/framework/env/package-info.java
deleted file mode 100644
index b8df99c..0000000
--- a/msgpush-framework/msgpush-spring-boot-starter-env/src/main/java/com/njcn/msgpush/framework/env/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * 开发环境拓展，实现类似阿里的特性环境的能力
- * 1. https://segmentfault.com/a/1190000018022987
- *
- * @author hongawen
- */
-package com.njcn.msgpush.framework.env;
diff --git a/msgpush-framework/msgpush-spring-boot-starter-excel/pom.xml b/msgpush-framework/msgpush-spring-boot-starter-excel/pom.xml
index c493c83..7626473 100644
--- a/msgpush-framework/msgpush-spring-boot-starter-excel/pom.xml
+++ b/msgpush-framework/msgpush-spring-boot-starter-excel/pom.xml
@@ -2,12 +2,13 @@
+ 4.0.0
com.njcn
msgpush-framework
${revision}
- 4.0.0
+
msgpush-spring-boot-starter-excel
jar
@@ -15,6 +16,7 @@
Excel 拓展
+
com.njcn
@@ -71,5 +73,4 @@
test
-
-
+
\ No newline at end of file
diff --git a/msgpush-framework/msgpush-spring-boot-starter-excel/src/main/java/com/njcn/msgpush/framework/excel/core/annotations/ExcelColumnSelect.java b/msgpush-framework/msgpush-spring-boot-starter-excel/src/main/java/com/njcn/msgpush/framework/excel/core/annotations/ExcelColumnSelect.java
index 6e25057..b59e8e5 100644
--- a/msgpush-framework/msgpush-spring-boot-starter-excel/src/main/java/com/njcn/msgpush/framework/excel/core/annotations/ExcelColumnSelect.java
+++ b/msgpush-framework/msgpush-spring-boot-starter-excel/src/main/java/com/njcn/msgpush/framework/excel/core/annotations/ExcelColumnSelect.java
@@ -7,7 +7,7 @@ import java.lang.annotation.*;
*
* 其中 {@link #dictType()} 和 {@link #functionName()} 二选一
*
- * @author HUIHUI
+ * @author hongawen
*/
@Target({ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
diff --git a/msgpush-framework/msgpush-spring-boot-starter-excel/src/main/java/com/njcn/msgpush/framework/excel/core/convert/AreaConvert.java b/msgpush-framework/msgpush-spring-boot-starter-excel/src/main/java/com/njcn/msgpush/framework/excel/core/convert/AreaConvert.java
index e78c464..752d647 100644
--- a/msgpush-framework/msgpush-spring-boot-starter-excel/src/main/java/com/njcn/msgpush/framework/excel/core/convert/AreaConvert.java
+++ b/msgpush-framework/msgpush-spring-boot-starter-excel/src/main/java/com/njcn/msgpush/framework/excel/core/convert/AreaConvert.java
@@ -13,7 +13,7 @@ import lombok.extern.slf4j.Slf4j;
/**
* Excel 数据地区转换器
*
- * @author HUIHUI
+ * @author hongawen
*/
@Slf4j
public class AreaConvert implements Converter