调整 移出ip模块

tashow-dependencies/pom.xml

@@ -153,11 +153,6 @@
                 <artifactId>tashow-data-permission</artifactId>
                 <version>${revision}</version>
             </dependency>
-            <dependency>
-                <groupId>com.tashow.cloud</groupId>
-                <artifactId>tashow-framework-ip</artifactId>
-                <version>${revision}</version>
-            </dependency>
 
             <!-- Spring 核心 -->
             <dependency>

tashow-framework/pom.xml

@@ -14,7 +14,6 @@
         <module>tashow-common</module>
         <module>tashow-framework-web</module>
         <module>tashow-framework-env</module>
-        <module>tashow-framework-ip</module>
         <module>tashow-framework-job</module>
         <module>tashow-framework-monitor</module>
         <module>tashow-framework-mq</module>

tashow-framework/tashow-common/pom.xml

@@ -137,6 +137,12 @@
             <artifactId>easy-trans-anno</artifactId> <!-- 默认引入的原因，方便 xxx-module-api 包使用 -->
         </dependency>
 
+        <!-- IP地址检索 -->
+        <dependency>
+            <groupId>org.lionsoul</groupId>
+            <artifactId>ip2region</artifactId>
+        </dependency>
+
         <!-- Test 测试相关 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

tashow-framework/tashow-common/src/main/java/com/tashow/cloud/common/core/Area.java

@@ -1,8 +1,8 @@
-package com.tashow.cloud.ip.core;
+package com.tashow.cloud.common.core;
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonManagedReference;
-import com.tashow.cloud.ip.core.enums.AreaTypeEnum;
+import com.tashow.cloud.common.enums.AreaTypeEnum;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

tashow-framework/tashow-common/src/main/java/com/tashow/cloud/common/enums/AreaTypeEnum.java

@@ -1,4 +1,4 @@
-package com.tashow.cloud.ip.core.enums;
+package com.tashow.cloud.common.enums;
 
 import com.tashow.cloud.common.core.ArrayValuable;
 import lombok.AllArgsConstructor;

tashow-framework/tashow-common/src/main/java/com/tashow/cloud/common/util/ip/AreaUtils.java

@@ -1,12 +1,12 @@
-package com.tashow.cloud.ip.core.utils;
+package com.tashow.cloud.common.util.ip;
 
 import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.text.csv.CsvRow;
 import cn.hutool.core.text.csv.CsvUtil;
+import com.tashow.cloud.common.core.Area;
+import com.tashow.cloud.common.enums.AreaTypeEnum;
 import com.tashow.cloud.common.util.object.ObjectUtils;
-import com.tashow.cloud.ip.core.Area;
-import com.tashow.cloud.ip.core.enums.AreaTypeEnum;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 

tashow-framework/tashow-common/src/main/java/com/tashow/cloud/common/util/ip/IPUtils.java

@@ -1,7 +1,7 @@
-package com.tashow.cloud.ip.core.utils;
+package com.tashow.cloud.common.util.ip;
 
 import cn.hutool.core.io.resource.ResourceUtil;
-import com.tashow.cloud.ip.core.Area;
+import com.tashow.cloud.common.core.Area;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.lionsoul.ip2region.xdb.Searcher;

tashow-framework/tashow-data-excel/pom.xml

@@ -68,12 +68,6 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId> <!-- 解决 https://github.com/alibaba/easyexcel/issues/3954 问题 -->
         </dependency>
-
-        <dependency>
-            <groupId>com.tashow.cloud</groupId>
-            <artifactId>tashow-framework-ip</artifactId>
-            <optional>true</optional> <!-- 设置为 optional，只有在 AreaConvert 的时候使用 -->
-        </dependency>
     </dependencies>
 
 </project>

tashow-framework/tashow-data-excel/src/main/java/com/tashow/cloud/excel/excel/core/convert/AreaConvert.java

@@ -6,8 +6,8 @@ import com.alibaba.excel.enums.CellDataTypeEnum;
 import com.alibaba.excel.metadata.GlobalConfiguration;
 import com.alibaba.excel.metadata.data.ReadCellData;
 import com.alibaba.excel.metadata.property.ExcelContentProperty;
-import com.tashow.cloud.ip.core.Area;
+import com.tashow.cloud.common.core.Area;
-import com.tashow.cloud.ip.core.utils.AreaUtils;
+import com.tashow.cloud.common.util.ip.AreaUtils;
 import lombok.extern.slf4j.Slf4j;
 
 /**

tashow-framework/tashow-data-redis/src/main/java/com/tashow/cloud/redis/config/CacheAutoConfiguration.java

@@ -3,6 +3,7 @@ package com.tashow.cloud.redis.config;
 import cn.hutool.core.util.StrUtil;
 import com.tashow.cloud.redis.core.TimeoutRedisCacheManager;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.cache.CacheProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
@@ -25,7 +26,7 @@ import static com.tashow.cloud.redis.config.RedisAutoConfiguration.buildRedisSer
  * Cache 配置类，基于 Redis 实现
  */
 @AutoConfiguration
-@EnableConfigurationProperties({org.springframework.boot.autoconfigure.cache.CacheProperties.class, CacheProperties.class})
+@EnableConfigurationProperties({CacheProperties.class, TashowCacheProperties.class})
 @EnableCaching
 public class CacheAutoConfiguration {
 
@@ -70,11 +71,11 @@ public class CacheAutoConfiguration {
     @Bean
     public RedisCacheManager redisCacheManager(RedisTemplate<String, Object> redisTemplate,
                                                RedisCacheConfiguration redisCacheConfiguration,
-                                               CacheProperties cacheProperties) {
+                                               TashowCacheProperties tashowCacheProperties) {
         // 创建 RedisCacheWriter 对象
         RedisConnectionFactory connectionFactory = Objects.requireNonNull(redisTemplate.getConnectionFactory());
         RedisCacheWriter cacheWriter = RedisCacheWriter.nonLockingRedisCacheWriter(connectionFactory,
-                BatchStrategies.scan(cacheProperties.getRedisScanBatchSize()));
+                BatchStrategies.scan(tashowCacheProperties.getRedisScanBatchSize()));
         // 创建 TenantRedisCacheManager 对象
         return new TimeoutRedisCacheManager(cacheWriter, redisCacheConfiguration);
     }

tashow-framework/tashow-data-redis/src/main/java/com/tashow/cloud/redis/config/TashowCacheProperties.java

@@ -12,7 +12,7 @@ import org.springframework.validation.annotation.Validated;
 @ConfigurationProperties("tashow.cache")
 @Data
 @Validated
-public class CacheProperties {
+public class TashowCacheProperties {
 
     /**
      * {@link #redisScanBatchSize} 默认值

tashow-framework/tashow-framework-ip/pom.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.tashow.cloud</groupId>
-        <artifactId>tashow-framework</artifactId>
-        <version>${revision}</version>
-    </parent>
-    <artifactId>tashow-framework-ip</artifactId>
-    <packaging>jar</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>IP 拓展，支持如下功能：
-        1. IP 功能：查询 IP 对应的城市信息
-            基于 https://gitee.com/lionsoul/ip2region 实现
-        2. 城市功能：查询城市编码对应的城市信息
-            基于 https://github.com/modood/Administrative-divisions-of-China 实现
-    </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.tashow.cloud</groupId>
-            <artifactId>tashow-common</artifactId>
-        </dependency>
-
-        <!-- IP地址检索 -->
-        <dependency>
-            <groupId>org.lionsoul</groupId>
-            <artifactId>ip2region</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <scope>provided</scope> <!-- 设置为 provided，只有工具类需要使用到 -->
-        </dependency>
-    </dependencies>
-
-</project>

tashow-framework/tashow-framework-ip/src/main/java/com/tashow/cloud/ip/package-info.java

@@ -1,6 +0,0 @@
-/**
- * @Author liwq
- * @Date 2025年04月16日 10:38
- * @Desc
- */
-package com.tashow.cloud.ip;

tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/config/TenantAutoConfiguration.java

@@ -2,7 +2,7 @@ package com.tashow.cloud.tenant.config;
 
 import com.tashow.cloud.common.enums.WebFilterOrderEnum;
 import com.tashow.cloud.mybatis.mybatis.core.util.MyBatisUtils;
-import com.tashow.cloud.redis.config.CacheProperties;
+import com.tashow.cloud.redis.config.TashowCacheProperties;
 import com.tashow.cloud.systemapi.api.tenant.TenantApi;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
@@ -133,12 +133,12 @@ public class TenantAutoConfiguration {
     @Primary // 引入租户时，tenantRedisCacheManager 为主 Bean
     public RedisCacheManager tenantRedisCacheManager(RedisTemplate<String, Object> redisTemplate,
                                                      RedisCacheConfiguration redisCacheConfiguration,
-                                                     CacheProperties yudaoCacheProperties,
+                                                     TashowCacheProperties yudaoTashowCacheProperties,
                                                      TenantProperties tenantProperties) {
         // 创建 RedisCacheWriter 对象
         RedisConnectionFactory connectionFactory = Objects.requireNonNull(redisTemplate.getConnectionFactory());
         RedisCacheWriter cacheWriter = RedisCacheWriter.nonLockingRedisCacheWriter(connectionFactory,
-                BatchStrategies.scan(yudaoCacheProperties.getRedisScanBatchSize()));
+                BatchStrategies.scan(yudaoTashowCacheProperties.getRedisScanBatchSize()));
         // 创建 TenantRedisCacheManager 对象
         return new TenantRedisCacheManager(cacheWriter, redisCacheConfiguration, tenantProperties.getIgnoreCaches());
     }

tashow-module/tashow-module-system/tashow-module-system-biz/pom.xml

@@ -45,10 +45,6 @@
             <groupId>com.tashow.cloud</groupId>
             <artifactId>tashow-framework-tenant</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.tashow.cloud</groupId>
-            <artifactId>tashow-framework-ip</artifactId>
-        </dependency>
 
         <!-- Web 相关 -->
         <dependency>

tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/application.yaml

@@ -59,9 +59,6 @@ mybatis-plus:
   global-config:
     db-config:
       id-type: NONE # “智能”模式，基于 IdTypeEnvironmentPostProcessor + 数据源的类型，自动适配成 AUTO、INPUT 模式。
-      #      id-type: AUTO # 自增 ID，适合 MySQL 等直接自增的数据库
-      #      id-type: INPUT # 用户输入 ID，适合 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库
-      #      id-type: ASSIGN_ID # 分配 ID，默认使用雪花算法。注意，Oracle、PostgreSQL、Kingbase、DB2、H2 数据库时，需要去除实体类上的 @KeySequence 注解
       logic-delete-value: 1 # 逻辑已删除值(默认为 1)
       logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
     banner: false # 关闭控制台的 Banner 打印