version for 1.5.0

.gitee/ISSUE_TEMPLATE/issue.yml

@@ -11,6 +11,7 @@ body:
         - "1.2.0"
         - "1.3.0"
         - "1.4.0"
+        - "1.5.0"
     validations:
       required: true
   - type: dropdown

README.md

@@ -272,7 +272,15 @@ sqlrest:
 
 [数据库迁移同步工具dbswitch] (https://gitee.com/inrgihc/dbswitch)
 
-## 六、问题反馈
+## 六、社区推荐
+
+<div>
+	<a href="https://dromara.org.cn/zh/projects/" target="_blank">
+        <img src="https://dromara.org.cn/logo.svg" alt="dromara" title="让每一位开源爱好者，体会到开源的快乐。">
+    </a>
+</div>
+
+## 七、问题反馈
 
 如果您看到并使用了本工具，或您觉得本工具对您有价值，请为此项目**点个赞**，以表示对本项目的支持，多谢！如果您在使用时遇到了bug，欢迎在issue中反馈。也可扫描下方二维码入群讨论：（加好友请注明："SQLREST交流"）
 

build-docker/build_and_push_image.sh

@@ -2,7 +2,7 @@
 
 set -e 
 
-SQLREST_VERSION=1.4.0
+SQLREST_VERSION=1.5.0
 BUILD_DOCKER_DIR="$( cd "$( dirname "$0"  )" && pwd  )"
 PROJECT_ROOT_DIR=$( dirname "$BUILD_DOCKER_DIR")
 DOCKER_SQLREST_DIR=$BUILD_DOCKER_DIR/sqlrest

build-docker/sqlrest/sqlrest-release/bin/sqlrestctl.sh

@@ -36,16 +36,16 @@ fi
 
 # 配置classpath和启动类
 CLASSPATH=$APP_CONF_PATH
-APP_MAIN_CLASS='com.gitee.sqlrest.manager.ManagerApplication'
+APP_MAIN_CLASS='org.dromara.sqlrest.manager.ManagerApplication'
 if [ "$module" = "manager" ]; then
   CLASSPATH="$APP_CONF_PATH/manager:$APP_LIB_COMMON_PATH/*:$APP_HOME/lib/webmvc/*:$APP_HOME/lib/manager/*"
-  APP_MAIN_CLASS='com.gitee.sqlrest.manager.ManagerApplication'
+  APP_MAIN_CLASS='org.dromara.sqlrest.manager.ManagerApplication'
 elif [ "$module" = "executor" ]; then
   CLASSPATH="$APP_CONF_PATH/executor:$APP_LIB_COMMON_PATH/*:$APP_HOME/lib/webmvc/*:$APP_HOME/lib/executor/*"
-  APP_MAIN_CLASS='com.gitee.sqlrest.executor.ExecutorApplication'
+  APP_MAIN_CLASS='org.dromara.sqlrest.executor.ExecutorApplication'
 elif [ "$module" = "gateway" ]; then
   CLASSPATH="$APP_CONF_PATH/gateway:$APP_LIB_COMMON_PATH/*:$APP_HOME/lib/webflux/*:$APP_HOME/lib/gateway/*"
-  APP_MAIN_CLASS='com.gitee.sqlrest.gateway.GatewayApplication'
+  APP_MAIN_CLASS='org.dromara.sqlrest.gateway.GatewayApplication'
 else
   echo "Error: No module named '$module' was found."
   exit 1

pom.xml

@@ -4,10 +4,10 @@
   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>
 
-  <groupId>com.gitee.sqlrest</groupId>
+  <groupId>org.dromara.sqlrest</groupId>
   <artifactId>sqlrest-parent</artifactId>
   <packaging>pom</packaging>
-  <version>1.4.0</version>
+  <version>1.5.0</version>
 
   <scm>
     <url>https://gitee.com/inrgihc/sqlrest</url>

sqlrest-cache/pom.xml

@@ -4,15 +4,15 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>sqlrest-parent</artifactId>
-    <groupId>com.gitee.sqlrest</groupId>
-    <version>1.4.0</version>
+    <groupId>org.dromara.sqlrest</groupId>
+    <version>1.5.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>sqlrest-cache</artifactId>
 
   <dependencies>
     <dependency>
-      <groupId>com.gitee.sqlrest</groupId>
+      <groupId>org.dromara.sqlrest</groupId>
       <artifactId>sqlrest-common</artifactId>
       <version>${project.version}</version>
     </dependency>

sqlrest-cache/src/main/java/com/gitee/sqlrest/cache/CacheFactory.java → sqlrest-cache/src/main/java/org/dromara/sqlrest/cache/CacheFactory.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.cache;
+package org.dromara.sqlrest.cache;
 
 import java.util.Map;
 

sqlrest-cache/src/main/java/com/gitee/sqlrest/cache/DistributedCache.java → sqlrest-cache/src/main/java/org/dromara/sqlrest/cache/DistributedCache.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.cache;
+package org.dromara.sqlrest.cache;
 
 import java.util.concurrent.TimeUnit;
 

sqlrest-cache/src/main/java/com/gitee/sqlrest/cache/SqlrestCacheConfiguration.java → sqlrest-cache/src/main/java/org/dromara/sqlrest/cache/SqlrestCacheConfiguration.java

@@ -7,13 +7,13 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.cache;
+package org.dromara.sqlrest.cache;
 
-import com.gitee.sqlrest.cache.hazelcast.HazelcastCacheFactory;
-import com.gitee.sqlrest.cache.redis.JedisClient;
-import com.gitee.sqlrest.cache.redis.RedisCacheFactory;
-import com.gitee.sqlrest.cache.redis.RedisProperties;
-import com.gitee.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.cache.hazelcast.HazelcastCacheFactory;
+import org.dromara.sqlrest.cache.redis.JedisClient;
+import org.dromara.sqlrest.cache.redis.RedisCacheFactory;
+import org.dromara.sqlrest.cache.redis.RedisProperties;
+import org.dromara.sqlrest.common.consts.Constants;
 import com.hazelcast.config.Config;
 import com.hazelcast.eureka.one.EurekaOneDiscoveryStrategyFactory;
 import com.netflix.discovery.EurekaClient;

sqlrest-cache/src/main/java/com/gitee/sqlrest/cache/hazelcast/HazelcastCacheFactory.java → sqlrest-cache/src/main/java/org/dromara/sqlrest/cache/hazelcast/HazelcastCacheFactory.java

@@ -7,10 +7,10 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.cache.hazelcast;
+package org.dromara.sqlrest.cache.hazelcast;
 
-import com.gitee.sqlrest.cache.CacheFactory;
-import com.gitee.sqlrest.cache.DistributedCache;
+import org.dromara.sqlrest.cache.CacheFactory;
+import org.dromara.sqlrest.cache.DistributedCache;
 import com.hazelcast.core.HazelcastInstance;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

sqlrest-cache/src/main/java/com/gitee/sqlrest/cache/hazelcast/HazelcastDistributedCache.java → sqlrest-cache/src/main/java/org/dromara/sqlrest/cache/hazelcast/HazelcastDistributedCache.java

@@ -7,9 +7,9 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.cache.hazelcast;
+package org.dromara.sqlrest.cache.hazelcast;
 
-import com.gitee.sqlrest.cache.DistributedCache;
+import org.dromara.sqlrest.cache.DistributedCache;
 import com.hazelcast.core.HazelcastInstance;
 import java.util.Objects;
 import java.util.Optional;

sqlrest-cache/src/main/java/com/gitee/sqlrest/cache/redis/JedisClient.java → sqlrest-cache/src/main/java/org/dromara/sqlrest/cache/redis/JedisClient.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.cache.redis;
+package org.dromara.sqlrest.cache.redis;
 
 import java.util.function.Consumer;
 import java.util.function.Function;

sqlrest-cache/src/main/java/com/gitee/sqlrest/cache/redis/RedisCacheFactory.java → sqlrest-cache/src/main/java/org/dromara/sqlrest/cache/redis/RedisCacheFactory.java

@@ -7,10 +7,10 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.cache.redis;
+package org.dromara.sqlrest.cache.redis;
 
-import com.gitee.sqlrest.cache.CacheFactory;
-import com.gitee.sqlrest.cache.DistributedCache;
+import org.dromara.sqlrest.cache.CacheFactory;
+import org.dromara.sqlrest.cache.DistributedCache;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.Resource;

sqlrest-cache/src/main/java/com/gitee/sqlrest/cache/redis/RedisCacheMap.java → sqlrest-cache/src/main/java/org/dromara/sqlrest/cache/redis/RedisCacheMap.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.cache.redis;
+package org.dromara.sqlrest.cache.redis;
 
 import cn.hutool.json.JSONUtil;
 import java.util.Collection;

sqlrest-cache/src/main/java/com/gitee/sqlrest/cache/redis/RedisDistributedCache.java → sqlrest-cache/src/main/java/org/dromara/sqlrest/cache/redis/RedisDistributedCache.java

@@ -7,10 +7,10 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.cache.redis;
+package org.dromara.sqlrest.cache.redis;
 
 import cn.hutool.json.JSONUtil;
-import com.gitee.sqlrest.cache.DistributedCache;
+import org.dromara.sqlrest.cache.DistributedCache;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 

sqlrest-cache/src/main/java/com/gitee/sqlrest/cache/redis/RedisProperties.java → sqlrest-cache/src/main/java/org/dromara/sqlrest/cache/redis/RedisProperties.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.cache.redis;
+package org.dromara.sqlrest.cache.redis;
 
 import java.time.Duration;
 import lombok.Data;

sqlrest-common/pom.xml

@@ -4,8 +4,8 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>sqlrest-parent</artifactId>
-    <groupId>com.gitee.sqlrest</groupId>
-    <version>1.4.0</version>
+    <groupId>org.dromara.sqlrest</groupId>
+    <version>1.5.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>sqlrest-common</artifactId>

sqlrest-common/src/main/java/com/gitee/sqlrest/common/consts/Constants.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/consts/Constants.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.consts;
+package org.dromara.sqlrest.common.consts;
 
 public abstract class Constants {
 

sqlrest-common/src/main/java/com/gitee/sqlrest/common/dto/AccessToken.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/dto/AccessToken.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.dto;
+package org.dromara.sqlrest.common.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;

sqlrest-common/src/main/java/com/gitee/sqlrest/common/dto/BaseParam.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/dto/BaseParam.java

@@ -7,10 +7,10 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.dto;
+package org.dromara.sqlrest.common.dto;
 
-import com.gitee.sqlrest.common.enums.ParamLocationEnum;
-import com.gitee.sqlrest.common.enums.ParamTypeEnum;
+import org.dromara.sqlrest.common.enums.ParamLocationEnum;
+import org.dromara.sqlrest.common.enums.ParamTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import lombok.AllArgsConstructor;

sqlrest-common/src/main/java/com/gitee/sqlrest/common/dto/DateCount.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/dto/DateCount.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.dto;
+package org.dromara.sqlrest.common.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sqlrest-common/src/main/java/com/gitee/sqlrest/common/dto/IdWithName.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/dto/IdWithName.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.dto;
+package org.dromara.sqlrest.common.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sqlrest-common/src/main/java/com/gitee/sqlrest/common/dto/ItemParam.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/dto/ItemParam.java

@@ -7,12 +7,12 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.dto;
+package org.dromara.sqlrest.common.dto;
 
-import com.gitee.sqlrest.common.enums.HttpMethodEnum;
-import com.gitee.sqlrest.common.enums.ParamTypeEnum;
-import com.gitee.sqlrest.common.exception.CommonException;
-import com.gitee.sqlrest.common.exception.ResponseErrorCode;
+import org.dromara.sqlrest.common.enums.HttpMethodEnum;
+import org.dromara.sqlrest.common.enums.ParamTypeEnum;
+import org.dromara.sqlrest.common.exception.CommonException;
+import org.dromara.sqlrest.common.exception.ResponseErrorCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Collections;

sqlrest-common/src/main/java/com/gitee/sqlrest/common/dto/NameCount.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/dto/NameCount.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.dto;
+package org.dromara.sqlrest.common.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sqlrest-common/src/main/java/com/gitee/sqlrest/common/dto/OutParam.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/dto/OutParam.java

@@ -7,11 +7,11 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.dto;
+package org.dromara.sqlrest.common.dto;
 
-import com.gitee.sqlrest.common.enums.ParamTypeEnum;
-import com.gitee.sqlrest.common.exception.CommonException;
-import com.gitee.sqlrest.common.exception.ResponseErrorCode;
+import org.dromara.sqlrest.common.enums.ParamTypeEnum;
+import org.dromara.sqlrest.common.exception.CommonException;
+import org.dromara.sqlrest.common.exception.ResponseErrorCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;

sqlrest-common/src/main/java/com/gitee/sqlrest/common/dto/PageResult.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/dto/PageResult.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.dto;
+package org.dromara.sqlrest.common.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sqlrest-common/src/main/java/com/gitee/sqlrest/common/dto/ParamValue.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/dto/ParamValue.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.dto;
+package org.dromara.sqlrest.common.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sqlrest-common/src/main/java/com/gitee/sqlrest/common/dto/ProductContext.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/dto/ProductContext.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.dto;
+package org.dromara.sqlrest.common.dto;
 
 import java.io.Serializable;
 import java.sql.Connection;

sqlrest-common/src/main/java/com/gitee/sqlrest/common/dto/ResultEntity.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/dto/ResultEntity.java

@@ -7,9 +7,9 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.dto;
+package org.dromara.sqlrest.common.dto;
 
-import com.gitee.sqlrest.common.exception.ResponseErrorCode;
+import org.dromara.sqlrest.common.exception.ResponseErrorCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;

sqlrest-common/src/main/java/com/gitee/sqlrest/common/dto/ThreeConsumer.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/dto/ThreeConsumer.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.dto;
+package org.dromara.sqlrest.common.dto;
 
 @FunctionalInterface
 public interface ThreeConsumer<X, Y, Z> {

sqlrest-common/src/main/java/com/gitee/sqlrest/common/enums/AliveTimeEnum.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/enums/AliveTimeEnum.java

@@ -7,9 +7,9 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.enums;
+package org.dromara.sqlrest.common.enums;
 
-import com.gitee.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.consts.Constants;
 
 public enum AliveTimeEnum {
   PERIOD("短期", Constants.CLIENT_TOKEN_DURATION_SECONDS),

sqlrest-common/src/main/java/com/gitee/sqlrest/common/enums/CacheKeyTypeEnum.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/enums/CacheKeyTypeEnum.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.enums;
+package org.dromara.sqlrest.common.enums;
 
 public enum CacheKeyTypeEnum {
 

sqlrest-common/src/main/java/com/gitee/sqlrest/common/enums/DataTypeFormatEnum.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/enums/DataTypeFormatEnum.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.enums;
+package org.dromara.sqlrest.common.enums;
 
 import cn.hutool.core.date.DatePattern;
 

sqlrest-common/src/main/java/com/gitee/sqlrest/common/enums/DurationTimeEnum.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/enums/DurationTimeEnum.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.enums;
+package org.dromara.sqlrest.common.enums;
 
 import lombok.Getter;
 

sqlrest-common/src/main/java/com/gitee/sqlrest/common/enums/ExecuteEngineEnum.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/enums/ExecuteEngineEnum.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.enums;
+package org.dromara.sqlrest.common.enums;
 
 public enum ExecuteEngineEnum {
   SQL, SCRIPT,

sqlrest-common/src/main/java/com/gitee/sqlrest/common/enums/ExpireTimeEnum.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/enums/ExpireTimeEnum.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.enums;
+package org.dromara.sqlrest.common.enums;
 
 import lombok.Getter;
 

sqlrest-common/src/main/java/com/gitee/sqlrest/common/enums/HttpMethodEnum.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/enums/HttpMethodEnum.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.enums;
+package org.dromara.sqlrest.common.enums;
 
 public enum HttpMethodEnum {
   GET(false), HEAD(false), PUT(true), POST(true), DELETE(true),

sqlrest-common/src/main/java/com/gitee/sqlrest/common/enums/NamingStrategyEnum.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/enums/NamingStrategyEnum.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.enums;
+package org.dromara.sqlrest.common.enums;
 
 import cn.hutool.core.util.StrUtil;
 import java.util.function.Function;

sqlrest-common/src/main/java/com/gitee/sqlrest/common/enums/OnOffEnum.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/enums/OnOffEnum.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.enums;
+package org.dromara.sqlrest.common.enums;
 
 public enum OnOffEnum {
   ON, OFF;

sqlrest-common/src/main/java/com/gitee/sqlrest/common/enums/ParamLocationEnum.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/enums/ParamLocationEnum.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.enums;
+package org.dromara.sqlrest.common.enums;
 
 public enum ParamLocationEnum {
   REQUEST_HEADER("header", "请求头"),

sqlrest-common/src/main/java/com/gitee/sqlrest/common/enums/ParamTypeEnum.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/enums/ParamTypeEnum.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.enums;
+package org.dromara.sqlrest.common.enums;
 
 import java.util.Map;
 import java.util.function.Function;

sqlrest-common/src/main/java/com/gitee/sqlrest/common/enums/ProductTypeEnum.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/enums/ProductTypeEnum.java

@@ -7,10 +7,10 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.enums;
+package org.dromara.sqlrest.common.enums;
 
-import com.gitee.sqlrest.common.dto.ProductContext;
-import com.gitee.sqlrest.common.dto.ThreeConsumer;
+import org.dromara.sqlrest.common.dto.ProductContext;
+import org.dromara.sqlrest.common.dto.ThreeConsumer;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Arrays;

sqlrest-common/src/main/java/com/gitee/sqlrest/common/enums/WhiteBlackEnum.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/enums/WhiteBlackEnum.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.enums;
+package org.dromara.sqlrest.common.enums;
 
 public enum WhiteBlackEnum {
   WHITE, BLACK;

sqlrest-common/src/main/java/com/gitee/sqlrest/common/exception/CommonException.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/exception/CommonException.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.exception;
+package org.dromara.sqlrest.common.exception;
 
 import lombok.Data;
 

sqlrest-common/src/main/java/com/gitee/sqlrest/common/exception/ResponseErrorCode.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/exception/ResponseErrorCode.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.exception;
+package org.dromara.sqlrest.common.exception;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

sqlrest-common/src/main/java/com/gitee/sqlrest/common/exception/UnAuthorizedException.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/exception/UnAuthorizedException.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.exception;
+package org.dromara.sqlrest.common.exception;
 
 public class UnAuthorizedException extends RuntimeException {
 

sqlrest-common/src/main/java/com/gitee/sqlrest/common/exception/UnPermissionException.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/exception/UnPermissionException.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.exception;
+package org.dromara.sqlrest.common.exception;
 
 public class UnPermissionException extends RuntimeException {
 

sqlrest-common/src/main/java/com/gitee/sqlrest/common/model/JarFileClassLoader.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/model/JarFileClassLoader.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.model;
+package org.dromara.sqlrest.common.model;
 
 import java.io.File;
 import java.io.FileFilter;

sqlrest-common/src/main/java/com/gitee/sqlrest/common/model/SimpleDataSource.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/model/SimpleDataSource.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.model;
+package org.dromara.sqlrest.common.model;
 
 import java.io.PrintWriter;
 import java.sql.Connection;

sqlrest-common/src/main/java/com/gitee/sqlrest/common/model/ThrowableRunnable.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/model/ThrowableRunnable.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.model;
+package org.dromara.sqlrest.common.model;
 
 @FunctionalInterface
 public interface ThrowableRunnable {

sqlrest-common/src/main/java/com/gitee/sqlrest/common/util/CacheUtils.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/util/CacheUtils.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.util;
+package org.dromara.sqlrest.common.util;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;

sqlrest-common/src/main/java/com/gitee/sqlrest/common/util/JdbcUrlUtils.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/util/JdbcUrlUtils.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.util;
+package org.dromara.sqlrest.common.util;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;

sqlrest-common/src/main/java/com/gitee/sqlrest/common/util/LambdaUtils.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/util/LambdaUtils.java

@@ -7,9 +7,9 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.util;
+package org.dromara.sqlrest.common.util;
 
-import com.gitee.sqlrest.common.model.ThrowableRunnable;
+import org.dromara.sqlrest.common.model.ThrowableRunnable;
 import lombok.experimental.UtilityClass;
 
 @UtilityClass

sqlrest-common/src/main/java/com/gitee/sqlrest/common/util/PasswordUtils.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/util/PasswordUtils.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.util;
+package org.dromara.sqlrest.common.util;
 
 import cn.hutool.crypto.digest.BCrypt;
 

sqlrest-common/src/main/java/com/gitee/sqlrest/common/util/PomVersionUtils.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/util/PomVersionUtils.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.util;
+package org.dromara.sqlrest.common.util;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.URLUtil;

sqlrest-common/src/main/java/com/gitee/sqlrest/common/util/ServletUtils.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/util/ServletUtils.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.util;
+package org.dromara.sqlrest.common.util;
 
 import javax.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;

sqlrest-common/src/main/java/com/gitee/sqlrest/common/util/TokenUtils.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/util/TokenUtils.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.util;
+package org.dromara.sqlrest.common.util;
 
 import java.security.MessageDigest;
 import java.util.UUID;

sqlrest-common/src/main/java/com/gitee/sqlrest/common/util/UuidUtils.java → sqlrest-common/src/main/java/org/dromara/sqlrest/common/util/UuidUtils.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.common.util;
+package org.dromara.sqlrest.common.util;
 
 import java.util.UUID;
 import lombok.experimental.UtilityClass;

sqlrest-core/pom.xml

@@ -4,8 +4,8 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>sqlrest-parent</artifactId>
-    <groupId>com.gitee.sqlrest</groupId>
-    <version>1.4.0</version>
+    <groupId>org.dromara.sqlrest</groupId>
+    <version>1.5.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>sqlrest-core</artifactId>
@@ -13,19 +13,19 @@
   <dependencies>
 
     <dependency>
-      <groupId>com.gitee.sqlrest</groupId>
+      <groupId>org.dromara.sqlrest</groupId>
       <artifactId>sqlrest-template</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>com.gitee.sqlrest</groupId>
+      <groupId>org.dromara.sqlrest</groupId>
       <artifactId>sqlrest-persistence</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>com.gitee.sqlrest</groupId>
+      <groupId>org.dromara.sqlrest</groupId>
       <artifactId>sqlrest-cache</artifactId>
       <version>${project.version}</version>
     </dependency>

sqlrest-core/src/main/java/com/gitee/sqlrest/core/driver/DriverLoadService.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/driver/DriverLoadService.java

@@ -7,11 +7,11 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.driver;
+package org.dromara.sqlrest.core.driver;
 
 import cn.hutool.core.io.FileUtil;
-import com.gitee.sqlrest.common.enums.ProductTypeEnum;
-import com.gitee.sqlrest.core.dto.DatabaseTypeDriverResponse;
+import org.dromara.sqlrest.common.enums.ProductTypeEnum;
+import org.dromara.sqlrest.core.dto.DatabaseTypeDriverResponse;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.EnumMap;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/ApiAccessLogBasicResponse.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/ApiAccessLogBasicResponse.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/ApiAssignmentBaseResponse.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/ApiAssignmentBaseResponse.java

@@ -7,11 +7,11 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.gitee.sqlrest.common.enums.ExecuteEngineEnum;
-import com.gitee.sqlrest.common.enums.HttpMethodEnum;
+import org.dromara.sqlrest.common.enums.ExecuteEngineEnum;
+import org.dromara.sqlrest.common.enums.HttpMethodEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.sql.Timestamp;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/ApiAssignmentDetailResponse.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/ApiAssignmentDetailResponse.java

@@ -7,14 +7,14 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.gitee.sqlrest.common.dto.ItemParam;
-import com.gitee.sqlrest.common.dto.OutParam;
-import com.gitee.sqlrest.common.enums.CacheKeyTypeEnum;
-import com.gitee.sqlrest.common.enums.NamingStrategyEnum;
-import com.gitee.sqlrest.persistence.entity.ApiContextEntity;
+import org.dromara.sqlrest.common.dto.ItemParam;
+import org.dromara.sqlrest.common.dto.OutParam;
+import org.dromara.sqlrest.common.enums.CacheKeyTypeEnum;
+import org.dromara.sqlrest.common.enums.NamingStrategyEnum;
+import org.dromara.sqlrest.persistence.entity.ApiContextEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.List;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/ApiAssignmentSaveRequest.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/ApiAssignmentSaveRequest.java

@@ -7,15 +7,15 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.gitee.sqlrest.common.dto.ItemParam;
-import com.gitee.sqlrest.common.dto.OutParam;
-import com.gitee.sqlrest.common.enums.CacheKeyTypeEnum;
-import com.gitee.sqlrest.common.enums.ExecuteEngineEnum;
-import com.gitee.sqlrest.common.enums.HttpMethodEnum;
-import com.gitee.sqlrest.common.enums.NamingStrategyEnum;
+import org.dromara.sqlrest.common.dto.ItemParam;
+import org.dromara.sqlrest.common.dto.OutParam;
+import org.dromara.sqlrest.common.enums.CacheKeyTypeEnum;
+import org.dromara.sqlrest.common.enums.ExecuteEngineEnum;
+import org.dromara.sqlrest.common.enums.HttpMethodEnum;
+import org.dromara.sqlrest.common.enums.NamingStrategyEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.List;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/ApiDebugExecuteRequest.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/ApiDebugExecuteRequest.java

@@ -7,11 +7,11 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
-import com.gitee.sqlrest.common.dto.ParamValue;
-import com.gitee.sqlrest.common.enums.ExecuteEngineEnum;
-import com.gitee.sqlrest.common.enums.NamingStrategyEnum;
+import org.dromara.sqlrest.common.dto.ParamValue;
+import org.dromara.sqlrest.common.enums.ExecuteEngineEnum;
+import org.dromara.sqlrest.common.enums.NamingStrategyEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.List;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/ApiModuleAssignments.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/ApiModuleAssignments.java

-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/AppClientDetailResponse.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/AppClientDetailResponse.java

@@ -7,11 +7,11 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.gitee.sqlrest.common.enums.AliveTimeEnum;
-import com.gitee.sqlrest.common.enums.DurationTimeEnum;
+import org.dromara.sqlrest.common.enums.AliveTimeEnum;
+import org.dromara.sqlrest.common.enums.DurationTimeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.sql.Timestamp;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/AppClientGroupRequest.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/AppClientGroupRequest.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/AppClientSaveRequest.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/AppClientSaveRequest.java

@@ -7,10 +7,10 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
-import com.gitee.sqlrest.common.enums.AliveTimeEnum;
-import com.gitee.sqlrest.common.enums.ExpireTimeEnum;
+import org.dromara.sqlrest.common.enums.AliveTimeEnum;
+import org.dromara.sqlrest.common.enums.ExpireTimeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import javax.validation.constraints.NotBlank;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/AppClientSearchRequest.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/AppClientSearchRequest.java

-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/AssignmentSearchRequest.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/AssignmentSearchRequest.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/DataSourceBaseRequest.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/DataSourceBaseRequest.java

@@ -7,9 +7,9 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
-import com.gitee.sqlrest.common.enums.ProductTypeEnum;
+import org.dromara.sqlrest.common.enums.ProductTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/DataSourceSaveRequest.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/DataSourceSaveRequest.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/DataTypeFormatMapValue.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/DataTypeFormatMapValue.java

@@ -7,9 +7,9 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
-import com.gitee.sqlrest.common.enums.DataTypeFormatEnum;
+import org.dromara.sqlrest.common.enums.DataTypeFormatEnum;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/DatabaseTypeDetailResponse.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/DatabaseTypeDetailResponse.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/DatabaseTypeDriverResponse.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/DatabaseTypeDriverResponse.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/DatasourceDetailResponse.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/DatasourceDetailResponse.java

@@ -7,10 +7,10 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.gitee.sqlrest.common.enums.ProductTypeEnum;
+import org.dromara.sqlrest.common.enums.ProductTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.sql.Timestamp;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/EntityIdNameResponse.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/EntityIdNameResponse.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/EntitySearchRequest.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/EntitySearchRequest.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/ExecuteSqlRecord.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/ExecuteSqlRecord.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import java.sql.Array;
 import java.sql.SQLException;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/FlowRuleDetailResponse.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/FlowRuleDetailResponse.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/FlowRuleSaveRequest.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/FlowRuleSaveRequest.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/McpToolResponse.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/McpToolResponse.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/McpToolSaveRequest.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/McpToolSaveRequest.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/MetadataColumnResponse.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/MetadataColumnResponse.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/NameValueBaseResponse.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/NameValueBaseResponse.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/NameValueRemarkResponse.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/NameValueRemarkResponse.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/ScriptEditorCompletion.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/ScriptEditorCompletion.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/SelectedEntityIdName.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/SelectedEntityIdName.java

-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/SqlParamParseResponse.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/SqlParamParseResponse.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/SystemUserDetailResponse.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/SystemUserDetailResponse.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/TestAlarmConfigRequest.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/TestAlarmConfigRequest.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/TopologyNodeResponse.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/TopologyNodeResponse.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/UpdateAlarmConfigRequest.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/UpdateAlarmConfigRequest.java

@@ -7,9 +7,9 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
-import com.gitee.sqlrest.common.enums.OnOffEnum;
+import org.dromara.sqlrest.common.enums.OnOffEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import javax.validation.constraints.NotBlank;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/UpdateFirewallRulesRequest.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/UpdateFirewallRulesRequest.java

@@ -7,10 +7,10 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
-import com.gitee.sqlrest.common.enums.OnOffEnum;
-import com.gitee.sqlrest.common.enums.WhiteBlackEnum;
+import org.dromara.sqlrest.common.enums.OnOffEnum;
+import org.dromara.sqlrest.common.enums.WhiteBlackEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import javax.validation.constraints.NotNull;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/dto/UserLoginRequest.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/dto/UserLoginRequest.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.dto;
+package org.dromara.sqlrest.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/exec/ApiExecuteService.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/exec/ApiExecuteService.java

@@ -7,29 +7,29 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.exec;
+package org.dromara.sqlrest.core.exec;
 
 import cn.hutool.crypto.digest.DigestUtil;
-import com.gitee.sqlrest.cache.CacheFactory;
-import com.gitee.sqlrest.cache.DistributedCache;
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.common.dto.ItemParam;
-import com.gitee.sqlrest.common.dto.ResultEntity;
-import com.gitee.sqlrest.common.enums.CacheKeyTypeEnum;
-import com.gitee.sqlrest.common.enums.HttpMethodEnum;
-import com.gitee.sqlrest.common.enums.ParamLocationEnum;
-import com.gitee.sqlrest.common.enums.ParamTypeEnum;
-import com.gitee.sqlrest.common.exception.CommonException;
-import com.gitee.sqlrest.common.exception.ResponseErrorCode;
-import com.gitee.sqlrest.core.driver.DriverLoadService;
-import com.gitee.sqlrest.core.exec.engine.ApiExecutorEngineFactory;
-import com.gitee.sqlrest.core.exec.extractor.HttpRequestBodyExtractor;
-import com.gitee.sqlrest.core.util.DataSourceUtils;
-import com.gitee.sqlrest.core.util.SpelUtils;
-import com.gitee.sqlrest.persistence.dao.DataSourceDao;
-import com.gitee.sqlrest.persistence.entity.ApiAssignmentEntity;
-import com.gitee.sqlrest.persistence.entity.DataSourceEntity;
-import com.gitee.sqlrest.persistence.util.JsonUtils;
+import org.dromara.sqlrest.cache.CacheFactory;
+import org.dromara.sqlrest.cache.DistributedCache;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.dto.ItemParam;
+import org.dromara.sqlrest.common.dto.ResultEntity;
+import org.dromara.sqlrest.common.enums.CacheKeyTypeEnum;
+import org.dromara.sqlrest.common.enums.HttpMethodEnum;
+import org.dromara.sqlrest.common.enums.ParamLocationEnum;
+import org.dromara.sqlrest.common.enums.ParamTypeEnum;
+import org.dromara.sqlrest.common.exception.CommonException;
+import org.dromara.sqlrest.common.exception.ResponseErrorCode;
+import org.dromara.sqlrest.core.driver.DriverLoadService;
+import org.dromara.sqlrest.core.exec.engine.ApiExecutorEngineFactory;
+import org.dromara.sqlrest.core.exec.extractor.HttpRequestBodyExtractor;
+import org.dromara.sqlrest.core.util.DataSourceUtils;
+import org.dromara.sqlrest.core.util.SpelUtils;
+import org.dromara.sqlrest.persistence.dao.DataSourceDao;
+import org.dromara.sqlrest.persistence.entity.ApiAssignmentEntity;
+import org.dromara.sqlrest.persistence.entity.DataSourceEntity;
+import org.dromara.sqlrest.persistence.util.JsonUtils;
 import com.google.common.collect.Lists;
 import com.zaxxer.hikari.HikariDataSource;
 import java.io.File;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/exec/RequestParamLogger.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/exec/RequestParamLogger.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.exec;
+package org.dromara.sqlrest.core.exec;
 
 import java.util.Map;
 

sqlrest-core/src/main/java/com/gitee/sqlrest/core/exec/SqlExecuteLogger.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/exec/SqlExecuteLogger.java

@@ -7,9 +7,9 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.exec;
+package org.dromara.sqlrest.core.exec;
 
-import com.gitee.sqlrest.core.dto.ExecuteSqlRecord;
+import org.dromara.sqlrest.core.dto.ExecuteSqlRecord;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/exec/annotation/Comment.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/exec/annotation/Comment.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.exec.annotation;
+package org.dromara.sqlrest.core.exec.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/exec/annotation/Module.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/exec/annotation/Module.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.exec.annotation;
+package org.dromara.sqlrest.core.exec.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/exec/engine/AbstractExecutorEngine.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/exec/engine/AbstractExecutorEngine.java

@@ -7,9 +7,9 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.exec.engine;
+package org.dromara.sqlrest.core.exec.engine;
 
-import com.gitee.sqlrest.common.enums.ProductTypeEnum;
+import org.dromara.sqlrest.common.enums.ProductTypeEnum;
 import com.zaxxer.hikari.HikariDataSource;
 
 public abstract class AbstractExecutorEngine implements ApiExecutorEngine {

sqlrest-core/src/main/java/com/gitee/sqlrest/core/exec/engine/ApiExecutorEngine.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/exec/engine/ApiExecutorEngine.java

@@ -7,10 +7,10 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.exec.engine;
+package org.dromara.sqlrest.core.exec.engine;
 
-import com.gitee.sqlrest.common.enums.NamingStrategyEnum;
-import com.gitee.sqlrest.persistence.entity.ApiContextEntity;
+import org.dromara.sqlrest.common.enums.NamingStrategyEnum;
+import org.dromara.sqlrest.persistence.entity.ApiContextEntity;
 import java.util.List;
 import java.util.Map;
 

sqlrest-core/src/main/java/com/gitee/sqlrest/core/exec/engine/ApiExecutorEngineFactory.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/exec/engine/ApiExecutorEngineFactory.java

@@ -7,12 +7,12 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.exec.engine;
+package org.dromara.sqlrest.core.exec.engine;
 
-import com.gitee.sqlrest.common.enums.ExecuteEngineEnum;
-import com.gitee.sqlrest.common.enums.ProductTypeEnum;
-import com.gitee.sqlrest.core.exec.engine.impl.ScriptExecutorService;
-import com.gitee.sqlrest.core.exec.engine.impl.SqlExecutorService;
+import org.dromara.sqlrest.common.enums.ExecuteEngineEnum;
+import org.dromara.sqlrest.common.enums.ProductTypeEnum;
+import org.dromara.sqlrest.core.exec.engine.impl.ScriptExecutorService;
+import org.dromara.sqlrest.core.exec.engine.impl.SqlExecutorService;
 import com.zaxxer.hikari.HikariDataSource;
 import java.util.HashMap;
 import java.util.Map;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/exec/engine/impl/ScriptExecutorService.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/exec/engine/impl/ScriptExecutorService.java

@@ -7,18 +7,18 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.exec.engine.impl;
+package org.dromara.sqlrest.core.exec.engine.impl;
 
 import cn.hutool.extra.spring.SpringUtil;
-import com.gitee.sqlrest.common.enums.NamingStrategyEnum;
-import com.gitee.sqlrest.common.enums.ProductTypeEnum;
-import com.gitee.sqlrest.core.dto.ScriptEditorCompletion;
-import com.gitee.sqlrest.core.exec.annotation.Module;
-import com.gitee.sqlrest.core.exec.engine.AbstractExecutorEngine;
-import com.gitee.sqlrest.core.exec.module.CacheVarModule;
-import com.gitee.sqlrest.core.exec.module.DbVarModule;
-import com.gitee.sqlrest.core.exec.module.EnvVarModule;
-import com.gitee.sqlrest.persistence.entity.ApiContextEntity;
+import org.dromara.sqlrest.common.enums.NamingStrategyEnum;
+import org.dromara.sqlrest.common.enums.ProductTypeEnum;
+import org.dromara.sqlrest.core.dto.ScriptEditorCompletion;
+import org.dromara.sqlrest.core.exec.annotation.Module;
+import org.dromara.sqlrest.core.exec.engine.AbstractExecutorEngine;
+import org.dromara.sqlrest.core.exec.module.CacheVarModule;
+import org.dromara.sqlrest.core.exec.module.DbVarModule;
+import org.dromara.sqlrest.core.exec.module.EnvVarModule;
+import org.dromara.sqlrest.persistence.entity.ApiContextEntity;
 import com.zaxxer.hikari.HikariDataSource;
 import groovy.lang.Binding;
 import groovy.lang.GroovyShell;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/exec/engine/impl/SqlExecutorService.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/exec/engine/impl/SqlExecutorService.java

@@ -7,17 +7,17 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.exec.engine.impl;
+package org.dromara.sqlrest.core.exec.engine.impl;
 
-import com.gitee.sqlrest.common.enums.NamingStrategyEnum;
-import com.gitee.sqlrest.common.enums.ProductTypeEnum;
-import com.gitee.sqlrest.common.util.LambdaUtils;
-import com.gitee.sqlrest.core.exec.engine.AbstractExecutorEngine;
-import com.gitee.sqlrest.core.util.PageSizeUtils;
-import com.gitee.sqlrest.core.util.SqlJdbcUtils;
-import com.gitee.sqlrest.persistence.entity.ApiContextEntity;
-import com.gitee.sqlrest.template.SqlMeta;
-import com.gitee.sqlrest.template.XmlSqlTemplate;
+import org.dromara.sqlrest.common.enums.NamingStrategyEnum;
+import org.dromara.sqlrest.common.enums.ProductTypeEnum;
+import org.dromara.sqlrest.common.util.LambdaUtils;
+import org.dromara.sqlrest.core.exec.engine.AbstractExecutorEngine;
+import org.dromara.sqlrest.core.util.PageSizeUtils;
+import org.dromara.sqlrest.core.util.SqlJdbcUtils;
+import org.dromara.sqlrest.persistence.entity.ApiContextEntity;
+import org.dromara.sqlrest.template.SqlMeta;
+import org.dromara.sqlrest.template.XmlSqlTemplate;
 import com.zaxxer.hikari.HikariDataSource;
 import java.sql.Connection;
 import java.util.ArrayList;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/exec/extractor/FormHttpRequestBodyExtractor.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/exec/extractor/FormHttpRequestBodyExtractor.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.exec.extractor;
+package org.dromara.sqlrest.core.exec.extractor;
 
 import com.google.common.collect.Lists;
 import java.net.URLDecoder;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/exec/extractor/HttpRequestBodyExtractor.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/exec/extractor/HttpRequestBodyExtractor.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.exec.extractor;
+package org.dromara.sqlrest.core.exec.extractor;
 
 import java.nio.charset.Charset;
 import java.util.Map;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/exec/extractor/JsonHttpRequestBodyExtractor.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/exec/extractor/JsonHttpRequestBodyExtractor.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.exec.extractor;
+package org.dromara.sqlrest.core.exec.extractor;
 
 import cn.hutool.core.io.IoUtil;
 import com.fasterxml.jackson.databind.DeserializationFeature;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/exec/module/CacheVarModule.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/exec/module/CacheVarModule.java

@@ -7,13 +7,13 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.exec.module;
+package org.dromara.sqlrest.core.exec.module;
 
-import com.gitee.sqlrest.cache.CacheFactory;
-import com.gitee.sqlrest.cache.DistributedCache;
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.core.exec.annotation.Comment;
-import com.gitee.sqlrest.core.exec.annotation.Module;
+import org.dromara.sqlrest.cache.CacheFactory;
+import org.dromara.sqlrest.cache.DistributedCache;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.core.exec.annotation.Comment;
+import org.dromara.sqlrest.core.exec.annotation.Module;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Service;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/exec/module/DbVarModule.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/exec/module/DbVarModule.java

@@ -7,17 +7,17 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.exec.module;
-
-import com.gitee.sqlrest.common.enums.NamingStrategyEnum;
-import com.gitee.sqlrest.common.enums.ProductTypeEnum;
-import com.gitee.sqlrest.core.exec.SqlExecuteLogger;
-import com.gitee.sqlrest.core.exec.annotation.Comment;
-import com.gitee.sqlrest.core.exec.annotation.Module;
-import com.gitee.sqlrest.core.util.ConvertUtils;
-import com.gitee.sqlrest.core.util.PageSizeUtils;
-import com.gitee.sqlrest.template.SqlMeta;
-import com.gitee.sqlrest.template.XmlSqlTemplate;
+package org.dromara.sqlrest.core.exec.module;
+
+import org.dromara.sqlrest.common.enums.NamingStrategyEnum;
+import org.dromara.sqlrest.common.enums.ProductTypeEnum;
+import org.dromara.sqlrest.core.exec.SqlExecuteLogger;
+import org.dromara.sqlrest.core.exec.annotation.Comment;
+import org.dromara.sqlrest.core.exec.annotation.Module;
+import org.dromara.sqlrest.core.util.ConvertUtils;
+import org.dromara.sqlrest.core.util.PageSizeUtils;
+import org.dromara.sqlrest.template.SqlMeta;
+import org.dromara.sqlrest.template.XmlSqlTemplate;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/exec/module/EnvVarModule.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/exec/module/EnvVarModule.java

@@ -7,10 +7,10 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.exec.module;
+package org.dromara.sqlrest.core.exec.module;
 
-import com.gitee.sqlrest.core.exec.annotation.Comment;
-import com.gitee.sqlrest.core.exec.annotation.Module;
+import org.dromara.sqlrest.core.exec.annotation.Comment;
+import org.dromara.sqlrest.core.exec.annotation.Module;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 

sqlrest-core/src/main/java/com/gitee/sqlrest/core/executor/AlarmHttpRequestFactory.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/executor/AlarmHttpRequestFactory.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.executor;
+package org.dromara.sqlrest.core.executor;
 
 import java.security.KeyManagementException;
 import java.security.KeyStoreException;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/executor/DataSourceCleanService.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/executor/DataSourceCleanService.java

@@ -7,10 +7,10 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.executor;
+package org.dromara.sqlrest.core.executor;
 
-import com.gitee.sqlrest.core.util.DataSourceUtils;
-import com.gitee.sqlrest.persistence.dao.DataSourceDao;
+import org.dromara.sqlrest.core.util.DataSourceUtils;
+import org.dromara.sqlrest.persistence.dao.DataSourceDao;
 import java.util.Set;
 import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/executor/UnifyAlarmOpsService.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/executor/UnifyAlarmOpsService.java

@@ -7,16 +7,16 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.executor;
+package org.dromara.sqlrest.core.executor;
 
 import cn.hutool.json.JSONUtil;
-import com.gitee.sqlrest.common.enums.OnOffEnum;
-import com.gitee.sqlrest.core.dto.NameValueBaseResponse;
-import com.gitee.sqlrest.core.dto.TestAlarmConfigRequest;
-import com.gitee.sqlrest.core.dto.UpdateAlarmConfigRequest;
-import com.gitee.sqlrest.core.util.AlarmModelUtils;
-import com.gitee.sqlrest.persistence.dao.UnifyAlarmDao;
-import com.gitee.sqlrest.persistence.entity.UnifyAlarmEntity;
+import org.dromara.sqlrest.common.enums.OnOffEnum;
+import org.dromara.sqlrest.core.dto.NameValueBaseResponse;
+import org.dromara.sqlrest.core.dto.TestAlarmConfigRequest;
+import org.dromara.sqlrest.core.dto.UpdateAlarmConfigRequest;
+import org.dromara.sqlrest.core.util.AlarmModelUtils;
+import org.dromara.sqlrest.persistence.dao.UnifyAlarmDao;
+import org.dromara.sqlrest.persistence.entity.UnifyAlarmEntity;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/filter/AuthenticationFilter.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/filter/AuthenticationFilter.java

@@ -7,27 +7,27 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.filter;
+package org.dromara.sqlrest.core.filter;
 
 import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.hutool.core.thread.ExecutorBuilder;
 import cn.hutool.json.JSONUtil;
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.common.dto.ResultEntity;
-import com.gitee.sqlrest.common.enums.HttpMethodEnum;
-import com.gitee.sqlrest.common.exception.ResponseErrorCode;
-import com.gitee.sqlrest.common.exception.UnAuthorizedException;
-import com.gitee.sqlrest.common.exception.UnPermissionException;
-import com.gitee.sqlrest.common.util.TokenUtils;
-import com.gitee.sqlrest.core.exec.RequestParamLogger;
-import com.gitee.sqlrest.core.executor.UnifyAlarmOpsService;
-import com.gitee.sqlrest.core.servlet.ClientTokenService;
-import com.gitee.sqlrest.core.util.AlarmModelUtils;
-import com.gitee.sqlrest.core.util.ServletUtils;
-import com.gitee.sqlrest.persistence.dao.ApiAssignmentDao;
-import com.gitee.sqlrest.persistence.entity.AccessRecordEntity;
-import com.gitee.sqlrest.persistence.entity.ApiAssignmentEntity;
-import com.gitee.sqlrest.persistence.mapper.AccessRecordMapper;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.dto.ResultEntity;
+import org.dromara.sqlrest.common.enums.HttpMethodEnum;
+import org.dromara.sqlrest.common.exception.ResponseErrorCode;
+import org.dromara.sqlrest.common.exception.UnAuthorizedException;
+import org.dromara.sqlrest.common.exception.UnPermissionException;
+import org.dromara.sqlrest.common.util.TokenUtils;
+import org.dromara.sqlrest.core.exec.RequestParamLogger;
+import org.dromara.sqlrest.core.executor.UnifyAlarmOpsService;
+import org.dromara.sqlrest.core.servlet.ClientTokenService;
+import org.dromara.sqlrest.core.util.AlarmModelUtils;
+import org.dromara.sqlrest.core.util.ServletUtils;
+import org.dromara.sqlrest.persistence.dao.ApiAssignmentDao;
+import org.dromara.sqlrest.persistence.entity.AccessRecordEntity;
+import org.dromara.sqlrest.persistence.entity.ApiAssignmentEntity;
+import org.dromara.sqlrest.persistence.mapper.AccessRecordMapper;
 import com.google.common.base.Charsets;
 import java.io.IOException;
 import java.util.Map;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/filter/FlowControlManger.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/filter/FlowControlManger.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.filter;
+package org.dromara.sqlrest.core.filter;
 
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/gateway/FirewallFilterService.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/gateway/FirewallFilterService.java

@@ -7,13 +7,13 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.gateway;
+package org.dromara.sqlrest.core.gateway;
 
-import com.gitee.sqlrest.common.enums.OnOffEnum;
-import com.gitee.sqlrest.common.enums.WhiteBlackEnum;
-import com.gitee.sqlrest.core.dto.UpdateFirewallRulesRequest;
-import com.gitee.sqlrest.persistence.dao.FirewallRulesDao;
-import com.gitee.sqlrest.persistence.entity.FirewallRulesEntity;
+import org.dromara.sqlrest.common.enums.OnOffEnum;
+import org.dromara.sqlrest.common.enums.WhiteBlackEnum;
+import org.dromara.sqlrest.core.dto.UpdateFirewallRulesRequest;
+import org.dromara.sqlrest.persistence.dao.FirewallRulesDao;
+import org.dromara.sqlrest.persistence.entity.FirewallRulesEntity;
 import java.util.Arrays;
 import java.util.Optional;
 import java.util.Set;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/serdes/DateTimeSerDesFactory.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/serdes/DateTimeSerDesFactory.java

@@ -7,16 +7,16 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.serdes;
+package org.dromara.sqlrest.core.serdes;
 
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import com.gitee.sqlrest.common.enums.DataTypeFormatEnum;
-import com.gitee.sqlrest.core.serdes.datetime.DateValueSerializer;
-import com.gitee.sqlrest.core.serdes.datetime.LocalDateTimeValueSerializer;
-import com.gitee.sqlrest.core.serdes.datetime.LocalDateValueSerializer;
-import com.gitee.sqlrest.core.serdes.datetime.TimeValueSerializer;
-import com.gitee.sqlrest.core.serdes.datetime.TimestampValueSerializer;
-import com.gitee.sqlrest.core.serdes.number.NumberValueSerializer;
+import org.dromara.sqlrest.common.enums.DataTypeFormatEnum;
+import org.dromara.sqlrest.core.serdes.datetime.DateValueSerializer;
+import org.dromara.sqlrest.core.serdes.datetime.LocalDateTimeValueSerializer;
+import org.dromara.sqlrest.core.serdes.datetime.LocalDateValueSerializer;
+import org.dromara.sqlrest.core.serdes.datetime.TimeValueSerializer;
+import org.dromara.sqlrest.core.serdes.datetime.TimestampValueSerializer;
+import org.dromara.sqlrest.core.serdes.number.NumberValueSerializer;
 import com.google.common.collect.ImmutableMap;
 import java.util.HashMap;
 import java.util.Map;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/serdes/datetime/DateValueSerializer.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/serdes/datetime/DateValueSerializer.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.serdes.datetime;
+package org.dromara.sqlrest.core.serdes.datetime;
 
 import cn.hutool.core.date.DatePattern;
 import com.fasterxml.jackson.core.JsonGenerator;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/serdes/datetime/LocalDateTimeValueSerializer.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/serdes/datetime/LocalDateTimeValueSerializer.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.serdes.datetime;
+package org.dromara.sqlrest.core.serdes.datetime;
 
 import cn.hutool.core.date.DatePattern;
 import com.fasterxml.jackson.core.JsonGenerator;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/serdes/datetime/LocalDateValueSerializer.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/serdes/datetime/LocalDateValueSerializer.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.serdes.datetime;
+package org.dromara.sqlrest.core.serdes.datetime;
 
 import cn.hutool.core.date.DatePattern;
 import com.fasterxml.jackson.core.JsonGenerator;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/serdes/datetime/TimeValueSerializer.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/serdes/datetime/TimeValueSerializer.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.serdes.datetime;
+package org.dromara.sqlrest.core.serdes.datetime;
 
 import cn.hutool.core.date.DatePattern;
 import com.fasterxml.jackson.core.JsonGenerator;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/serdes/datetime/TimestampValueSerializer.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/serdes/datetime/TimestampValueSerializer.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.serdes.datetime;
+package org.dromara.sqlrest.core.serdes.datetime;
 
 import cn.hutool.core.date.DatePattern;
 import com.fasterxml.jackson.core.JsonGenerator;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/serdes/number/NumberValueSerializer.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/serdes/number/NumberValueSerializer.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.serdes.number;
+package org.dromara.sqlrest.core.serdes.number;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/service/ApiAssignmentService.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/service/ApiAssignmentService.java

@@ -7,52 +7,52 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.service;
+package org.dromara.sqlrest.core.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.exceptions.ExceptionUtil;
-import com.gitee.sqlrest.common.dto.ItemParam;
-import com.gitee.sqlrest.common.dto.OutParam;
-import com.gitee.sqlrest.common.dto.PageResult;
-import com.gitee.sqlrest.common.dto.ParamValue;
-import com.gitee.sqlrest.common.dto.ParamValue.BaseParamValue;
-import com.gitee.sqlrest.common.dto.ResultEntity;
-import com.gitee.sqlrest.common.enums.CacheKeyTypeEnum;
-import com.gitee.sqlrest.common.enums.DataTypeFormatEnum;
-import com.gitee.sqlrest.common.enums.NamingStrategyEnum;
-import com.gitee.sqlrest.common.enums.OnOffEnum;
-import com.gitee.sqlrest.common.enums.ParamLocationEnum;
-import com.gitee.sqlrest.common.enums.ParamTypeEnum;
-import com.gitee.sqlrest.common.exception.CommonException;
-import com.gitee.sqlrest.common.exception.ResponseErrorCode;
-import com.gitee.sqlrest.core.driver.DriverLoadService;
-import com.gitee.sqlrest.core.dto.ApiAssignmentBaseResponse;
-import com.gitee.sqlrest.core.dto.ApiAssignmentDetailResponse;
-import com.gitee.sqlrest.core.dto.ApiAssignmentSaveRequest;
-import com.gitee.sqlrest.core.dto.ApiDebugExecuteRequest;
-import com.gitee.sqlrest.core.dto.AssignmentSearchRequest;
-import com.gitee.sqlrest.core.dto.DataTypeFormatMapValue;
-import com.gitee.sqlrest.core.dto.ExecuteSqlRecord;
-import com.gitee.sqlrest.core.dto.ScriptEditorCompletion;
-import com.gitee.sqlrest.core.dto.SqlParamParseResponse;
-import com.gitee.sqlrest.core.exec.SqlExecuteLogger;
-import com.gitee.sqlrest.core.exec.annotation.Comment;
-import com.gitee.sqlrest.core.exec.engine.ApiExecutorEngineFactory;
-import com.gitee.sqlrest.core.exec.engine.impl.ScriptExecutorService;
-import com.gitee.sqlrest.core.util.ApiPathUtils;
-import com.gitee.sqlrest.core.util.DataSourceUtils;
-import com.gitee.sqlrest.core.util.JacksonUtils;
-import com.gitee.sqlrest.persistence.dao.ApiAssignmentDao;
-import com.gitee.sqlrest.persistence.dao.ApiGroupDao;
-import com.gitee.sqlrest.persistence.dao.ApiModuleDao;
-import com.gitee.sqlrest.persistence.dao.DataSourceDao;
-import com.gitee.sqlrest.persistence.entity.ApiAssignmentEntity;
-import com.gitee.sqlrest.persistence.entity.ApiContextEntity;
-import com.gitee.sqlrest.persistence.entity.ApiGroupEntity;
-import com.gitee.sqlrest.persistence.entity.ApiModuleEntity;
-import com.gitee.sqlrest.persistence.entity.DataSourceEntity;
-import com.gitee.sqlrest.persistence.util.PageUtils;
-import com.gitee.sqlrest.template.XmlSqlTemplate;
+import org.dromara.sqlrest.common.dto.ItemParam;
+import org.dromara.sqlrest.common.dto.OutParam;
+import org.dromara.sqlrest.common.dto.PageResult;
+import org.dromara.sqlrest.common.dto.ParamValue;
+import org.dromara.sqlrest.common.dto.ParamValue.BaseParamValue;
+import org.dromara.sqlrest.common.dto.ResultEntity;
+import org.dromara.sqlrest.common.enums.CacheKeyTypeEnum;
+import org.dromara.sqlrest.common.enums.DataTypeFormatEnum;
+import org.dromara.sqlrest.common.enums.NamingStrategyEnum;
+import org.dromara.sqlrest.common.enums.OnOffEnum;
+import org.dromara.sqlrest.common.enums.ParamLocationEnum;
+import org.dromara.sqlrest.common.enums.ParamTypeEnum;
+import org.dromara.sqlrest.common.exception.CommonException;
+import org.dromara.sqlrest.common.exception.ResponseErrorCode;
+import org.dromara.sqlrest.core.driver.DriverLoadService;
+import org.dromara.sqlrest.core.dto.ApiAssignmentBaseResponse;
+import org.dromara.sqlrest.core.dto.ApiAssignmentDetailResponse;
+import org.dromara.sqlrest.core.dto.ApiAssignmentSaveRequest;
+import org.dromara.sqlrest.core.dto.ApiDebugExecuteRequest;
+import org.dromara.sqlrest.core.dto.AssignmentSearchRequest;
+import org.dromara.sqlrest.core.dto.DataTypeFormatMapValue;
+import org.dromara.sqlrest.core.dto.ExecuteSqlRecord;
+import org.dromara.sqlrest.core.dto.ScriptEditorCompletion;
+import org.dromara.sqlrest.core.dto.SqlParamParseResponse;
+import org.dromara.sqlrest.core.exec.SqlExecuteLogger;
+import org.dromara.sqlrest.core.exec.annotation.Comment;
+import org.dromara.sqlrest.core.exec.engine.ApiExecutorEngineFactory;
+import org.dromara.sqlrest.core.exec.engine.impl.ScriptExecutorService;
+import org.dromara.sqlrest.core.util.ApiPathUtils;
+import org.dromara.sqlrest.core.util.DataSourceUtils;
+import org.dromara.sqlrest.core.util.JacksonUtils;
+import org.dromara.sqlrest.persistence.dao.ApiAssignmentDao;
+import org.dromara.sqlrest.persistence.dao.ApiGroupDao;
+import org.dromara.sqlrest.persistence.dao.ApiModuleDao;
+import org.dromara.sqlrest.persistence.dao.DataSourceDao;
+import org.dromara.sqlrest.persistence.entity.ApiAssignmentEntity;
+import org.dromara.sqlrest.persistence.entity.ApiContextEntity;
+import org.dromara.sqlrest.persistence.entity.ApiGroupEntity;
+import org.dromara.sqlrest.persistence.entity.ApiModuleEntity;
+import org.dromara.sqlrest.persistence.entity.DataSourceEntity;
+import org.dromara.sqlrest.persistence.util.PageUtils;
+import org.dromara.sqlrest.template.XmlSqlTemplate;
 import com.google.common.base.Charsets;
 import com.zaxxer.hikari.HikariDataSource;
 import java.io.File;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/service/ApiGroupService.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/service/ApiGroupService.java

@@ -7,17 +7,17 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.service;
+package org.dromara.sqlrest.core.service;
 
-import com.gitee.sqlrest.common.dto.PageResult;
-import com.gitee.sqlrest.common.exception.CommonException;
-import com.gitee.sqlrest.common.exception.ResponseErrorCode;
-import com.gitee.sqlrest.core.dto.EntitySearchRequest;
-import com.gitee.sqlrest.persistence.dao.ApiAssignmentDao;
-import com.gitee.sqlrest.persistence.dao.ApiGroupDao;
-import com.gitee.sqlrest.persistence.dao.AppClientDao;
-import com.gitee.sqlrest.persistence.entity.ApiGroupEntity;
-import com.gitee.sqlrest.persistence.util.PageUtils;
+import org.dromara.sqlrest.common.dto.PageResult;
+import org.dromara.sqlrest.common.exception.CommonException;
+import org.dromara.sqlrest.common.exception.ResponseErrorCode;
+import org.dromara.sqlrest.core.dto.EntitySearchRequest;
+import org.dromara.sqlrest.persistence.dao.ApiAssignmentDao;
+import org.dromara.sqlrest.persistence.dao.ApiGroupDao;
+import org.dromara.sqlrest.persistence.dao.AppClientDao;
+import org.dromara.sqlrest.persistence.entity.ApiGroupEntity;
+import org.dromara.sqlrest.persistence.util.PageUtils;
 import javax.annotation.Resource;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/service/ApiModuleService.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/service/ApiModuleService.java

@@ -7,19 +7,19 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.service;
+package org.dromara.sqlrest.core.service;
 
-import com.gitee.sqlrest.common.dto.PageResult;
-import com.gitee.sqlrest.common.exception.CommonException;
-import com.gitee.sqlrest.common.exception.ResponseErrorCode;
-import com.gitee.sqlrest.core.dto.ApiModuleAssignments;
-import com.gitee.sqlrest.core.dto.EntitySearchRequest;
-import com.gitee.sqlrest.core.dto.SelectedEntityIdName;
-import com.gitee.sqlrest.persistence.dao.ApiAssignmentDao;
-import com.gitee.sqlrest.persistence.dao.ApiModuleDao;
-import com.gitee.sqlrest.persistence.entity.ApiModuleEntity;
-import com.gitee.sqlrest.persistence.entity.ModuleAssignmentEntity;
-import com.gitee.sqlrest.persistence.util.PageUtils;
+import org.dromara.sqlrest.common.dto.PageResult;
+import org.dromara.sqlrest.common.exception.CommonException;
+import org.dromara.sqlrest.common.exception.ResponseErrorCode;
+import org.dromara.sqlrest.core.dto.ApiModuleAssignments;
+import org.dromara.sqlrest.core.dto.EntitySearchRequest;
+import org.dromara.sqlrest.core.dto.SelectedEntityIdName;
+import org.dromara.sqlrest.persistence.dao.ApiAssignmentDao;
+import org.dromara.sqlrest.persistence.dao.ApiModuleDao;
+import org.dromara.sqlrest.persistence.entity.ApiModuleEntity;
+import org.dromara.sqlrest.persistence.entity.ModuleAssignmentEntity;
+import org.dromara.sqlrest.persistence.util.PageUtils;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/service/AppClientService.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/service/AppClientService.java

@@ -7,27 +7,27 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.service;
+package org.dromara.sqlrest.core.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
-import com.gitee.sqlrest.cache.CacheFactory;
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.common.dto.AccessToken;
-import com.gitee.sqlrest.common.dto.PageResult;
-import com.gitee.sqlrest.common.enums.DurationTimeEnum;
-import com.gitee.sqlrest.common.enums.ExpireTimeEnum;
-import com.gitee.sqlrest.common.exception.CommonException;
-import com.gitee.sqlrest.common.exception.ResponseErrorCode;
-import com.gitee.sqlrest.common.util.TokenUtils;
-import com.gitee.sqlrest.core.dto.AppClientDetailResponse;
-import com.gitee.sqlrest.core.dto.AppClientGroupRequest;
-import com.gitee.sqlrest.core.dto.AppClientSaveRequest;
-import com.gitee.sqlrest.core.dto.AppClientSearchRequest;
-import com.gitee.sqlrest.core.dto.EntityIdNameResponse;
-import com.gitee.sqlrest.persistence.dao.AppClientDao;
-import com.gitee.sqlrest.persistence.entity.AppClientEntity;
-import com.gitee.sqlrest.persistence.util.PageUtils;
+import org.dromara.sqlrest.cache.CacheFactory;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.dto.AccessToken;
+import org.dromara.sqlrest.common.dto.PageResult;
+import org.dromara.sqlrest.common.enums.DurationTimeEnum;
+import org.dromara.sqlrest.common.enums.ExpireTimeEnum;
+import org.dromara.sqlrest.common.exception.CommonException;
+import org.dromara.sqlrest.common.exception.ResponseErrorCode;
+import org.dromara.sqlrest.common.util.TokenUtils;
+import org.dromara.sqlrest.core.dto.AppClientDetailResponse;
+import org.dromara.sqlrest.core.dto.AppClientGroupRequest;
+import org.dromara.sqlrest.core.dto.AppClientSaveRequest;
+import org.dromara.sqlrest.core.dto.AppClientSearchRequest;
+import org.dromara.sqlrest.core.dto.EntityIdNameResponse;
+import org.dromara.sqlrest.persistence.dao.AppClientDao;
+import org.dromara.sqlrest.persistence.entity.AppClientEntity;
+import org.dromara.sqlrest.persistence.util.PageUtils;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/service/DataSourceService.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/service/DataSourceService.java

@@ -7,28 +7,28 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.service;
+package org.dromara.sqlrest.core.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.extra.spring.SpringUtil;
-import com.gitee.sqlrest.common.dto.PageResult;
-import com.gitee.sqlrest.common.enums.ProductTypeEnum;
-import com.gitee.sqlrest.common.exception.CommonException;
-import com.gitee.sqlrest.common.exception.ResponseErrorCode;
-import com.gitee.sqlrest.common.util.JdbcUrlUtils;
-import com.gitee.sqlrest.core.driver.DriverLoadService;
-import com.gitee.sqlrest.core.dto.DataSourceBaseRequest;
-import com.gitee.sqlrest.core.dto.DataSourceSaveRequest;
-import com.gitee.sqlrest.core.dto.DatabaseTypeDetailResponse;
-import com.gitee.sqlrest.core.dto.DatasourceDetailResponse;
-import com.gitee.sqlrest.core.dto.EntityIdNameResponse;
-import com.gitee.sqlrest.core.dto.EntitySearchRequest;
-import com.gitee.sqlrest.core.dto.MetadataColumnResponse;
-import com.gitee.sqlrest.core.util.DataSourceUtils;
-import com.gitee.sqlrest.persistence.dao.ApiAssignmentDao;
-import com.gitee.sqlrest.persistence.dao.DataSourceDao;
-import com.gitee.sqlrest.persistence.entity.DataSourceEntity;
-import com.gitee.sqlrest.persistence.util.PageUtils;
+import org.dromara.sqlrest.common.dto.PageResult;
+import org.dromara.sqlrest.common.enums.ProductTypeEnum;
+import org.dromara.sqlrest.common.exception.CommonException;
+import org.dromara.sqlrest.common.exception.ResponseErrorCode;
+import org.dromara.sqlrest.common.util.JdbcUrlUtils;
+import org.dromara.sqlrest.core.driver.DriverLoadService;
+import org.dromara.sqlrest.core.dto.DataSourceBaseRequest;
+import org.dromara.sqlrest.core.dto.DataSourceSaveRequest;
+import org.dromara.sqlrest.core.dto.DatabaseTypeDetailResponse;
+import org.dromara.sqlrest.core.dto.DatasourceDetailResponse;
+import org.dromara.sqlrest.core.dto.EntityIdNameResponse;
+import org.dromara.sqlrest.core.dto.EntitySearchRequest;
+import org.dromara.sqlrest.core.dto.MetadataColumnResponse;
+import org.dromara.sqlrest.core.util.DataSourceUtils;
+import org.dromara.sqlrest.persistence.dao.ApiAssignmentDao;
+import org.dromara.sqlrest.persistence.dao.DataSourceDao;
+import org.dromara.sqlrest.persistence.entity.DataSourceEntity;
+import org.dromara.sqlrest.persistence.util.PageUtils;
 import com.zaxxer.hikari.HikariDataSource;
 import java.io.File;
 import java.sql.Connection;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/service/NodeService.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/service/NodeService.java

@@ -7,12 +7,12 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.service;
+package org.dromara.sqlrest.core.service;
 
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.common.exception.CommonException;
-import com.gitee.sqlrest.common.exception.ResponseErrorCode;
-import com.gitee.sqlrest.core.dto.TopologyNodeResponse;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.exception.CommonException;
+import org.dromara.sqlrest.common.exception.ResponseErrorCode;
+import org.dromara.sqlrest.core.dto.TopologyNodeResponse;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Resource;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/service/OverviewService.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/service/OverviewService.java

@@ -7,19 +7,19 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.service;
+package org.dromara.sqlrest.core.service;
 
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.gitee.sqlrest.common.dto.DateCount;
-import com.gitee.sqlrest.common.dto.NameCount;
-import com.gitee.sqlrest.common.dto.PageResult;
-import com.gitee.sqlrest.core.dto.ApiAccessLogBasicResponse;
-import com.gitee.sqlrest.persistence.dao.AppClientDao;
-import com.gitee.sqlrest.persistence.entity.AccessRecordEntity;
-import com.gitee.sqlrest.persistence.entity.AppClientEntity;
-import com.gitee.sqlrest.persistence.mapper.AccessRecordMapper;
-import com.gitee.sqlrest.persistence.util.PageUtils;
+import org.dromara.sqlrest.common.dto.DateCount;
+import org.dromara.sqlrest.common.dto.NameCount;
+import org.dromara.sqlrest.common.dto.PageResult;
+import org.dromara.sqlrest.core.dto.ApiAccessLogBasicResponse;
+import org.dromara.sqlrest.persistence.dao.AppClientDao;
+import org.dromara.sqlrest.persistence.entity.AccessRecordEntity;
+import org.dromara.sqlrest.persistence.entity.AppClientEntity;
+import org.dromara.sqlrest.persistence.mapper.AccessRecordMapper;
+import org.dromara.sqlrest.persistence.util.PageUtils;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/service/SystemParamService.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/service/SystemParamService.java

@@ -7,13 +7,13 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.service;
+package org.dromara.sqlrest.core.service;
 
-import com.gitee.sqlrest.common.enums.ParamTypeEnum;
-import com.gitee.sqlrest.common.exception.CommonException;
-import com.gitee.sqlrest.common.exception.ResponseErrorCode;
-import com.gitee.sqlrest.persistence.dao.SystemParamDao;
-import com.gitee.sqlrest.persistence.entity.SystemParamEntity;
+import org.dromara.sqlrest.common.enums.ParamTypeEnum;
+import org.dromara.sqlrest.common.exception.CommonException;
+import org.dromara.sqlrest.common.exception.ResponseErrorCode;
+import org.dromara.sqlrest.persistence.dao.SystemParamDao;
+import org.dromara.sqlrest.persistence.entity.SystemParamEntity;
 import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/service/SystemUserService.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/service/SystemUserService.java

@@ -7,18 +7,18 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.service;
+package org.dromara.sqlrest.core.service;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.gitee.sqlrest.common.dto.AccessToken;
-import com.gitee.sqlrest.common.exception.CommonException;
-import com.gitee.sqlrest.common.exception.ResponseErrorCode;
-import com.gitee.sqlrest.common.util.CacheUtils;
-import com.gitee.sqlrest.common.util.PasswordUtils;
-import com.gitee.sqlrest.common.util.TokenUtils;
-import com.gitee.sqlrest.core.dto.SystemUserDetailResponse;
-import com.gitee.sqlrest.persistence.dao.SystemUserDao;
-import com.gitee.sqlrest.persistence.entity.SystemUserEntity;
+import org.dromara.sqlrest.common.dto.AccessToken;
+import org.dromara.sqlrest.common.exception.CommonException;
+import org.dromara.sqlrest.common.exception.ResponseErrorCode;
+import org.dromara.sqlrest.common.util.CacheUtils;
+import org.dromara.sqlrest.common.util.PasswordUtils;
+import org.dromara.sqlrest.common.util.TokenUtils;
+import org.dromara.sqlrest.core.dto.SystemUserDetailResponse;
+import org.dromara.sqlrest.persistence.dao.SystemUserDao;
+import org.dromara.sqlrest.persistence.entity.SystemUserEntity;
 import java.util.Objects;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/servlet/ApiServletService.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/servlet/ApiServletService.java

@@ -7,15 +7,15 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.servlet;
+package org.dromara.sqlrest.core.servlet;
 
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.common.dto.ResultEntity;
-import com.gitee.sqlrest.common.enums.HttpMethodEnum;
-import com.gitee.sqlrest.core.exec.ApiExecuteService;
-import com.gitee.sqlrest.core.util.JacksonUtils;
-import com.gitee.sqlrest.persistence.dao.ApiAssignmentDao;
-import com.gitee.sqlrest.persistence.entity.ApiAssignmentEntity;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.dto.ResultEntity;
+import org.dromara.sqlrest.common.enums.HttpMethodEnum;
+import org.dromara.sqlrest.core.exec.ApiExecuteService;
+import org.dromara.sqlrest.core.util.JacksonUtils;
+import org.dromara.sqlrest.persistence.dao.ApiAssignmentDao;
+import org.dromara.sqlrest.persistence.entity.ApiAssignmentEntity;
 import java.io.IOException;
 import javax.annotation.Resource;
 import javax.servlet.ServletException;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/servlet/ApiSwaggerService.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/servlet/ApiSwaggerService.java

@@ -7,20 +7,20 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.servlet;
-
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.common.dto.BaseParam;
-import com.gitee.sqlrest.common.dto.ItemParam;
-import com.gitee.sqlrest.common.dto.OutParam;
-import com.gitee.sqlrest.common.enums.HttpMethodEnum;
-import com.gitee.sqlrest.common.enums.ParamTypeEnum;
-import com.gitee.sqlrest.persistence.dao.ApiAssignmentDao;
-import com.gitee.sqlrest.persistence.dao.ApiModuleDao;
-import com.gitee.sqlrest.persistence.dao.SystemParamDao;
-import com.gitee.sqlrest.persistence.entity.ApiAssignmentEntity;
-import com.gitee.sqlrest.persistence.entity.ApiModuleEntity;
-import com.gitee.sqlrest.persistence.entity.SystemParamEntity;
+package org.dromara.sqlrest.core.servlet;
+
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.dto.BaseParam;
+import org.dromara.sqlrest.common.dto.ItemParam;
+import org.dromara.sqlrest.common.dto.OutParam;
+import org.dromara.sqlrest.common.enums.HttpMethodEnum;
+import org.dromara.sqlrest.common.enums.ParamTypeEnum;
+import org.dromara.sqlrest.persistence.dao.ApiAssignmentDao;
+import org.dromara.sqlrest.persistence.dao.ApiModuleDao;
+import org.dromara.sqlrest.persistence.dao.SystemParamDao;
+import org.dromara.sqlrest.persistence.entity.ApiAssignmentEntity;
+import org.dromara.sqlrest.persistence.entity.ApiModuleEntity;
+import org.dromara.sqlrest.persistence.entity.SystemParamEntity;
 import com.google.common.collect.ImmutableMap;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/servlet/ClientTokenService.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/servlet/ClientTokenService.java

@@ -7,19 +7,19 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.servlet;
-
-import com.gitee.sqlrest.cache.CacheFactory;
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.common.dto.AccessToken;
-import com.gitee.sqlrest.common.enums.AliveTimeEnum;
-import com.gitee.sqlrest.common.enums.DurationTimeEnum;
-import com.gitee.sqlrest.common.exception.CommonException;
-import com.gitee.sqlrest.common.exception.ResponseErrorCode;
-import com.gitee.sqlrest.common.util.TokenUtils;
-import com.gitee.sqlrest.persistence.dao.AppClientDao;
-import com.gitee.sqlrest.persistence.entity.AppClientEntity;
-import com.gitee.sqlrest.persistence.util.JsonUtils;
+package org.dromara.sqlrest.core.servlet;
+
+import org.dromara.sqlrest.cache.CacheFactory;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.dto.AccessToken;
+import org.dromara.sqlrest.common.enums.AliveTimeEnum;
+import org.dromara.sqlrest.common.enums.DurationTimeEnum;
+import org.dromara.sqlrest.common.exception.CommonException;
+import org.dromara.sqlrest.common.exception.ResponseErrorCode;
+import org.dromara.sqlrest.common.util.TokenUtils;
+import org.dromara.sqlrest.persistence.dao.AppClientDao;
+import org.dromara.sqlrest.persistence.entity.AppClientEntity;
+import org.dromara.sqlrest.persistence.util.JsonUtils;
 import java.util.Map;
 import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/util/AlarmModelUtils.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/util/AlarmModelUtils.java

@@ -7,11 +7,11 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.util;
+package org.dromara.sqlrest.core.util;
 
 import cn.hutool.core.date.DateUtil;
-import com.gitee.sqlrest.persistence.entity.AccessRecordEntity;
-import com.gitee.sqlrest.persistence.entity.ApiAssignmentEntity;
+import org.dromara.sqlrest.persistence.entity.AccessRecordEntity;
+import org.dromara.sqlrest.persistence.entity.ApiAssignmentEntity;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/util/ApiPathUtils.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/util/ApiPathUtils.java

@@ -7,9 +7,9 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.util;
+package org.dromara.sqlrest.core.util;
 
-import com.gitee.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.consts.Constants;
 import lombok.experimental.UtilityClass;
 
 @UtilityClass

sqlrest-core/src/main/java/com/gitee/sqlrest/core/util/ConvertUtils.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/util/ConvertUtils.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.util;
+package org.dromara.sqlrest.core.util;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/util/DataSourceUtils.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/util/DataSourceUtils.java

@@ -7,13 +7,13 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.util;
+package org.dromara.sqlrest.core.util;
 
 import cn.hutool.core.util.ClassLoaderUtil;
-import com.gitee.sqlrest.common.enums.ProductTypeEnum;
-import com.gitee.sqlrest.common.model.JarFileClassLoader;
-import com.gitee.sqlrest.common.model.SimpleDataSource;
-import com.gitee.sqlrest.persistence.entity.DataSourceEntity;
+import org.dromara.sqlrest.common.enums.ProductTypeEnum;
+import org.dromara.sqlrest.common.model.JarFileClassLoader;
+import org.dromara.sqlrest.common.model.SimpleDataSource;
+import org.dromara.sqlrest.persistence.entity.DataSourceEntity;
 import com.zaxxer.hikari.HikariDataSource;
 import java.net.URLClassLoader;
 import java.sql.Connection;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/util/JacksonUtils.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/util/JacksonUtils.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.util;
+package org.dromara.sqlrest.core.util;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.MapperFeature;
@@ -15,11 +15,11 @@ import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import com.gitee.sqlrest.common.dto.OutParam;
-import com.gitee.sqlrest.common.enums.DataTypeFormatEnum;
-import com.gitee.sqlrest.common.enums.ParamTypeEnum;
-import com.gitee.sqlrest.common.util.UuidUtils;
-import com.gitee.sqlrest.core.serdes.DateTimeSerDesFactory;
+import org.dromara.sqlrest.common.dto.OutParam;
+import org.dromara.sqlrest.common.enums.DataTypeFormatEnum;
+import org.dromara.sqlrest.common.enums.ParamTypeEnum;
+import org.dromara.sqlrest.common.util.UuidUtils;
+import org.dromara.sqlrest.core.serdes.DateTimeSerDesFactory;
 import com.google.common.collect.Lists;
 import java.math.BigInteger;
 import java.sql.Time;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/util/PageSizeUtils.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/util/PageSizeUtils.java

@@ -7,10 +7,10 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.util;
+package org.dromara.sqlrest.core.util;
 
 import cn.hutool.core.util.NumberUtil;
-import com.gitee.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.consts.Constants;
 import java.util.Map;
 import lombok.experimental.UtilityClass;
 

sqlrest-core/src/main/java/com/gitee/sqlrest/core/util/ServletUtils.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/util/ServletUtils.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.util;
+package org.dromara.sqlrest.core.util;
 
 import javax.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/util/SpelUtils.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/util/SpelUtils.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.util;
+package org.dromara.sqlrest.core.util;
 
 import java.util.Map;
 import lombok.extern.slf4j.Slf4j;

sqlrest-core/src/main/java/com/gitee/sqlrest/core/util/SqlJdbcUtils.java → sqlrest-core/src/main/java/org/dromara/sqlrest/core/util/SqlJdbcUtils.java

@@ -7,13 +7,13 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core.util;
+package org.dromara.sqlrest.core.util;
 
-import com.gitee.sqlrest.common.enums.NamingStrategyEnum;
-import com.gitee.sqlrest.common.enums.ProductTypeEnum;
-import com.gitee.sqlrest.common.util.LambdaUtils;
-import com.gitee.sqlrest.core.exec.SqlExecuteLogger;
-import com.gitee.sqlrest.template.SqlMeta;
+import org.dromara.sqlrest.common.enums.NamingStrategyEnum;
+import org.dromara.sqlrest.common.enums.ProductTypeEnum;
+import org.dromara.sqlrest.common.util.LambdaUtils;
+import org.dromara.sqlrest.core.exec.SqlExecuteLogger;
+import org.dromara.sqlrest.template.SqlMeta;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;

sqlrest-core/src/test/java/com/gitee/sqlrest/core/JacksonUtilsTest.java → sqlrest-core/src/test/java/org/dromara/sqlrest/core/JacksonUtilsTest.java

@@ -7,12 +7,12 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.core;
+package org.dromara.sqlrest.core;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.gitee.sqlrest.core.util.JacksonUtils;
+import org.dromara.sqlrest.core.util.JacksonUtils;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;

sqlrest-dist/pom.xml

@@ -4,8 +4,8 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>sqlrest-parent</artifactId>
-    <groupId>com.gitee.sqlrest</groupId>
-    <version>1.4.0</version>
+    <groupId>org.dromara.sqlrest</groupId>
+    <version>1.5.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>sqlrest-dist</artifactId>

sqlrest-dist/src/main/assembly/bin/executor_startup.cmd

@@ -8,7 +8,7 @@ setlocal enabledelayedexpansion
 cls
 
 ::需要启动的Java类
-set APP_MAINCLASS=com.gitee.sqlrest.executor.ExecutorApplication
+set APP_MAINCLASS=org.dromara.sqlrest.executor.ExecutorApplication
 
 ::Java应用根目录
 set APP_HOME=%~dp0

sqlrest-dist/src/main/assembly/bin/gateway_startup.cmd

@@ -8,7 +8,7 @@ setlocal enabledelayedexpansion
 cls
 
 ::需要启动的Java类
-set APP_MAINCLASS=com.gitee.sqlrest.gateway.GatewayApplication
+set APP_MAINCLASS=org.dromara.sqlrest.gateway.GatewayApplication
 
 ::Java应用根目录
 set APP_HOME=%~dp0

sqlrest-dist/src/main/assembly/bin/manager_startup.cmd

@@ -8,7 +8,7 @@ setlocal enabledelayedexpansion
 cls
 
 ::需要启动的Java类
-set APP_MAINCLASS=com.gitee.sqlrest.manager.ManagerApplication
+set APP_MAINCLASS=org.dromara.sqlrest.manager.ManagerApplication
 
 ::Java应用根目录
 set APP_HOME=%~dp0

sqlrest-dist/src/main/assembly/bin/sqlrestctl.sh

@@ -62,16 +62,16 @@ fi
 
 # 配置classpath和启动类
 CLASSPATH=$APP_CONF_PATH
-APP_MAIN_CLASS='com.gitee.sqlrest.manager.ManagerApplication'
+APP_MAIN_CLASS='org.dromara.sqlrest.manager.ManagerApplication'
 if [ "$module" == "manager" ]; then
   CLASSPATH="$APP_CONF_PATH/manager:$APP_LIB_COMMON_PATH/*:$APP_HOME/lib/webmvc/*:$APP_HOME/lib/manager/*"
-  APP_MAIN_CLASS='com.gitee.sqlrest.manager.ManagerApplication'
+  APP_MAIN_CLASS='org.dromara.sqlrest.manager.ManagerApplication'
 elif [ "$module" == "executor" ]; then
   CLASSPATH="$APP_CONF_PATH/executor:$APP_LIB_COMMON_PATH/*:$APP_HOME/lib/webmvc/*:$APP_HOME/lib/executor/*"
-  APP_MAIN_CLASS='com.gitee.sqlrest.executor.ExecutorApplication'
+  APP_MAIN_CLASS='org.dromara.sqlrest.executor.ExecutorApplication'
 elif [ "$module" == "gateway" ]; then
   CLASSPATH="$APP_CONF_PATH/gateway:$APP_LIB_COMMON_PATH/*:$APP_HOME/lib/webflux/*:$APP_HOME/lib/gateway/*"
-  APP_MAIN_CLASS='com.gitee.sqlrest.gateway.GatewayApplication'
+  APP_MAIN_CLASS='org.dromara.sqlrest.gateway.GatewayApplication'
 else
   echo "Error: No module named '$module' was found."
   exit 1

sqlrest-dist/src/main/assembly/package.xml

@@ -14,7 +14,7 @@
       <outputDirectory>lib</outputDirectory>
       <excludes>
         <!--  排除sqlrest-dist自身打的jar包-->
-        <exclude>com.gitee.sqlrest:sqlrest-dist</exclude>
+        <exclude>org.dromara.sqlrest:sqlrest-dist</exclude>
       </excludes>
     </dependencySet>
   </dependencySets>

sqlrest-executor/pom.xml

@@ -4,8 +4,8 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>sqlrest-parent</artifactId>
-    <groupId>com.gitee.sqlrest</groupId>
-    <version>1.4.0</version>
+    <groupId>org.dromara.sqlrest</groupId>
+    <version>1.5.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>sqlrest-executor</artifactId>
@@ -13,7 +13,7 @@
   <dependencies>
 
     <dependency>
-      <groupId>com.gitee.sqlrest</groupId>
+      <groupId>org.dromara.sqlrest</groupId>
       <artifactId>sqlrest-core</artifactId>
       <version>${project.version}</version>
     </dependency>

sqlrest-executor/src/main/java/com/gitee/sqlrest/executor/ExecutorApplication.java → sqlrest-executor/src/main/java/org/dromara/sqlrest/executor/ExecutorApplication.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.executor;
+package org.dromara.sqlrest.executor;
 
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
@@ -18,17 +18,17 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
 @Slf4j
 @EnableDiscoveryClient
-@MapperScan("com.gitee.sqlrest.persistence.mapper")
+@MapperScan("org.dromara.sqlrest.persistence.mapper")
 @SpringBootApplication(
     scanBasePackages = {
-        "com.gitee.sqlrest.persistence",
-        "com.gitee.sqlrest.core.filter",
-        "com.gitee.sqlrest.core.driver",
-        "com.gitee.sqlrest.core.servlet",
-        "com.gitee.sqlrest.core.exec",
-        "com.gitee.sqlrest.core.executor",
-        "com.gitee.sqlrest.cache",
-        "com.gitee.sqlrest.executor",
+        "org.dromara.sqlrest.persistence",
+        "org.dromara.sqlrest.core.filter",
+        "org.dromara.sqlrest.core.driver",
+        "org.dromara.sqlrest.core.servlet",
+        "org.dromara.sqlrest.core.exec",
+        "org.dromara.sqlrest.core.executor",
+        "org.dromara.sqlrest.cache",
+        "org.dromara.sqlrest.executor",
     }
 )
 public class ExecutorApplication {

sqlrest-executor/src/main/java/com/gitee/sqlrest/executor/config/ExecutorCrossConfig.java → sqlrest-executor/src/main/java/org/dromara/sqlrest/executor/config/ExecutorCrossConfig.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.executor.config;
+package org.dromara.sqlrest.executor.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;

sqlrest-executor/src/main/java/com/gitee/sqlrest/executor/config/ExecutorServletConfig.java → sqlrest-executor/src/main/java/org/dromara/sqlrest/executor/config/ExecutorServletConfig.java

@@ -7,12 +7,12 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.executor.config;
+package org.dromara.sqlrest.executor.config;
 
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.core.filter.AuthenticationFilter;
-import com.gitee.sqlrest.core.servlet.ApiServletService;
-import com.gitee.sqlrest.executor.model.HttpApiServlet;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.core.filter.AuthenticationFilter;
+import org.dromara.sqlrest.core.servlet.ApiServletService;
+import org.dromara.sqlrest.executor.model.HttpApiServlet;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServlet;
 import lombok.extern.slf4j.Slf4j;

sqlrest-executor/src/main/java/com/gitee/sqlrest/executor/config/ExecutorWebConfig.java → sqlrest-executor/src/main/java/org/dromara/sqlrest/executor/config/ExecutorWebConfig.java

@@ -7,11 +7,11 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.executor.config;
+package org.dromara.sqlrest.executor.config;
 
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.executor.interceptor.ExecutorInterceptor;
-import com.gitee.sqlrest.persistence.dao.SystemParamDao;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.executor.interceptor.ExecutorInterceptor;
+import org.dromara.sqlrest.persistence.dao.SystemParamDao;
 import javax.annotation.Resource;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;

sqlrest-executor/src/main/java/com/gitee/sqlrest/executor/controller/ApiSwaggerController.java → sqlrest-executor/src/main/java/org/dromara/sqlrest/executor/controller/ApiSwaggerController.java

@@ -7,10 +7,10 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.executor.controller;
+package org.dromara.sqlrest.executor.controller;
 
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.core.servlet.ApiSwaggerService;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.core.servlet.ApiSwaggerService;
 import io.swagger.annotations.Api;
 import io.swagger.v3.oas.models.OpenAPI;
 import javax.annotation.Resource;

sqlrest-executor/src/main/java/com/gitee/sqlrest/executor/controller/ClientTokenController.java → sqlrest-executor/src/main/java/org/dromara/sqlrest/executor/controller/ClientTokenController.java

@@ -7,12 +7,12 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.executor.controller;
+package org.dromara.sqlrest.executor.controller;
 
-import com.gitee.sqlrest.common.dto.AccessToken;
-import com.gitee.sqlrest.common.dto.ResultEntity;
-import com.gitee.sqlrest.common.exception.CommonException;
-import com.gitee.sqlrest.core.servlet.ClientTokenService;
+import org.dromara.sqlrest.common.dto.AccessToken;
+import org.dromara.sqlrest.common.dto.ResultEntity;
+import org.dromara.sqlrest.common.exception.CommonException;
+import org.dromara.sqlrest.core.servlet.ClientTokenService;
 import java.util.Map;
 import javax.annotation.Resource;
 import org.springframework.http.MediaType;

sqlrest-executor/src/main/java/com/gitee/sqlrest/executor/flowcontrol/SentinelFlowControlManager.java → sqlrest-executor/src/main/java/org/dromara/sqlrest/executor/flowcontrol/SentinelFlowControlManager.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.executor.flowcontrol;
+package org.dromara.sqlrest.executor.flowcontrol;
 
 import cn.hutool.json.JSONUtil;
 import com.alibaba.csp.sentinel.Entry;
@@ -17,13 +17,13 @@ import com.alibaba.csp.sentinel.slots.block.BlockException;
 import com.alibaba.csp.sentinel.slots.block.RuleConstant;
 import com.alibaba.csp.sentinel.slots.block.flow.FlowRule;
 import com.alibaba.csp.sentinel.slots.block.flow.FlowRuleManager;
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.common.dto.ResultEntity;
-import com.gitee.sqlrest.common.enums.HttpMethodEnum;
-import com.gitee.sqlrest.common.exception.ResponseErrorCode;
-import com.gitee.sqlrest.core.filter.FlowControlManger;
-import com.gitee.sqlrest.persistence.dao.ApiAssignmentDao;
-import com.gitee.sqlrest.persistence.entity.ApiAssignmentEntity;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.dto.ResultEntity;
+import org.dromara.sqlrest.common.enums.HttpMethodEnum;
+import org.dromara.sqlrest.common.exception.ResponseErrorCode;
+import org.dromara.sqlrest.core.filter.FlowControlManger;
+import org.dromara.sqlrest.persistence.dao.ApiAssignmentDao;
+import org.dromara.sqlrest.persistence.entity.ApiAssignmentEntity;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;

sqlrest-executor/src/main/java/com/gitee/sqlrest/executor/interceptor/ExecutorInterceptor.java → sqlrest-executor/src/main/java/org/dromara/sqlrest/executor/interceptor/ExecutorInterceptor.java

@@ -7,11 +7,11 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.executor.interceptor;
+package org.dromara.sqlrest.executor.interceptor;
 
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.persistence.dao.SystemParamDao;
-import com.gitee.sqlrest.persistence.entity.SystemParamEntity;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.persistence.dao.SystemParamDao;
+import org.dromara.sqlrest.persistence.entity.SystemParamEntity;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.web.servlet.HandlerInterceptor;

sqlrest-executor/src/main/java/com/gitee/sqlrest/executor/model/HttpApiServlet.java → sqlrest-executor/src/main/java/org/dromara/sqlrest/executor/model/HttpApiServlet.java

@@ -7,10 +7,10 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.executor.model;
+package org.dromara.sqlrest.executor.model;
 
-import com.gitee.sqlrest.common.enums.HttpMethodEnum;
-import com.gitee.sqlrest.core.servlet.ApiServletService;
+import org.dromara.sqlrest.common.enums.HttpMethodEnum;
+import org.dromara.sqlrest.core.servlet.ApiServletService;
 import java.io.IOException;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;

sqlrest-gateway/pom.xml

@@ -4,8 +4,8 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>sqlrest-parent</artifactId>
-    <groupId>com.gitee.sqlrest</groupId>
-    <version>1.4.0</version>
+    <groupId>org.dromara.sqlrest</groupId>
+    <version>1.5.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>sqlrest-gateway</artifactId>
@@ -13,7 +13,7 @@
   <dependencies>
 
     <dependency>
-      <groupId>com.gitee.sqlrest</groupId>
+      <groupId>org.dromara.sqlrest</groupId>
       <artifactId>sqlrest-core</artifactId>
       <version>${project.version}</version>
     </dependency>

sqlrest-gateway/src/main/java/com/gitee/sqlrest/gateway/GatewayApplication.java → sqlrest-gateway/src/main/java/org/dromara/sqlrest/gateway/GatewayApplication.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.gateway;
+package org.dromara.sqlrest.gateway;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.Banner;
@@ -16,12 +16,12 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
 @EnableDiscoveryClient
-@MapperScan("com.gitee.sqlrest.persistence.mapper")
+@MapperScan("org.dromara.sqlrest.persistence.mapper")
 @SpringBootApplication(
     scanBasePackages = {
-        "com.gitee.sqlrest.persistence",
-        "com.gitee.sqlrest.core.gateway",
-        "com.gitee.sqlrest.gateway",
+        "org.dromara.sqlrest.persistence",
+        "org.dromara.sqlrest.core.gateway",
+        "org.dromara.sqlrest.gateway",
     }
 )
 public class GatewayApplication {

sqlrest-gateway/src/main/java/com/gitee/sqlrest/gateway/filter/ClientAddressFilter.java → sqlrest-gateway/src/main/java/org/dromara/sqlrest/gateway/filter/ClientAddressFilter.java

@@ -7,12 +7,12 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.gateway.filter;
+package org.dromara.sqlrest.gateway.filter;
 
 import cn.hutool.json.JSONUtil;
-import com.gitee.sqlrest.common.exception.ResponseErrorCode;
-import com.gitee.sqlrest.core.gateway.FirewallFilterService;
-import com.gitee.sqlrest.common.dto.ResultEntity;
+import org.dromara.sqlrest.common.exception.ResponseErrorCode;
+import org.dromara.sqlrest.core.gateway.FirewallFilterService;
+import org.dromara.sqlrest.common.dto.ResultEntity;
 import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.context.event.ApplicationReadyEvent;

sqlrest-manager/pom.xml

@@ -4,8 +4,8 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>sqlrest-parent</artifactId>
-    <groupId>com.gitee.sqlrest</groupId>
-    <version>1.4.0</version>
+    <groupId>org.dromara.sqlrest</groupId>
+    <version>1.5.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>sqlrest-manager</artifactId>
@@ -13,13 +13,13 @@
   <dependencies>
 
     <dependency>
-      <groupId>com.gitee.sqlrest</groupId>
+      <groupId>org.dromara.sqlrest</groupId>
       <artifactId>sqlrest-core</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>com.gitee.sqlrest</groupId>
+      <groupId>org.dromara.sqlrest</groupId>
       <artifactId>sqlrest-mcp-springmvc</artifactId>
       <version>${project.version}</version>
     </dependency>

sqlrest-manager/src/main/java/com/gitee/sqlrest/manager/ManagerApplication.java → sqlrest-manager/src/main/java/org/dromara/sqlrest/manager/ManagerApplication.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.manager;
+package org.dromara.sqlrest.manager;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.Banner;
@@ -18,17 +18,17 @@ import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
 
 @EnableEurekaServer
 @EnableDiscoveryClient
-@MapperScan("com.gitee.sqlrest.persistence.mapper")
+@MapperScan("org.dromara.sqlrest.persistence.mapper")
 @SpringBootApplication(
     scanBasePackages = {
-        "com.gitee.sqlrest.persistence",
-        "com.gitee.sqlrest.core.driver",
-        "com.gitee.sqlrest.core.gateway",
-        "com.gitee.sqlrest.core.executor",
-        "com.gitee.sqlrest.core.service",
-        "com.gitee.sqlrest.core.exec",
-        "com.gitee.sqlrest.cache",
-        "com.gitee.sqlrest.manager"
+        "org.dromara.sqlrest.persistence",
+        "org.dromara.sqlrest.core.driver",
+        "org.dromara.sqlrest.core.gateway",
+        "org.dromara.sqlrest.core.executor",
+        "org.dromara.sqlrest.core.service",
+        "org.dromara.sqlrest.core.exec",
+        "org.dromara.sqlrest.cache",
+        "org.dromara.sqlrest.manager"
     }
 )
 public class ManagerApplication {

sqlrest-manager/src/main/java/com/gitee/sqlrest/manager/config/AuthenticationConfiguration.java → sqlrest-manager/src/main/java/org/dromara/sqlrest/manager/config/AuthenticationConfiguration.java

@@ -7,15 +7,15 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.manager.config;
+package org.dromara.sqlrest.manager.config;
 
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.common.exception.CommonException;
-import com.gitee.sqlrest.common.exception.ResponseErrorCode;
-import com.gitee.sqlrest.common.util.CacheUtils;
-import com.gitee.sqlrest.common.util.TokenUtils;
-import com.gitee.sqlrest.persistence.dao.SystemUserDao;
-import com.gitee.sqlrest.persistence.entity.SystemUserEntity;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.exception.CommonException;
+import org.dromara.sqlrest.common.exception.ResponseErrorCode;
+import org.dromara.sqlrest.common.util.CacheUtils;
+import org.dromara.sqlrest.common.util.TokenUtils;
+import org.dromara.sqlrest.persistence.dao.SystemUserDao;
+import org.dromara.sqlrest.persistence.entity.SystemUserEntity;
 import java.util.Arrays;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;

sqlrest-manager/src/main/java/com/gitee/sqlrest/manager/config/ManagerCorsConfiguration.java → sqlrest-manager/src/main/java/org/dromara/sqlrest/manager/config/ManagerCorsConfiguration.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.manager.config;
+package org.dromara.sqlrest.manager.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;

sqlrest-manager/src/main/java/com/gitee/sqlrest/manager/config/ManagerWebConfiguration.java → sqlrest-manager/src/main/java/org/dromara/sqlrest/manager/config/ManagerWebConfiguration.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.manager.config;
+package org.dromara.sqlrest.manager.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;

sqlrest-manager/src/main/java/com/gitee/sqlrest/manager/config/McpServerConfiguration.java → sqlrest-manager/src/main/java/org/dromara/sqlrest/manager/config/McpServerConfiguration.java

@@ -7,13 +7,13 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.manager.config;
+package org.dromara.sqlrest.manager.config;
 
 import cn.hutool.extra.spring.SpringUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.common.util.PomVersionUtils;
-import com.gitee.sqlrest.persistence.dao.McpClientDao;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.util.PomVersionUtils;
+import org.dromara.sqlrest.persistence.dao.McpClientDao;
 import io.modelcontextprotocol.server.McpServer;
 import io.modelcontextprotocol.server.McpSyncServer;
 import io.modelcontextprotocol.server.transport.WebMvcSseServerAuthChecker;

sqlrest-manager/src/main/java/com/gitee/sqlrest/manager/config/SchedulingConfiguration.java → sqlrest-manager/src/main/java/org/dromara/sqlrest/manager/config/SchedulingConfiguration.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.manager.config;
+package org.dromara.sqlrest.manager.config;
 
 import java.util.concurrent.ThreadPoolExecutor;
 import org.springframework.context.annotation.Bean;

sqlrest-manager/src/main/java/com/gitee/sqlrest/manager/config/SwaggerConfiguration.java → sqlrest-manager/src/main/java/org/dromara/sqlrest/manager/config/SwaggerConfiguration.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.manager.config;
+package org.dromara.sqlrest.manager.config;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,7 +30,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @EnableSwagger2
 public class SwaggerConfiguration {
 
-  private static final String API_CONTROLLER_PACKAGE = "com.gitee.sqlrest.manager.controller";
+  private static final String API_CONTROLLER_PACKAGE = "org.dromara.sqlrest.manager.controller";
 
   @Value("${sqlrest.manager.swagger.enable:true}")
   private boolean enable;

sqlrest-manager/src/main/java/com/gitee/sqlrest/manager/controller/AliveHealthController.java → sqlrest-manager/src/main/java/org/dromara/sqlrest/manager/controller/AliveHealthController.java

@@ -7,11 +7,11 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.manager.controller;
+package org.dromara.sqlrest.manager.controller;
 
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.common.dto.ResultEntity;
-import com.gitee.sqlrest.common.util.PomVersionUtils;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.dto.ResultEntity;
+import org.dromara.sqlrest.common.util.PomVersionUtils;
 import io.swagger.annotations.Api;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;

sqlrest-manager/src/main/java/com/gitee/sqlrest/manager/controller/ApiAssignmentController.java → sqlrest-manager/src/main/java/org/dromara/sqlrest/manager/controller/ApiAssignmentController.java

@@ -7,20 +7,20 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.manager.controller;
-
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.common.dto.PageResult;
-import com.gitee.sqlrest.common.dto.ResultEntity;
-import com.gitee.sqlrest.common.enums.DataTypeFormatEnum;
-import com.gitee.sqlrest.common.enums.NamingStrategyEnum;
-import com.gitee.sqlrest.core.dto.ApiAssignmentBaseResponse;
-import com.gitee.sqlrest.core.dto.ApiAssignmentSaveRequest;
-import com.gitee.sqlrest.core.dto.ApiDebugExecuteRequest;
-import com.gitee.sqlrest.core.dto.AssignmentSearchRequest;
-import com.gitee.sqlrest.core.dto.NameValueBaseResponse;
-import com.gitee.sqlrest.core.dto.NameValueRemarkResponse;
-import com.gitee.sqlrest.core.service.ApiAssignmentService;
+package org.dromara.sqlrest.manager.controller;
+
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.dto.PageResult;
+import org.dromara.sqlrest.common.dto.ResultEntity;
+import org.dromara.sqlrest.common.enums.DataTypeFormatEnum;
+import org.dromara.sqlrest.common.enums.NamingStrategyEnum;
+import org.dromara.sqlrest.core.dto.ApiAssignmentBaseResponse;
+import org.dromara.sqlrest.core.dto.ApiAssignmentSaveRequest;
+import org.dromara.sqlrest.core.dto.ApiDebugExecuteRequest;
+import org.dromara.sqlrest.core.dto.AssignmentSearchRequest;
+import org.dromara.sqlrest.core.dto.NameValueBaseResponse;
+import org.dromara.sqlrest.core.dto.NameValueRemarkResponse;
+import org.dromara.sqlrest.core.service.ApiAssignmentService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import java.io.IOException;

sqlrest-manager/src/main/java/com/gitee/sqlrest/manager/controller/ApiGroupController.java → sqlrest-manager/src/main/java/org/dromara/sqlrest/manager/controller/ApiGroupController.java

@@ -7,14 +7,14 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.manager.controller;
+package org.dromara.sqlrest.manager.controller;
 
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.common.dto.PageResult;
-import com.gitee.sqlrest.common.dto.ResultEntity;
-import com.gitee.sqlrest.core.dto.EntitySearchRequest;
-import com.gitee.sqlrest.core.service.ApiGroupService;
-import com.gitee.sqlrest.persistence.entity.ApiGroupEntity;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.dto.PageResult;
+import org.dromara.sqlrest.common.dto.ResultEntity;
+import org.dromara.sqlrest.core.dto.EntitySearchRequest;
+import org.dromara.sqlrest.core.service.ApiGroupService;
+import org.dromara.sqlrest.persistence.entity.ApiGroupEntity;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import javax.annotation.Resource;

sqlrest-manager/src/main/java/com/gitee/sqlrest/manager/controller/ApiModuleController.java → sqlrest-manager/src/main/java/org/dromara/sqlrest/manager/controller/ApiModuleController.java

@@ -7,18 +7,16 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.manager.controller;
+package org.dromara.sqlrest.manager.controller;
 
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.common.dto.PageResult;
-import com.gitee.sqlrest.common.dto.ResultEntity;
-import com.gitee.sqlrest.core.dto.ApiModuleAssignments;
-import com.gitee.sqlrest.core.dto.EntitySearchRequest;
-import com.gitee.sqlrest.core.service.ApiModuleService;
-import com.gitee.sqlrest.persistence.entity.ApiModuleEntity;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.dto.PageResult;
+import org.dromara.sqlrest.common.dto.ResultEntity;
+import org.dromara.sqlrest.core.dto.EntitySearchRequest;
+import org.dromara.sqlrest.core.service.ApiModuleService;
+import org.dromara.sqlrest.persistence.entity.ApiModuleEntity;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import java.util.List;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;

sqlrest-manager/src/main/java/com/gitee/sqlrest/manager/controller/AppClientController.java → sqlrest-manager/src/main/java/org/dromara/sqlrest/manager/controller/AppClientController.java

@@ -7,17 +7,17 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.manager.controller;
+package org.dromara.sqlrest.manager.controller;
 
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.common.dto.PageResult;
-import com.gitee.sqlrest.common.dto.ResultEntity;
-import com.gitee.sqlrest.core.dto.AppClientDetailResponse;
-import com.gitee.sqlrest.core.dto.AppClientGroupRequest;
-import com.gitee.sqlrest.core.dto.AppClientSaveRequest;
-import com.gitee.sqlrest.core.dto.AppClientSearchRequest;
-import com.gitee.sqlrest.core.dto.EntityIdNameResponse;
-import com.gitee.sqlrest.core.service.AppClientService;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.dto.PageResult;
+import org.dromara.sqlrest.common.dto.ResultEntity;
+import org.dromara.sqlrest.core.dto.AppClientDetailResponse;
+import org.dromara.sqlrest.core.dto.AppClientGroupRequest;
+import org.dromara.sqlrest.core.dto.AppClientSaveRequest;
+import org.dromara.sqlrest.core.dto.AppClientSearchRequest;
+import org.dromara.sqlrest.core.dto.EntityIdNameResponse;
+import org.dromara.sqlrest.core.service.AppClientService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import java.util.List;

sqlrest-manager/src/main/java/com/gitee/sqlrest/manager/controller/AuthenticationController.java → sqlrest-manager/src/main/java/org/dromara/sqlrest/manager/controller/AuthenticationController.java

@@ -7,11 +7,11 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.manager.controller;
+package org.dromara.sqlrest.manager.controller;
 
-import com.gitee.sqlrest.common.dto.ResultEntity;
-import com.gitee.sqlrest.core.dto.UserLoginRequest;
-import com.gitee.sqlrest.core.service.SystemUserService;
+import org.dromara.sqlrest.common.dto.ResultEntity;
+import org.dromara.sqlrest.core.dto.UserLoginRequest;
+import org.dromara.sqlrest.core.service.SystemUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

sqlrest-manager/src/main/java/com/gitee/sqlrest/manager/controller/DataSourceController.java → sqlrest-manager/src/main/java/org/dromara/sqlrest/manager/controller/DataSourceController.java

@@ -7,19 +7,19 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.manager.controller;
-
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.common.dto.PageResult;
-import com.gitee.sqlrest.common.dto.ResultEntity;
-import com.gitee.sqlrest.common.enums.ProductTypeEnum;
-import com.gitee.sqlrest.core.driver.DriverLoadService;
-import com.gitee.sqlrest.core.dto.DataSourceBaseRequest;
-import com.gitee.sqlrest.core.dto.DataSourceSaveRequest;
-import com.gitee.sqlrest.core.dto.DatasourceDetailResponse;
-import com.gitee.sqlrest.core.dto.EntityIdNameResponse;
-import com.gitee.sqlrest.core.dto.EntitySearchRequest;
-import com.gitee.sqlrest.core.service.DataSourceService;
+package org.dromara.sqlrest.manager.controller;
+
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.dto.PageResult;
+import org.dromara.sqlrest.common.dto.ResultEntity;
+import org.dromara.sqlrest.common.enums.ProductTypeEnum;
+import org.dromara.sqlrest.core.driver.DriverLoadService;
+import org.dromara.sqlrest.core.dto.DataSourceBaseRequest;
+import org.dromara.sqlrest.core.dto.DataSourceSaveRequest;
+import org.dromara.sqlrest.core.dto.DatasourceDetailResponse;
+import org.dromara.sqlrest.core.dto.EntityIdNameResponse;
+import org.dromara.sqlrest.core.dto.EntitySearchRequest;
+import org.dromara.sqlrest.core.service.DataSourceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import javax.annotation.Resource;

sqlrest-manager/src/main/java/com/gitee/sqlrest/manager/controller/FirewallController.java → sqlrest-manager/src/main/java/org/dromara/sqlrest/manager/controller/FirewallController.java

@@ -7,13 +7,13 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.manager.controller;
+package org.dromara.sqlrest.manager.controller;
 
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.common.dto.ResultEntity;
-import com.gitee.sqlrest.core.dto.UpdateFirewallRulesRequest;
-import com.gitee.sqlrest.core.gateway.FirewallFilterService;
-import com.gitee.sqlrest.persistence.entity.FirewallRulesEntity;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.dto.ResultEntity;
+import org.dromara.sqlrest.core.dto.UpdateFirewallRulesRequest;
+import org.dromara.sqlrest.core.gateway.FirewallFilterService;
+import org.dromara.sqlrest.persistence.entity.FirewallRulesEntity;
 import io.swagger.annotations.Api;
 import javax.annotation.Resource;
 import org.springframework.http.MediaType;

sqlrest-manager/src/main/java/com/gitee/sqlrest/manager/controller/McpClientController.java → sqlrest-manager/src/main/java/org/dromara/sqlrest/manager/controller/McpClientController.java

@@ -7,14 +7,14 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.manager.controller;
+package org.dromara.sqlrest.manager.controller;
 
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.common.dto.PageResult;
-import com.gitee.sqlrest.common.dto.ResultEntity;
-import com.gitee.sqlrest.core.dto.EntitySearchRequest;
-import com.gitee.sqlrest.manager.service.McpManageService;
-import com.gitee.sqlrest.persistence.entity.McpClientEntity;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.dto.PageResult;
+import org.dromara.sqlrest.common.dto.ResultEntity;
+import org.dromara.sqlrest.core.dto.EntitySearchRequest;
+import org.dromara.sqlrest.manager.service.McpManageService;
+import org.dromara.sqlrest.persistence.entity.McpClientEntity;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import javax.annotation.Resource;

sqlrest-manager/src/main/java/com/gitee/sqlrest/manager/controller/McpToolController.java → sqlrest-manager/src/main/java/org/dromara/sqlrest/manager/controller/McpToolController.java

@@ -7,15 +7,15 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.manager.controller;
+package org.dromara.sqlrest.manager.controller;
 
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.common.dto.PageResult;
-import com.gitee.sqlrest.common.dto.ResultEntity;
-import com.gitee.sqlrest.core.dto.EntitySearchRequest;
-import com.gitee.sqlrest.core.dto.McpToolResponse;
-import com.gitee.sqlrest.core.dto.McpToolSaveRequest;
-import com.gitee.sqlrest.manager.service.McpManageService;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.dto.PageResult;
+import org.dromara.sqlrest.common.dto.ResultEntity;
+import org.dromara.sqlrest.core.dto.EntitySearchRequest;
+import org.dromara.sqlrest.core.dto.McpToolResponse;
+import org.dromara.sqlrest.core.dto.McpToolSaveRequest;
+import org.dromara.sqlrest.manager.service.McpManageService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import javax.annotation.Resource;

sqlrest-manager/src/main/java/com/gitee/sqlrest/manager/controller/NodeController.java → sqlrest-manager/src/main/java/org/dromara/sqlrest/manager/controller/NodeController.java

@@ -7,12 +7,12 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.manager.controller;
+package org.dromara.sqlrest.manager.controller;
 
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.common.dto.ResultEntity;
-import com.gitee.sqlrest.core.dto.TopologyNodeResponse;
-import com.gitee.sqlrest.core.service.NodeService;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.dto.ResultEntity;
+import org.dromara.sqlrest.core.dto.TopologyNodeResponse;
+import org.dromara.sqlrest.core.service.NodeService;
 import io.swagger.annotations.Api;
 import javax.annotation.Resource;
 import org.springframework.http.MediaType;

sqlrest-manager/src/main/java/com/gitee/sqlrest/manager/controller/OverviewController.java → sqlrest-manager/src/main/java/org/dromara/sqlrest/manager/controller/OverviewController.java

@@ -7,15 +7,15 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.manager.controller;
+package org.dromara.sqlrest.manager.controller;
 
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.common.dto.DateCount;
-import com.gitee.sqlrest.common.dto.NameCount;
-import com.gitee.sqlrest.common.dto.PageResult;
-import com.gitee.sqlrest.common.dto.ResultEntity;
-import com.gitee.sqlrest.core.dto.ApiAccessLogBasicResponse;
-import com.gitee.sqlrest.core.service.OverviewService;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.dto.DateCount;
+import org.dromara.sqlrest.common.dto.NameCount;
+import org.dromara.sqlrest.common.dto.PageResult;
+import org.dromara.sqlrest.common.dto.ResultEntity;
+import org.dromara.sqlrest.core.dto.ApiAccessLogBasicResponse;
+import org.dromara.sqlrest.core.service.OverviewService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import java.util.List;

sqlrest-manager/src/main/java/com/gitee/sqlrest/manager/controller/SystemParamController.java → sqlrest-manager/src/main/java/org/dromara/sqlrest/manager/controller/SystemParamController.java

@@ -7,11 +7,11 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.manager.controller;
+package org.dromara.sqlrest.manager.controller;
 
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.common.dto.ResultEntity;
-import com.gitee.sqlrest.core.service.SystemParamService;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.dto.ResultEntity;
+import org.dromara.sqlrest.core.service.SystemParamService;
 import io.swagger.annotations.Api;
 import javax.annotation.Resource;
 import org.springframework.http.MediaType;

sqlrest-manager/src/main/java/com/gitee/sqlrest/manager/controller/SystemUserController.java → sqlrest-manager/src/main/java/org/dromara/sqlrest/manager/controller/SystemUserController.java

@@ -7,12 +7,12 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.manager.controller;
+package org.dromara.sqlrest.manager.controller;
 
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.common.dto.ResultEntity;
-import com.gitee.sqlrest.core.dto.SystemUserDetailResponse;
-import com.gitee.sqlrest.core.service.SystemUserService;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.dto.ResultEntity;
+import org.dromara.sqlrest.core.dto.SystemUserDetailResponse;
+import org.dromara.sqlrest.core.service.SystemUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import javax.annotation.Resource;

sqlrest-manager/src/main/java/com/gitee/sqlrest/manager/controller/UnifyAlarmController.java → sqlrest-manager/src/main/java/org/dromara/sqlrest/manager/controller/UnifyAlarmController.java

@@ -7,18 +7,17 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.manager.controller;
+package org.dromara.sqlrest.manager.controller;
 
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.common.dto.ResultEntity;
-import com.gitee.sqlrest.core.dto.NameValueBaseResponse;
-import com.gitee.sqlrest.core.dto.TestAlarmConfigRequest;
-import com.gitee.sqlrest.core.dto.UpdateAlarmConfigRequest;
-import com.gitee.sqlrest.core.executor.UnifyAlarmOpsService;
-import com.gitee.sqlrest.persistence.entity.UnifyAlarmEntity;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.dto.ResultEntity;
+import org.dromara.sqlrest.core.dto.NameValueBaseResponse;
+import org.dromara.sqlrest.core.dto.TestAlarmConfigRequest;
+import org.dromara.sqlrest.core.dto.UpdateAlarmConfigRequest;
+import org.dromara.sqlrest.core.executor.UnifyAlarmOpsService;
+import org.dromara.sqlrest.persistence.entity.UnifyAlarmEntity;
 import io.swagger.annotations.Api;
 import java.util.List;
-import java.util.Map;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import org.springframework.http.MediaType;

sqlrest-manager/src/main/java/com/gitee/sqlrest/manager/exception/ExceptionController.java → sqlrest-manager/src/main/java/org/dromara/sqlrest/manager/exception/ExceptionController.java

@@ -7,11 +7,11 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.manager.exception;
+package org.dromara.sqlrest.manager.exception;
 
-import com.gitee.sqlrest.common.dto.ResultEntity;
-import com.gitee.sqlrest.common.exception.CommonException;
-import com.gitee.sqlrest.common.exception.ResponseErrorCode;
+import org.dromara.sqlrest.common.dto.ResultEntity;
+import org.dromara.sqlrest.common.exception.CommonException;
+import org.dromara.sqlrest.common.exception.ResponseErrorCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ControllerAdvice;

sqlrest-manager/src/main/java/com/gitee/sqlrest/manager/model/McpToolCallHandler.java → sqlrest-manager/src/main/java/org/dromara/sqlrest/manager/model/McpToolCallHandler.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.manager.model;
+package org.dromara.sqlrest.manager.model;
 
 import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.hutool.extra.spring.SpringUtil;
@@ -15,15 +15,15 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.common.dto.BaseParam;
-import com.gitee.sqlrest.common.dto.ItemParam;
-import com.gitee.sqlrest.common.dto.ResultEntity;
-import com.gitee.sqlrest.common.enums.ParamTypeEnum;
-import com.gitee.sqlrest.core.exec.ApiExecuteService;
-import com.gitee.sqlrest.core.service.SystemParamService;
-import com.gitee.sqlrest.core.util.JacksonUtils;
-import com.gitee.sqlrest.persistence.entity.ApiAssignmentEntity;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.dto.BaseParam;
+import org.dromara.sqlrest.common.dto.ItemParam;
+import org.dromara.sqlrest.common.dto.ResultEntity;
+import org.dromara.sqlrest.common.enums.ParamTypeEnum;
+import org.dromara.sqlrest.core.exec.ApiExecuteService;
+import org.dromara.sqlrest.core.service.SystemParamService;
+import org.dromara.sqlrest.core.util.JacksonUtils;
+import org.dromara.sqlrest.persistence.entity.ApiAssignmentEntity;
 import com.google.common.collect.Lists;
 import io.modelcontextprotocol.server.McpSyncServerExchange;
 import io.modelcontextprotocol.spec.McpSchema;

sqlrest-manager/src/main/java/com/gitee/sqlrest/manager/service/AccessLogCleanService.java → sqlrest-manager/src/main/java/org/dromara/sqlrest/manager/service/AccessLogCleanService.java

@@ -7,9 +7,9 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.manager.service;
+package org.dromara.sqlrest.manager.service;
 
-import com.gitee.sqlrest.persistence.mapper.AccessRecordMapper;
+import org.dromara.sqlrest.persistence.mapper.AccessRecordMapper;
 import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;

sqlrest-manager/src/main/java/com/gitee/sqlrest/manager/service/McpManageService.java → sqlrest-manager/src/main/java/org/dromara/sqlrest/manager/service/McpManageService.java

@@ -7,28 +7,28 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.manager.service;
+package org.dromara.sqlrest.manager.service;
 
 import cn.hutool.extra.spring.SpringUtil;
-import com.gitee.sqlrest.common.consts.Constants;
-import com.gitee.sqlrest.common.dto.PageResult;
-import com.gitee.sqlrest.common.exception.CommonException;
-import com.gitee.sqlrest.common.exception.ResponseErrorCode;
-import com.gitee.sqlrest.common.util.TokenUtils;
-import com.gitee.sqlrest.core.dto.EntitySearchRequest;
-import com.gitee.sqlrest.core.dto.McpToolResponse;
-import com.gitee.sqlrest.core.dto.McpToolSaveRequest;
-import com.gitee.sqlrest.core.util.ApiPathUtils;
-import com.gitee.sqlrest.manager.model.McpToolCallHandler;
-import com.gitee.sqlrest.persistence.dao.ApiAssignmentDao;
-import com.gitee.sqlrest.persistence.dao.ApiModuleDao;
-import com.gitee.sqlrest.persistence.dao.McpClientDao;
-import com.gitee.sqlrest.persistence.dao.McpToolDao;
-import com.gitee.sqlrest.persistence.entity.ApiAssignmentEntity;
-import com.gitee.sqlrest.persistence.entity.ApiModuleEntity;
-import com.gitee.sqlrest.persistence.entity.McpClientEntity;
-import com.gitee.sqlrest.persistence.entity.McpToolEntity;
-import com.gitee.sqlrest.persistence.util.PageUtils;
+import org.dromara.sqlrest.common.consts.Constants;
+import org.dromara.sqlrest.common.dto.PageResult;
+import org.dromara.sqlrest.common.exception.CommonException;
+import org.dromara.sqlrest.common.exception.ResponseErrorCode;
+import org.dromara.sqlrest.common.util.TokenUtils;
+import org.dromara.sqlrest.core.dto.EntitySearchRequest;
+import org.dromara.sqlrest.core.dto.McpToolResponse;
+import org.dromara.sqlrest.core.dto.McpToolSaveRequest;
+import org.dromara.sqlrest.core.util.ApiPathUtils;
+import org.dromara.sqlrest.manager.model.McpToolCallHandler;
+import org.dromara.sqlrest.persistence.dao.ApiAssignmentDao;
+import org.dromara.sqlrest.persistence.dao.ApiModuleDao;
+import org.dromara.sqlrest.persistence.dao.McpClientDao;
+import org.dromara.sqlrest.persistence.dao.McpToolDao;
+import org.dromara.sqlrest.persistence.entity.ApiAssignmentEntity;
+import org.dromara.sqlrest.persistence.entity.ApiModuleEntity;
+import org.dromara.sqlrest.persistence.entity.McpClientEntity;
+import org.dromara.sqlrest.persistence.entity.McpToolEntity;
+import org.dromara.sqlrest.persistence.util.PageUtils;
 import io.modelcontextprotocol.server.McpServerFeatures;
 import io.modelcontextprotocol.server.McpSyncServer;
 import java.util.ArrayList;

sqlrest-mcp/pom.xml

@@ -4,8 +4,8 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>sqlrest-parent</artifactId>
-    <groupId>com.gitee.sqlrest</groupId>
-    <version>1.4.0</version>
+    <groupId>org.dromara.sqlrest</groupId>
+    <version>1.5.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

sqlrest-mcp/sqlrest-mcp-core/pom.xml

@@ -4,8 +4,8 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>sqlrest-mcp</artifactId>
-    <groupId>com.gitee.sqlrest</groupId>
-    <version>1.4.0</version>
+    <groupId>org.dromara.sqlrest</groupId>
+    <version>1.5.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

sqlrest-mcp/sqlrest-mcp-springmvc/pom.xml

@@ -4,8 +4,8 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>sqlrest-mcp</artifactId>
-    <groupId>com.gitee.sqlrest</groupId>
-    <version>1.4.0</version>
+    <groupId>org.dromara.sqlrest</groupId>
+    <version>1.5.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -13,7 +13,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.gitee.sqlrest</groupId>
+      <groupId>org.dromara.sqlrest</groupId>
       <artifactId>sqlrest-mcp-core</artifactId>
       <version>${project.version}</version>
     </dependency>

sqlrest-persistence/pom.xml

@@ -4,8 +4,8 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>sqlrest-parent</artifactId>
-    <groupId>com.gitee.sqlrest</groupId>
-    <version>1.4.0</version>
+    <groupId>org.dromara.sqlrest</groupId>
+    <version>1.5.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>sqlrest-persistence</artifactId>
@@ -13,7 +13,7 @@
   <dependencies>
 
     <dependency>
-      <groupId>com.gitee.sqlrest</groupId>
+      <groupId>org.dromara.sqlrest</groupId>
       <artifactId>sqlrest-common</artifactId>
       <version>${project.version}</version>
     </dependency>

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/handler/FormatMapHandler.java

-// Copyright tang.  All rights reserved.
-// https://gitee.com/inrgihc/sqlrest
-//
-// Use of this source code is governed by a BSD-style license
-//
-// Author: tang (inrgihc@126.com)
-// Date : 2024/3/31
-// Location: beijing , china
-/////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.handler;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.gitee.sqlrest.common.enums.DataTypeFormatEnum;
-import com.gitee.sqlrest.persistence.util.JsonUtils;
-import java.sql.CallableStatement;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.ibatis.type.BaseTypeHandler;
-import org.apache.ibatis.type.JdbcType;
-
-public class FormatMapHandler extends BaseTypeHandler<Map<DataTypeFormatEnum, String>> {
-
-  @Override
-  public void setNonNullParameter(PreparedStatement ps, int i, Map<DataTypeFormatEnum, String> value,
-      JdbcType jdbcType) throws SQLException {
-    ps.setString(i, map2string(value));
-  }
-
-  @Override
-  public Map<DataTypeFormatEnum, String> getNullableResult(ResultSet rs, String columnName) throws SQLException {
-    return string2map(rs.getString(columnName));
-  }
-
-  @Override
-  public Map<DataTypeFormatEnum, String> getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
-    return string2map(rs.getString(columnIndex));
-  }
-
-  @Override
-  public Map<DataTypeFormatEnum, String> getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
-    return string2map(cs.getString(columnIndex));
-  }
-
-  private String map2string(Map<DataTypeFormatEnum, String> map) {
-    if (map == null || map.isEmpty()) {
-      return null;
-    }
-    return JsonUtils.toJsonString(map);
-  }
-
-  private Map<DataTypeFormatEnum, String> string2map(String str) {
-    if (str == null || str.isEmpty()) {
-      return new HashMap<>(2);
-    }
-    return JsonUtils.toBeanType(str, new TypeReference<Map<DataTypeFormatEnum, String>>() {
-    });
-  }
-}

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/handler/ListOutputHandler.java

-// Copyright tang.  All rights reserved.
-// https://gitee.com/inrgihc/sqlrest
-//
-// Use of this source code is governed by a BSD-style license
-//
-// Author: tang (inrgihc@126.com)
-// Date : 2024/3/31
-// Location: beijing , china
-/////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.handler;
-
-import com.gitee.sqlrest.common.dto.OutParam;
-import com.gitee.sqlrest.persistence.util.JsonUtils;
-import java.sql.CallableStatement;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.ibatis.type.BaseTypeHandler;
-import org.apache.ibatis.type.JdbcType;
-
-public class ListOutputHandler extends BaseTypeHandler<List<OutParam>> {
-
-  @Override
-  public void setNonNullParameter(PreparedStatement ps, int i, List<OutParam> list, JdbcType jdbcType)
-      throws SQLException {
-    ps.setString(i, list2string(list));
-  }
-
-  @Override
-  public List<OutParam> getNullableResult(ResultSet rs, String columnName)
-      throws SQLException {
-    String r = rs.getString(columnName);
-    if (rs.wasNull()) {
-      return null;
-    }
-    return string2list(r);
-  }
-
-  @Override
-  public List<OutParam> getNullableResult(ResultSet rs, int columnIndex)
-      throws SQLException {
-    String r = rs.getString(columnIndex);
-    if (rs.wasNull()) {
-      return null;
-    }
-    return string2list(r);
-  }
-
-  @Override
-  public List<OutParam> getNullableResult(CallableStatement cs, int columnIndex)
-      throws SQLException {
-    String r = cs.getString(columnIndex);
-    if (cs.wasNull()) {
-      return null;
-    }
-    return string2list(r);
-  }
-
-  private String list2string(List<OutParam> list) {
-    if (list == null || list.isEmpty()) {
-      return null;
-    }
-    return JsonUtils.toJsonString(list);
-  }
-
-  private List<OutParam> string2list(String str) {
-    if (str == null || str.isEmpty()) {
-      return new ArrayList<>();
-    }
-    return JsonUtils.toBeanList(str, OutParam.class);
-  }
-}

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/handler/ListParamHandler.java

-// Copyright tang.  All rights reserved.
-// https://gitee.com/inrgihc/sqlrest
-//
-// Use of this source code is governed by a BSD-style license
-//
-// Author: tang (inrgihc@126.com)
-// Date : 2024/3/31
-// Location: beijing , china
-/////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.handler;
-
-import com.gitee.sqlrest.common.dto.ItemParam;
-import com.gitee.sqlrest.persistence.util.JsonUtils;
-import java.sql.CallableStatement;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.ibatis.type.BaseTypeHandler;
-import org.apache.ibatis.type.JdbcType;
-
-public class ListParamHandler extends BaseTypeHandler<List<ItemParam>> {
-
-  @Override
-  public void setNonNullParameter(PreparedStatement ps, int i, List<ItemParam> list, JdbcType jdbcType)
-      throws SQLException {
-    ps.setString(i, list2string(list));
-  }
-
-  @Override
-  public List<ItemParam> getNullableResult(ResultSet rs, String columnName)
-      throws SQLException {
-    String r = rs.getString(columnName);
-    if (rs.wasNull()) {
-      return null;
-    }
-    return string2list(r);
-  }
-
-  @Override
-  public List<ItemParam> getNullableResult(ResultSet rs, int columnIndex)
-      throws SQLException {
-    String r = rs.getString(columnIndex);
-    if (rs.wasNull()) {
-      return null;
-    }
-    return string2list(r);
-  }
-
-  @Override
-  public List<ItemParam> getNullableResult(CallableStatement cs, int columnIndex)
-      throws SQLException {
-    String r = cs.getString(columnIndex);
-    if (cs.wasNull()) {
-      return null;
-    }
-    return string2list(r);
-  }
-
-  private String list2string(List<ItemParam> list) {
-    if (list == null || list.isEmpty()) {
-      return null;
-    }
-    return JsonUtils.toJsonString(list);
-  }
-
-  private List<ItemParam> string2list(String str) {
-    if (str == null || str.isEmpty()) {
-      return new ArrayList<>();
-    }
-    return JsonUtils.toBeanList(str, ItemParam.class);
-  }
-}

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/handler/ParamMapHandler.java

-// Copyright tang.  All rights reserved.
-// https://gitee.com/inrgihc/sqlrest
-//
-// Use of this source code is governed by a BSD-style license
-//
-// Author: tang (inrgihc@126.com)
-// Date : 2024/3/31
-// Location: beijing , china
-/////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.handler;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.gitee.sqlrest.persistence.util.JsonUtils;
-import java.sql.CallableStatement;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.ibatis.type.BaseTypeHandler;
-import org.apache.ibatis.type.JdbcType;
-
-public class ParamMapHandler extends BaseTypeHandler<Map<String, Object>> {
-
-  @Override
-  public void setNonNullParameter(PreparedStatement ps, int i, Map<String, Object> value, JdbcType jdbcType)
-      throws SQLException {
-    ps.setString(i, map2string(value));
-  }
-
-  @Override
-  public Map<String, Object> getNullableResult(ResultSet rs, String columnName) throws SQLException {
-    return string2map(rs.getString(columnName));
-  }
-
-  @Override
-  public Map<String, Object> getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
-    return string2map(rs.getString(columnIndex));
-  }
-
-  @Override
-  public Map<String, Object> getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
-    return string2map(cs.getString(columnIndex));
-  }
-
-  private String map2string(Map<String, Object> map) {
-    if (map == null || map.isEmpty()) {
-      return null;
-    }
-    return JsonUtils.toJsonString(map);
-  }
-
-  private Map<String, Object> string2map(String str) {
-    if (str == null || str.isEmpty()) {
-      return new HashMap<>(2);
-    }
-    return JsonUtils.toBeanType(str, new TypeReference<Map<String, Object>>() {
-    });
-  }
-}

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/mapper/ApiAssignmentMapper.java

-// Copyright tang.  All rights reserved.
-// https://gitee.com/inrgihc/sqlrest
-//
-// Use of this source code is governed by a BSD-style license
-//
-// Author: tang (inrgihc@126.com)
-// Date : 2024/3/31
-// Location: beijing , china
-/////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gitee.sqlrest.persistence.entity.ApiAssignmentEntity;
-import com.gitee.sqlrest.persistence.entity.ModuleAssignmentEntity;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
-
-public interface ApiAssignmentMapper extends BaseMapper<ApiAssignmentEntity> {
-
-  @Select("<script>"
-      + "SELECT "
-      + " a.id as assigment_id,"
-      + " a.name as assigment_name,"
-      + " a.group_id as group_id,"
-      + " a.module_id as module_id,"
-      + " m.name as module_name "
-      + "FROM SQLREST_API_ASSIGNMENT a "
-      + "LEFT JOIN SQLREST_API_MODULE m on a.module_id = m.id"
-      + "</script>")
-  List<ModuleAssignmentEntity> getModuleAssignments();
-
-  @Update("UPDATE SQLREST_API_ASSIGNMENT SET group_id = 1 WHERE group_id=#{groupId}")
-  void resetGroup(@Param("groupId") Long groupId);
-
-  @Update("<script>"
-      + "UPDATE SQLREST_API_ASSIGNMENT SET group_id = #{groupId} WHERE id in "
-      + "<foreach collection='ids' item='item' open='(' separator=',' close=')'> "
-      + "   #{item} "
-      + "</foreach>"
-      + "</script>")
-  void updateGroup(@Param("groupId") Long groupId, @Param("ids") List<Long> ids);
-}

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/mapper/AppClientMapper.java

-// Copyright tang.  All rights reserved.
-// https://gitee.com/inrgihc/sqlrest
-//
-// Use of this source code is governed by a BSD-style license
-//
-// Author: tang (inrgihc@126.com)
-// Date : 2024/3/31
-// Location: beijing , china
-/////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gitee.sqlrest.persistence.entity.AppClientEntity;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-public interface AppClientMapper extends BaseMapper<AppClientEntity> {
-
-  @Select("<script>"
-      + " SELECT * FROM SQLREST_APP_CLIENT "
-      + " WHERE id in(SELECT client_id FROM SQLREST_CLIENT_GROUP WHERE group_id = #{groupId} )"
-      + "<if test='searchText != null and searchText.length()>0 '>"
-      + " AND name like #{searchText,jdbcType=VARCHAR} "
-      + "</if>"
-      + " ORDER BY create_time desc "
-      + "</script>")
-  List<AppClientEntity> searchAppClient(@Param("searchText") String searchText, @Param("groupId") Long groupId);
-}

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/mapper/ClientGroupMapper.java

-// Copyright tang.  All rights reserved.
-// https://gitee.com/inrgihc/sqlrest
-//
-// Use of this source code is governed by a BSD-style license
-//
-// Author: tang (inrgihc@126.com)
-// Date : 2024/3/31
-// Location: beijing , china
-/////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gitee.sqlrest.common.dto.IdWithName;
-import com.gitee.sqlrest.persistence.entity.ClientGroupEntity;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-public interface ClientGroupMapper extends BaseMapper<ClientGroupEntity> {
-
-  @Select("SELECT g.id,g.name from SQLREST_CLIENT_GROUP a LEFT JOIN SQLREST_API_GROUP g on a.group_id=g.id where a.client_id= #{id}")
-  List<IdWithName> getGroupAuth(@Param("id") Long id);
-}

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/mapper/FirewallRulesMapper.java

-// Copyright tang.  All rights reserved.
-// https://gitee.com/inrgihc/sqlrest
-//
-// Use of this source code is governed by a BSD-style license
-//
-// Author: tang (inrgihc@126.com)
-// Date : 2024/3/31
-// Location: beijing , china
-/////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gitee.sqlrest.common.enums.OnOffEnum;
-import com.gitee.sqlrest.persistence.entity.FirewallRulesEntity;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Update;
-
-public interface FirewallRulesMapper extends BaseMapper<FirewallRulesEntity> {
-
-  @Update("update SQLREST_FIREWALL_RULES set status = #{status}　where id = #{id}")
-  void updateStatus(@Param("id") Long id, @Param("status") OnOffEnum status);
-
-}

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/mapper/UnifyAlarmMapper.java

-// Copyright tang.  All rights reserved.
-// https://gitee.com/inrgihc/sqlrest
-//
-// Use of this source code is governed by a BSD-style license
-//
-// Author: tang (inrgihc@126.com)
-// Date : 2024/3/31
-// Location: beijing , china
-/////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gitee.sqlrest.common.enums.OnOffEnum;
-import com.gitee.sqlrest.persistence.entity.UnifyAlarmEntity;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Update;
-
-public interface UnifyAlarmMapper extends BaseMapper<UnifyAlarmEntity> {
-
-  @Update("update SQLREST_UNIFY_ALARM set status = #{status}　where id = #{id}")
-  void updateStatus(@Param("id") Long id, @Param("status") OnOffEnum status);
-}

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/util/JsonUtils.java

-// Copyright tang.  All rights reserved.
-// https://gitee.com/inrgihc/sqlrest
-//
-// Use of this source code is governed by a BSD-style license
-//
-// Author: tang (inrgihc@126.com)
-// Date : 2024/3/31
-// Location: beijing , china
-/////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.util;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import lombok.experimental.UtilityClass;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@UtilityClass
-public class JsonUtils {
-
-  private static ObjectMapper jacksonMapper = new ObjectMapper();
-
-  public static String toJsonString(Object object) {
-    if (Objects.nonNull(object)) {
-      try {
-        return jacksonMapper.writeValueAsString(object);
-      } catch (JsonProcessingException e) {
-        log.error("Convert object to json string error：{}", object.toString(), e);
-        throw new RuntimeException("convert object to json string error:" + e.getMessage());
-      }
-    }
-    return null;
-  }
-
-  public static <T> T toBeanObject(String jsonString, Class<T> clazz) {
-    if (null != jsonString) {
-      try {
-        return jacksonMapper.readValue(jsonString, clazz);
-      } catch (JsonProcessingException e) {
-        String className = clazz.getSimpleName();
-        log.error(" parse json [{}] to class [{}] error：{}", jsonString, className, e);
-        throw new RuntimeException("parse json string to object error:" + e.getMessage());
-      }
-    }
-    return null;
-  }
-
-  public static <T> T toBeanType(String jsonString, TypeReference<T> clazz) {
-    if (null != jsonString) {
-      try {
-        return jacksonMapper.readValue(jsonString, clazz);
-      } catch (JsonProcessingException e) {
-        String className = clazz.getType().getTypeName();
-        log.error(" parse json [{}] to class [{}] error：{}", jsonString, className, e);
-        throw new RuntimeException("parse json string to object error:" + e.getMessage());
-      }
-    }
-    return null;
-  }
-
-  public static <T> List<T> toBeanList(String jsonString, Class<T> clazz) {
-    if (null != jsonString) {
-      try {
-        return jacksonMapper.readValue(jsonString, getCollectionType(List.class, clazz));
-      } catch (JsonProcessingException e) {
-        String className = clazz.getSimpleName();
-        log.error(" parse json [{}] to class [{}] error：{}", jsonString, className, e);
-        throw new RuntimeException("parse json string to list error:" + e.getMessage());
-      }
-    }
-    return Collections.emptyList();
-  }
-
-  private static JavaType getCollectionType(Class<?> collectionClass, Class<?>... elementClasses) {
-    return jacksonMapper.getTypeFactory().constructParametricType(collectionClass, elementClasses);
-  }
-}

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/util/PageUtils.java

-// Copyright tang.  All rights reserved.
-// https://gitee.com/inrgihc/sqlrest
-//
-// Use of this source code is governed by a BSD-style license
-//
-// Author: tang (inrgihc@126.com)
-// Date : 2024/3/31
-// Location: beijing , china
-/////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.util;
-
-import com.gitee.sqlrest.common.dto.PageResult;
-import com.gitee.sqlrest.common.dto.PageResult.Pagination;
-import com.github.pagehelper.PageHelper;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Supplier;
-
-/**
- * 分页工具类
- */
-public final class PageUtils {
-
-  public static <E> PageResult<E> getPage(Supplier<List<E>> method, Integer pageNum, Integer pageSize) {
-    if (null == pageNum || pageNum <= 0) {
-      pageNum = 1;
-    }
-    if (null == pageSize || pageSize <= 0) {
-      pageSize = Integer.MAX_VALUE;
-    }
-
-    com.github.pagehelper.Page<E> originPage = PageHelper.startPage(pageNum, pageSize);
-    PageResult<E> resultPage = new PageResult<>();
-    resultPage.setData(method.get());
-
-    Pagination pagination = new Pagination();
-    pagination.setTotal((int) originPage.getTotal());
-    if (0 == originPage.getPageSize()) {
-      pagination.setPage(pageNum);
-      pagination.setSize(pageSize);
-    } else {
-      pagination.setPage(originPage.getPageNum());
-      pagination.setSize(originPage.getPageSize());
-    }
-    resultPage.setPagination(pagination);
-
-    return resultPage;
-  }
-
-  /**
-   * 内存分页
-   */
-  public static <E> PageResult<E> getPage(List<E> pagingList, int pageNum, int pageSize) {
-    Pagination pagination = new Pagination();
-    PageResult<E> page = new PageResult<>();
-    if (pageNum <= 0 || pageSize <= 0) {
-      pagination.setTotal(pagingList.size());
-      pagination.setPage(0);
-      pagination.setSize(0);
-      page.setPagination(pagination);
-      page.setData(pagingList);
-    } else {
-      pagination.setTotal(pagingList.size());
-      pagination.setPage(pageNum);
-      pagination.setSize(pageSize);
-
-      page.setPagination(pagination);
-      page.setData(subList(pagingList, pageNum, pageSize));
-    }
-
-    return page;
-  }
-
-  private static <E> List<E> subList(List<E> list, int pageNum, int pageSize) {
-    int size = list.size();
-    List<E> result = new ArrayList<>();
-    int idx = (pageNum - 1) * pageSize;
-    int end = idx + pageSize;
-    while (idx < size && idx < end) {
-      result.add(list.get(idx));
-      idx++;
-    }
-
-    return result;
-  }
-
-}

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/config/MybatisDatabaseConfiguration.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/config/MybatisDatabaseConfiguration.java

-package com.gitee.sqlrest.persistence.config;
+package org.dromara.sqlrest.persistence.config;
 
 import java.util.Properties;
 import org.apache.ibatis.mapping.DatabaseIdProvider;

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/dao/ApiAssignmentDao.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/dao/ApiAssignmentDao.java

@@ -7,14 +7,14 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.dao;
+package org.dromara.sqlrest.persistence.dao;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.gitee.sqlrest.common.enums.HttpMethodEnum;
-import com.gitee.sqlrest.persistence.entity.ApiAssignmentEntity;
-import com.gitee.sqlrest.persistence.entity.ModuleAssignmentEntity;
-import com.gitee.sqlrest.persistence.mapper.ApiAssignmentMapper;
+import org.dromara.sqlrest.common.enums.HttpMethodEnum;
+import org.dromara.sqlrest.persistence.entity.ApiAssignmentEntity;
+import org.dromara.sqlrest.persistence.entity.ModuleAssignmentEntity;
+import org.dromara.sqlrest.persistence.mapper.ApiAssignmentMapper;
 import java.util.List;
 import java.util.Objects;
 import javax.annotation.Resource;

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/dao/ApiContextDao.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/dao/ApiContextDao.java

@@ -7,11 +7,11 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.dao;
+package org.dromara.sqlrest.persistence.dao;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gitee.sqlrest.persistence.entity.ApiContextEntity;
-import com.gitee.sqlrest.persistence.mapper.ApiContextMapper;
+import org.dromara.sqlrest.persistence.entity.ApiContextEntity;
+import org.dromara.sqlrest.persistence.mapper.ApiContextMapper;
 import java.util.List;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Repository;

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/dao/ApiGroupDao.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/dao/ApiGroupDao.java

@@ -7,11 +7,11 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.dao;
+package org.dromara.sqlrest.persistence.dao;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.gitee.sqlrest.persistence.entity.ApiGroupEntity;
-import com.gitee.sqlrest.persistence.mapper.ApiGroupMapper;
+import org.dromara.sqlrest.persistence.entity.ApiGroupEntity;
+import org.dromara.sqlrest.persistence.mapper.ApiGroupMapper;
 import java.util.List;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Repository;

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/dao/ApiModuleDao.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/dao/ApiModuleDao.java

@@ -7,11 +7,11 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.dao;
+package org.dromara.sqlrest.persistence.dao;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.gitee.sqlrest.persistence.entity.ApiModuleEntity;
-import com.gitee.sqlrest.persistence.mapper.ApiModuleMapper;
+import org.dromara.sqlrest.persistence.entity.ApiModuleEntity;
+import org.dromara.sqlrest.persistence.mapper.ApiModuleMapper;
 import java.util.List;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Repository;

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/dao/AppClientDao.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/dao/AppClientDao.java

@@ -7,15 +7,15 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.dao;
+package org.dromara.sqlrest.persistence.dao;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.gitee.sqlrest.common.dto.IdWithName;
-import com.gitee.sqlrest.persistence.entity.AppClientEntity;
-import com.gitee.sqlrest.persistence.entity.ClientGroupEntity;
-import com.gitee.sqlrest.persistence.mapper.AppClientMapper;
-import com.gitee.sqlrest.persistence.mapper.ClientGroupMapper;
+import org.dromara.sqlrest.common.dto.IdWithName;
+import org.dromara.sqlrest.persistence.entity.AppClientEntity;
+import org.dromara.sqlrest.persistence.entity.ClientGroupEntity;
+import org.dromara.sqlrest.persistence.mapper.AppClientMapper;
+import org.dromara.sqlrest.persistence.mapper.ClientGroupMapper;
 import java.util.List;
 import javax.annotation.Resource;
 import org.apache.commons.lang3.StringUtils;

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/dao/DataSourceDao.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/dao/DataSourceDao.java

@@ -7,13 +7,13 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.dao;
+package org.dromara.sqlrest.persistence.dao;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.gitee.sqlrest.persistence.entity.DataSourceEntity;
-import com.gitee.sqlrest.persistence.mapper.DataSourceMapper;
+import org.dromara.sqlrest.persistence.entity.DataSourceEntity;
+import org.dromara.sqlrest.persistence.mapper.DataSourceMapper;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/dao/FirewallRulesDao.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/dao/FirewallRulesDao.java

@@ -7,12 +7,12 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.dao;
+package org.dromara.sqlrest.persistence.dao;
 
-import com.gitee.sqlrest.common.enums.OnOffEnum;
-import com.gitee.sqlrest.common.enums.WhiteBlackEnum;
-import com.gitee.sqlrest.persistence.entity.FirewallRulesEntity;
-import com.gitee.sqlrest.persistence.mapper.FirewallRulesMapper;
+import org.dromara.sqlrest.common.enums.OnOffEnum;
+import org.dromara.sqlrest.common.enums.WhiteBlackEnum;
+import org.dromara.sqlrest.persistence.entity.FirewallRulesEntity;
+import org.dromara.sqlrest.persistence.mapper.FirewallRulesMapper;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Repository;
 

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/dao/McpClientDao.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/dao/McpClientDao.java

-package com.gitee.sqlrest.persistence.dao;
+package org.dromara.sqlrest.persistence.dao;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.gitee.sqlrest.persistence.entity.McpClientEntity;
-import com.gitee.sqlrest.persistence.mapper.McpClientMapper;
+import org.dromara.sqlrest.persistence.entity.McpClientEntity;
+import org.dromara.sqlrest.persistence.mapper.McpClientMapper;
 import java.util.List;
 import javax.annotation.Resource;
 import org.apache.commons.lang3.StringUtils;

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/dao/McpToolDao.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/dao/McpToolDao.java

-package com.gitee.sqlrest.persistence.dao;
+package org.dromara.sqlrest.persistence.dao;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.gitee.sqlrest.persistence.entity.McpToolEntity;
-import com.gitee.sqlrest.persistence.mapper.McpToolMapper;
+import org.dromara.sqlrest.persistence.entity.McpToolEntity;
+import org.dromara.sqlrest.persistence.mapper.McpToolMapper;
 import java.util.List;
 import javax.annotation.Resource;
 import org.apache.commons.lang3.StringUtils;

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/dao/SystemParamDao.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/dao/SystemParamDao.java

@@ -7,11 +7,11 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.dao;
+package org.dromara.sqlrest.persistence.dao;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gitee.sqlrest.persistence.entity.SystemParamEntity;
-import com.gitee.sqlrest.persistence.mapper.SystemParamMapper;
+import org.dromara.sqlrest.persistence.entity.SystemParamEntity;
+import org.dromara.sqlrest.persistence.mapper.SystemParamMapper;
 import java.util.Objects;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Repository;

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/dao/SystemUserDao.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/dao/SystemUserDao.java

@@ -7,11 +7,11 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.dao;
+package org.dromara.sqlrest.persistence.dao;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gitee.sqlrest.persistence.entity.SystemUserEntity;
-import com.gitee.sqlrest.persistence.mapper.SystemUserMapper;
+import org.dromara.sqlrest.persistence.entity.SystemUserEntity;
+import org.dromara.sqlrest.persistence.mapper.SystemUserMapper;
 import java.util.Objects;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Repository;

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/dao/UnifyAlarmDao.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/dao/UnifyAlarmDao.java

@@ -7,11 +7,11 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.dao;
+package org.dromara.sqlrest.persistence.dao;
 
-import com.gitee.sqlrest.common.enums.OnOffEnum;
-import com.gitee.sqlrest.persistence.entity.UnifyAlarmEntity;
-import com.gitee.sqlrest.persistence.mapper.UnifyAlarmMapper;
+import org.dromara.sqlrest.common.enums.OnOffEnum;
+import org.dromara.sqlrest.persistence.entity.UnifyAlarmEntity;
+import org.dromara.sqlrest.persistence.mapper.UnifyAlarmMapper;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Repository;
 

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/entity/AccessRecordEntity.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/entity/AccessRecordEntity.java

@@ -7,14 +7,14 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.entity;
+package org.dromara.sqlrest.persistence.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.gitee.sqlrest.persistence.handler.ParamMapHandler;
+import org.dromara.sqlrest.persistence.handler.ParamMapHandler;
 import java.sql.Timestamp;
 import java.util.Map;
 import lombok.AllArgsConstructor;

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/entity/ApiAssignmentEntity.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/entity/ApiAssignmentEntity.java

@@ -7,23 +7,23 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.entity;
+package org.dromara.sqlrest.persistence.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.gitee.sqlrest.common.dto.ItemParam;
-import com.gitee.sqlrest.common.dto.OutParam;
-import com.gitee.sqlrest.common.enums.CacheKeyTypeEnum;
-import com.gitee.sqlrest.common.enums.DataTypeFormatEnum;
-import com.gitee.sqlrest.common.enums.ExecuteEngineEnum;
-import com.gitee.sqlrest.common.enums.HttpMethodEnum;
-import com.gitee.sqlrest.common.enums.NamingStrategyEnum;
-import com.gitee.sqlrest.persistence.handler.FormatMapHandler;
-import com.gitee.sqlrest.persistence.handler.ListOutputHandler;
-import com.gitee.sqlrest.persistence.handler.ListParamHandler;
+import org.dromara.sqlrest.common.dto.ItemParam;
+import org.dromara.sqlrest.common.dto.OutParam;
+import org.dromara.sqlrest.common.enums.CacheKeyTypeEnum;
+import org.dromara.sqlrest.common.enums.DataTypeFormatEnum;
+import org.dromara.sqlrest.common.enums.ExecuteEngineEnum;
+import org.dromara.sqlrest.common.enums.HttpMethodEnum;
+import org.dromara.sqlrest.common.enums.NamingStrategyEnum;
+import org.dromara.sqlrest.persistence.handler.FormatMapHandler;
+import org.dromara.sqlrest.persistence.handler.ListOutputHandler;
+import org.dromara.sqlrest.persistence.handler.ListParamHandler;
 import java.sql.Timestamp;
 import java.util.List;
 import java.util.Map;

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/entity/ApiContextEntity.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/entity/ApiContextEntity.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.entity;
+package org.dromara.sqlrest.persistence.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/entity/ApiGroupEntity.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/entity/ApiGroupEntity.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.entity;
+package org.dromara.sqlrest.persistence.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/entity/ApiModuleEntity.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/entity/ApiModuleEntity.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.entity;
+package org.dromara.sqlrest.persistence.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/entity/AppClientEntity.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/entity/AppClientEntity.java

@@ -7,15 +7,15 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.entity;
+package org.dromara.sqlrest.persistence.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.gitee.sqlrest.common.enums.AliveTimeEnum;
-import com.gitee.sqlrest.common.enums.DurationTimeEnum;
+import org.dromara.sqlrest.common.enums.AliveTimeEnum;
+import org.dromara.sqlrest.common.enums.DurationTimeEnum;
 import java.sql.Timestamp;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/entity/ClientGroupEntity.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/entity/ClientGroupEntity.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.entity;
+package org.dromara.sqlrest.persistence.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/entity/DataSourceEntity.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/entity/DataSourceEntity.java

@@ -7,14 +7,14 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.entity;
+package org.dromara.sqlrest.persistence.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.gitee.sqlrest.common.enums.ProductTypeEnum;
+import org.dromara.sqlrest.common.enums.ProductTypeEnum;
 import java.sql.Timestamp;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/entity/FirewallRulesEntity.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/entity/FirewallRulesEntity.java

@@ -7,15 +7,15 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.entity;
+package org.dromara.sqlrest.persistence.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.gitee.sqlrest.common.enums.OnOffEnum;
-import com.gitee.sqlrest.common.enums.WhiteBlackEnum;
+import org.dromara.sqlrest.common.enums.OnOffEnum;
+import org.dromara.sqlrest.common.enums.WhiteBlackEnum;
 import java.sql.Timestamp;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/entity/McpClientEntity.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/entity/McpClientEntity.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.entity;
+package org.dromara.sqlrest.persistence.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/entity/McpToolEntity.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/entity/McpToolEntity.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.entity;
+package org.dromara.sqlrest.persistence.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/entity/ModuleAssignmentEntity.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/entity/ModuleAssignmentEntity.java

-package com.gitee.sqlrest.persistence.entity;
+package org.dromara.sqlrest.persistence.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/entity/SystemParamEntity.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/entity/SystemParamEntity.java

@@ -7,13 +7,13 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.entity;
+package org.dromara.sqlrest.persistence.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.gitee.sqlrest.common.enums.ParamTypeEnum;
+import org.dromara.sqlrest.common.enums.ParamTypeEnum;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/entity/SystemUserEntity.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/entity/SystemUserEntity.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.entity;
+package org.dromara.sqlrest.persistence.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/entity/UnifyAlarmEntity.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/entity/UnifyAlarmEntity.java

@@ -7,14 +7,14 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.entity;
+package org.dromara.sqlrest.persistence.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.gitee.sqlrest.common.enums.OnOffEnum;
+import org.dromara.sqlrest.common.enums.OnOffEnum;
 import java.sql.Timestamp;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/handler/FormatMapHandler.java

+// Copyright tang.  All rights reserved.
+// https://gitee.com/inrgihc/sqlrest
+//
+// Use of this source code is governed by a BSD-style license
+//
+// Author: tang (inrgihc@126.com)
+// Date : 2024/3/31
+// Location: beijing , china
+/////////////////////////////////////////////////////////////
+package org.dromara.sqlrest.persistence.handler;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import org.dromara.sqlrest.common.enums.DataTypeFormatEnum;
+import org.dromara.sqlrest.persistence.util.JsonUtils;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+
+public class FormatMapHandler extends BaseTypeHandler<Map<DataTypeFormatEnum, String>> {
+
+  @Override
+  public void setNonNullParameter(PreparedStatement ps, int i, Map<DataTypeFormatEnum, String> value,
+      JdbcType jdbcType) throws SQLException {
+    ps.setString(i, map2string(value));
+  }
+
+  @Override
+  public Map<DataTypeFormatEnum, String> getNullableResult(ResultSet rs, String columnName) throws SQLException {
+    return string2map(rs.getString(columnName));
+  }
+
+  @Override
+  public Map<DataTypeFormatEnum, String> getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
+    return string2map(rs.getString(columnIndex));
+  }
+
+  @Override
+  public Map<DataTypeFormatEnum, String> getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
+    return string2map(cs.getString(columnIndex));
+  }
+
+  private String map2string(Map<DataTypeFormatEnum, String> map) {
+    if (map == null || map.isEmpty()) {
+      return null;
+    }
+    return JsonUtils.toJsonString(map);
+  }
+
+  private Map<DataTypeFormatEnum, String> string2map(String str) {
+    if (str == null || str.isEmpty()) {
+      return new HashMap<>(2);
+    }
+    return JsonUtils.toBeanType(str, new TypeReference<Map<DataTypeFormatEnum, String>>() {
+    });
+  }
+}

sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/handler/ListOutputHandler.java

+// Copyright tang.  All rights reserved.
+// https://gitee.com/inrgihc/sqlrest
+//
+// Use of this source code is governed by a BSD-style license
+//
+// Author: tang (inrgihc@126.com)
+// Date : 2024/3/31
+// Location: beijing , china
+/////////////////////////////////////////////////////////////
+package org.dromara.sqlrest.persistence.handler;
+
+import org.dromara.sqlrest.common.dto.OutParam;
+import org.dromara.sqlrest.persistence.util.JsonUtils;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+
+public class ListOutputHandler extends BaseTypeHandler<List<OutParam>> {
+
+  @Override
+  public void setNonNullParameter(PreparedStatement ps, int i, List<OutParam> list, JdbcType jdbcType)
+      throws SQLException {
+    ps.setString(i, list2string(list));
+  }
+
+  @Override
+  public List<OutParam> getNullableResult(ResultSet rs, String columnName)
+      throws SQLException {
+    String r = rs.getString(columnName);
+    if (rs.wasNull()) {
+      return null;
+    }
+    return string2list(r);
+  }
+
+  @Override
+  public List<OutParam> getNullableResult(ResultSet rs, int columnIndex)
+      throws SQLException {
+    String r = rs.getString(columnIndex);
+    if (rs.wasNull()) {
+      return null;
+    }
+    return string2list(r);
+  }
+
+  @Override
+  public List<OutParam> getNullableResult(CallableStatement cs, int columnIndex)
+      throws SQLException {
+    String r = cs.getString(columnIndex);
+    if (cs.wasNull()) {
+      return null;
+    }
+    return string2list(r);
+  }
+
+  private String list2string(List<OutParam> list) {
+    if (list == null || list.isEmpty()) {
+      return null;
+    }
+    return JsonUtils.toJsonString(list);
+  }
+
+  private List<OutParam> string2list(String str) {
+    if (str == null || str.isEmpty()) {
+      return new ArrayList<>();
+    }
+    return JsonUtils.toBeanList(str, OutParam.class);
+  }
+}

sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/handler/ListParamHandler.java

+// Copyright tang.  All rights reserved.
+// https://gitee.com/inrgihc/sqlrest
+//
+// Use of this source code is governed by a BSD-style license
+//
+// Author: tang (inrgihc@126.com)
+// Date : 2024/3/31
+// Location: beijing , china
+/////////////////////////////////////////////////////////////
+package org.dromara.sqlrest.persistence.handler;
+
+import org.dromara.sqlrest.common.dto.ItemParam;
+import org.dromara.sqlrest.persistence.util.JsonUtils;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+
+public class ListParamHandler extends BaseTypeHandler<List<ItemParam>> {
+
+  @Override
+  public void setNonNullParameter(PreparedStatement ps, int i, List<ItemParam> list, JdbcType jdbcType)
+      throws SQLException {
+    ps.setString(i, list2string(list));
+  }
+
+  @Override
+  public List<ItemParam> getNullableResult(ResultSet rs, String columnName)
+      throws SQLException {
+    String r = rs.getString(columnName);
+    if (rs.wasNull()) {
+      return null;
+    }
+    return string2list(r);
+  }
+
+  @Override
+  public List<ItemParam> getNullableResult(ResultSet rs, int columnIndex)
+      throws SQLException {
+    String r = rs.getString(columnIndex);
+    if (rs.wasNull()) {
+      return null;
+    }
+    return string2list(r);
+  }
+
+  @Override
+  public List<ItemParam> getNullableResult(CallableStatement cs, int columnIndex)
+      throws SQLException {
+    String r = cs.getString(columnIndex);
+    if (cs.wasNull()) {
+      return null;
+    }
+    return string2list(r);
+  }
+
+  private String list2string(List<ItemParam> list) {
+    if (list == null || list.isEmpty()) {
+      return null;
+    }
+    return JsonUtils.toJsonString(list);
+  }
+
+  private List<ItemParam> string2list(String str) {
+    if (str == null || str.isEmpty()) {
+      return new ArrayList<>();
+    }
+    return JsonUtils.toBeanList(str, ItemParam.class);
+  }
+}

sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/handler/ParamMapHandler.java

+// Copyright tang.  All rights reserved.
+// https://gitee.com/inrgihc/sqlrest
+//
+// Use of this source code is governed by a BSD-style license
+//
+// Author: tang (inrgihc@126.com)
+// Date : 2024/3/31
+// Location: beijing , china
+/////////////////////////////////////////////////////////////
+package org.dromara.sqlrest.persistence.handler;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import org.dromara.sqlrest.persistence.util.JsonUtils;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+
+public class ParamMapHandler extends BaseTypeHandler<Map<String, Object>> {
+
+  @Override
+  public void setNonNullParameter(PreparedStatement ps, int i, Map<String, Object> value, JdbcType jdbcType)
+      throws SQLException {
+    ps.setString(i, map2string(value));
+  }
+
+  @Override
+  public Map<String, Object> getNullableResult(ResultSet rs, String columnName) throws SQLException {
+    return string2map(rs.getString(columnName));
+  }
+
+  @Override
+  public Map<String, Object> getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
+    return string2map(rs.getString(columnIndex));
+  }
+
+  @Override
+  public Map<String, Object> getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
+    return string2map(cs.getString(columnIndex));
+  }
+
+  private String map2string(Map<String, Object> map) {
+    if (map == null || map.isEmpty()) {
+      return null;
+    }
+    return JsonUtils.toJsonString(map);
+  }
+
+  private Map<String, Object> string2map(String str) {
+    if (str == null || str.isEmpty()) {
+      return new HashMap<>(2);
+    }
+    return JsonUtils.toBeanType(str, new TypeReference<Map<String, Object>>() {
+    });
+  }
+}

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/mapper/AccessRecordMapper.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/mapper/AccessRecordMapper.java

@@ -7,12 +7,12 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.mapper;
+package org.dromara.sqlrest.persistence.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gitee.sqlrest.common.dto.DateCount;
-import com.gitee.sqlrest.common.dto.NameCount;
-import com.gitee.sqlrest.persistence.entity.AccessRecordEntity;
+import org.dromara.sqlrest.common.dto.DateCount;
+import org.dromara.sqlrest.common.dto.NameCount;
+import org.dromara.sqlrest.persistence.entity.AccessRecordEntity;
 import java.util.List;
 import java.util.Map;
 import org.apache.ibatis.annotations.Delete;

sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/mapper/ApiAssignmentMapper.java

+// Copyright tang.  All rights reserved.
+// https://gitee.com/inrgihc/sqlrest
+//
+// Use of this source code is governed by a BSD-style license
+//
+// Author: tang (inrgihc@126.com)
+// Date : 2024/3/31
+// Location: beijing , china
+/////////////////////////////////////////////////////////////
+package org.dromara.sqlrest.persistence.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.dromara.sqlrest.persistence.entity.ApiAssignmentEntity;
+import org.dromara.sqlrest.persistence.entity.ModuleAssignmentEntity;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+public interface ApiAssignmentMapper extends BaseMapper<ApiAssignmentEntity> {
+
+  @Select("<script>"
+      + "SELECT "
+      + " a.id as assigment_id,"
+      + " a.name as assigment_name,"
+      + " a.group_id as group_id,"
+      + " a.module_id as module_id,"
+      + " m.name as module_name "
+      + "FROM SQLREST_API_ASSIGNMENT a "
+      + "LEFT JOIN SQLREST_API_MODULE m on a.module_id = m.id"
+      + "</script>")
+  List<ModuleAssignmentEntity> getModuleAssignments();
+
+  @Update("UPDATE SQLREST_API_ASSIGNMENT SET group_id = 1 WHERE group_id=#{groupId}")
+  void resetGroup(@Param("groupId") Long groupId);
+
+  @Update("<script>"
+      + "UPDATE SQLREST_API_ASSIGNMENT SET group_id = #{groupId} WHERE id in "
+      + "<foreach collection='ids' item='item' open='(' separator=',' close=')'> "
+      + "   #{item} "
+      + "</foreach>"
+      + "</script>")
+  void updateGroup(@Param("groupId") Long groupId, @Param("ids") List<Long> ids);
+}

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/mapper/ApiContextMapper.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/mapper/ApiContextMapper.java

@@ -7,10 +7,10 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.mapper;
+package org.dromara.sqlrest.persistence.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gitee.sqlrest.persistence.entity.ApiContextEntity;
+import org.dromara.sqlrest.persistence.entity.ApiContextEntity;
 
 public interface ApiContextMapper extends BaseMapper<ApiContextEntity> {
 

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/mapper/ApiGroupMapper.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/mapper/ApiGroupMapper.java

@@ -7,10 +7,10 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.mapper;
+package org.dromara.sqlrest.persistence.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gitee.sqlrest.persistence.entity.ApiGroupEntity;
+import org.dromara.sqlrest.persistence.entity.ApiGroupEntity;
 
 public interface ApiGroupMapper extends BaseMapper<ApiGroupEntity> {
 

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/mapper/ApiModuleMapper.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/mapper/ApiModuleMapper.java

@@ -7,10 +7,10 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.mapper;
+package org.dromara.sqlrest.persistence.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gitee.sqlrest.persistence.entity.ApiModuleEntity;
+import org.dromara.sqlrest.persistence.entity.ApiModuleEntity;
 
 public interface ApiModuleMapper extends BaseMapper<ApiModuleEntity> {
 

sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/mapper/AppClientMapper.java

+// Copyright tang.  All rights reserved.
+// https://gitee.com/inrgihc/sqlrest
+//
+// Use of this source code is governed by a BSD-style license
+//
+// Author: tang (inrgihc@126.com)
+// Date : 2024/3/31
+// Location: beijing , china
+/////////////////////////////////////////////////////////////
+package org.dromara.sqlrest.persistence.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.dromara.sqlrest.persistence.entity.AppClientEntity;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+public interface AppClientMapper extends BaseMapper<AppClientEntity> {
+
+  @Select("<script>"
+      + " SELECT * FROM SQLREST_APP_CLIENT "
+      + " WHERE id in(SELECT client_id FROM SQLREST_CLIENT_GROUP WHERE group_id = #{groupId} )"
+      + "<if test='searchText != null and searchText.length()>0 '>"
+      + " AND name like #{searchText,jdbcType=VARCHAR} "
+      + "</if>"
+      + " ORDER BY create_time desc "
+      + "</script>")
+  List<AppClientEntity> searchAppClient(@Param("searchText") String searchText, @Param("groupId") Long groupId);
+}

sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/mapper/ClientGroupMapper.java

+// Copyright tang.  All rights reserved.
+// https://gitee.com/inrgihc/sqlrest
+//
+// Use of this source code is governed by a BSD-style license
+//
+// Author: tang (inrgihc@126.com)
+// Date : 2024/3/31
+// Location: beijing , china
+/////////////////////////////////////////////////////////////
+package org.dromara.sqlrest.persistence.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.dromara.sqlrest.common.dto.IdWithName;
+import org.dromara.sqlrest.persistence.entity.ClientGroupEntity;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+public interface ClientGroupMapper extends BaseMapper<ClientGroupEntity> {
+
+  @Select("SELECT g.id,g.name from SQLREST_CLIENT_GROUP a LEFT JOIN SQLREST_API_GROUP g on a.group_id=g.id where a.client_id= #{id}")
+  List<IdWithName> getGroupAuth(@Param("id") Long id);
+}

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/mapper/DataSourceMapper.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/mapper/DataSourceMapper.java

@@ -7,10 +7,10 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.mapper;
+package org.dromara.sqlrest.persistence.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gitee.sqlrest.persistence.entity.DataSourceEntity;
+import org.dromara.sqlrest.persistence.entity.DataSourceEntity;
 
 public interface DataSourceMapper extends BaseMapper<DataSourceEntity> {
 

sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/mapper/FirewallRulesMapper.java

+// Copyright tang.  All rights reserved.
+// https://gitee.com/inrgihc/sqlrest
+//
+// Use of this source code is governed by a BSD-style license
+//
+// Author: tang (inrgihc@126.com)
+// Date : 2024/3/31
+// Location: beijing , china
+/////////////////////////////////////////////////////////////
+package org.dromara.sqlrest.persistence.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.dromara.sqlrest.common.enums.OnOffEnum;
+import org.dromara.sqlrest.persistence.entity.FirewallRulesEntity;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
+public interface FirewallRulesMapper extends BaseMapper<FirewallRulesEntity> {
+
+  @Update("update SQLREST_FIREWALL_RULES set status = #{status}　where id = #{id}")
+  void updateStatus(@Param("id") Long id, @Param("status") OnOffEnum status);
+
+}

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/mapper/McpClientMapper.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/mapper/McpClientMapper.java

@@ -7,10 +7,10 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.mapper;
+package org.dromara.sqlrest.persistence.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gitee.sqlrest.persistence.entity.McpClientEntity;
+import org.dromara.sqlrest.persistence.entity.McpClientEntity;
 
 public interface McpClientMapper extends BaseMapper<McpClientEntity> {
 

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/mapper/McpToolMapper.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/mapper/McpToolMapper.java

@@ -7,10 +7,10 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.mapper;
+package org.dromara.sqlrest.persistence.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gitee.sqlrest.persistence.entity.McpToolEntity;
+import org.dromara.sqlrest.persistence.entity.McpToolEntity;
 
 public interface McpToolMapper extends BaseMapper<McpToolEntity> {
 

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/mapper/SystemParamMapper.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/mapper/SystemParamMapper.java

@@ -7,10 +7,10 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.mapper;
+package org.dromara.sqlrest.persistence.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gitee.sqlrest.persistence.entity.SystemParamEntity;
+import org.dromara.sqlrest.persistence.entity.SystemParamEntity;
 
 public interface SystemParamMapper extends BaseMapper<SystemParamEntity> {
 

sqlrest-persistence/src/main/java/com/gitee/sqlrest/persistence/mapper/SystemUserMapper.java → sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/mapper/SystemUserMapper.java

@@ -7,10 +7,10 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.persistence.mapper;
+package org.dromara.sqlrest.persistence.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gitee.sqlrest.persistence.entity.SystemUserEntity;
+import org.dromara.sqlrest.persistence.entity.SystemUserEntity;
 
 public interface SystemUserMapper extends BaseMapper<SystemUserEntity> {
 

sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/mapper/UnifyAlarmMapper.java

+// Copyright tang.  All rights reserved.
+// https://gitee.com/inrgihc/sqlrest
+//
+// Use of this source code is governed by a BSD-style license
+//
+// Author: tang (inrgihc@126.com)
+// Date : 2024/3/31
+// Location: beijing , china
+/////////////////////////////////////////////////////////////
+package org.dromara.sqlrest.persistence.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.dromara.sqlrest.common.enums.OnOffEnum;
+import org.dromara.sqlrest.persistence.entity.UnifyAlarmEntity;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
+public interface UnifyAlarmMapper extends BaseMapper<UnifyAlarmEntity> {
+
+  @Update("update SQLREST_UNIFY_ALARM set status = #{status}　where id = #{id}")
+  void updateStatus(@Param("id") Long id, @Param("status") OnOffEnum status);
+}

sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/util/JsonUtils.java

+// Copyright tang.  All rights reserved.
+// https://gitee.com/inrgihc/sqlrest
+//
+// Use of this source code is governed by a BSD-style license
+//
+// Author: tang (inrgihc@126.com)
+// Date : 2024/3/31
+// Location: beijing , china
+/////////////////////////////////////////////////////////////
+package org.dromara.sqlrest.persistence.util;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import lombok.experimental.UtilityClass;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@UtilityClass
+public class JsonUtils {
+
+  private static ObjectMapper jacksonMapper = new ObjectMapper();
+
+  public static String toJsonString(Object object) {
+    if (Objects.nonNull(object)) {
+      try {
+        return jacksonMapper.writeValueAsString(object);
+      } catch (JsonProcessingException e) {
+        log.error("Convert object to json string error：{}", object.toString(), e);
+        throw new RuntimeException("convert object to json string error:" + e.getMessage());
+      }
+    }
+    return null;
+  }
+
+  public static <T> T toBeanObject(String jsonString, Class<T> clazz) {
+    if (null != jsonString) {
+      try {
+        return jacksonMapper.readValue(jsonString, clazz);
+      } catch (JsonProcessingException e) {
+        String className = clazz.getSimpleName();
+        log.error(" parse json [{}] to class [{}] error：{}", jsonString, className, e);
+        throw new RuntimeException("parse json string to object error:" + e.getMessage());
+      }
+    }
+    return null;
+  }
+
+  public static <T> T toBeanType(String jsonString, TypeReference<T> clazz) {
+    if (null != jsonString) {
+      try {
+        return jacksonMapper.readValue(jsonString, clazz);
+      } catch (JsonProcessingException e) {
+        String className = clazz.getType().getTypeName();
+        log.error(" parse json [{}] to class [{}] error：{}", jsonString, className, e);
+        throw new RuntimeException("parse json string to object error:" + e.getMessage());
+      }
+    }
+    return null;
+  }
+
+  public static <T> List<T> toBeanList(String jsonString, Class<T> clazz) {
+    if (null != jsonString) {
+      try {
+        return jacksonMapper.readValue(jsonString, getCollectionType(List.class, clazz));
+      } catch (JsonProcessingException e) {
+        String className = clazz.getSimpleName();
+        log.error(" parse json [{}] to class [{}] error：{}", jsonString, className, e);
+        throw new RuntimeException("parse json string to list error:" + e.getMessage());
+      }
+    }
+    return Collections.emptyList();
+  }
+
+  private static JavaType getCollectionType(Class<?> collectionClass, Class<?>... elementClasses) {
+    return jacksonMapper.getTypeFactory().constructParametricType(collectionClass, elementClasses);
+  }
+}

sqlrest-persistence/src/main/java/org/dromara/sqlrest/persistence/util/PageUtils.java

+// Copyright tang.  All rights reserved.
+// https://gitee.com/inrgihc/sqlrest
+//
+// Use of this source code is governed by a BSD-style license
+//
+// Author: tang (inrgihc@126.com)
+// Date : 2024/3/31
+// Location: beijing , china
+/////////////////////////////////////////////////////////////
+package org.dromara.sqlrest.persistence.util;
+
+import org.dromara.sqlrest.common.dto.PageResult;
+import org.dromara.sqlrest.common.dto.PageResult.Pagination;
+import com.github.pagehelper.PageHelper;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Supplier;
+
+/**
+ * 分页工具类
+ */
+public final class PageUtils {
+
+  public static <E> PageResult<E> getPage(Supplier<List<E>> method, Integer pageNum, Integer pageSize) {
+    if (null == pageNum || pageNum <= 0) {
+      pageNum = 1;
+    }
+    if (null == pageSize || pageSize <= 0) {
+      pageSize = Integer.MAX_VALUE;
+    }
+
+    com.github.pagehelper.Page<E> originPage = PageHelper.startPage(pageNum, pageSize);
+    PageResult<E> resultPage = new PageResult<>();
+    resultPage.setData(method.get());
+
+    Pagination pagination = new Pagination();
+    pagination.setTotal((int) originPage.getTotal());
+    if (0 == originPage.getPageSize()) {
+      pagination.setPage(pageNum);
+      pagination.setSize(pageSize);
+    } else {
+      pagination.setPage(originPage.getPageNum());
+      pagination.setSize(originPage.getPageSize());
+    }
+    resultPage.setPagination(pagination);
+
+    return resultPage;
+  }
+
+  /**
+   * 内存分页
+   */
+  public static <E> PageResult<E> getPage(List<E> pagingList, int pageNum, int pageSize) {
+    Pagination pagination = new Pagination();
+    PageResult<E> page = new PageResult<>();
+    if (pageNum <= 0 || pageSize <= 0) {
+      pagination.setTotal(pagingList.size());
+      pagination.setPage(0);
+      pagination.setSize(0);
+      page.setPagination(pagination);
+      page.setData(pagingList);
+    } else {
+      pagination.setTotal(pagingList.size());
+      pagination.setPage(pageNum);
+      pagination.setSize(pageSize);
+
+      page.setPagination(pagination);
+      page.setData(subList(pagingList, pageNum, pageSize));
+    }
+
+    return page;
+  }
+
+  private static <E> List<E> subList(List<E> list, int pageNum, int pageSize) {
+    int size = list.size();
+    List<E> result = new ArrayList<>();
+    int idx = (pageNum - 1) * pageSize;
+    int end = idx + pageSize;
+    while (idx < size && idx < end) {
+      result.add(list.get(idx));
+      idx++;
+    }
+
+    return result;
+  }
+
+}

sqlrest-template/pom.xml

@@ -4,8 +4,8 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>sqlrest-parent</artifactId>
-    <groupId>com.gitee.sqlrest</groupId>
-    <version>1.4.0</version>
+    <groupId>org.dromara.sqlrest</groupId>
+    <version>1.5.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>sqlrest-template</artifactId>

sqlrest-template/src/main/java/com/gitee/sqlrest/template/SqlMeta.java

-// Copyright tang.  All rights reserved.
-// https://gitee.com/inrgihc/sqlrest
-//
-// Use of this source code is governed by a BSD-style license
-//
-// Author: tang (inrgihc@126.com)
-// Date : 2024/3/31
-// Location: beijing , china
-/////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.template;
-
-import java.util.List;
-
-public class SqlMeta {
-
-  private String sql;
-  private List<Object> parameter;
-
-  public SqlMeta(String sql, List<Object> parameter) {
-    super();
-    this.sql = sql.trim();
-    this.parameter = parameter;
-  }
-
-  public String getSql() {
-    return sql;
-  }
-
-  public void setSql(String sql) {
-    this.sql = sql.trim();
-  }
-
-  public List<Object> getParameter() {
-    return parameter;
-  }
-
-  public void setParameter(List<Object> parameter) {
-    this.parameter = parameter;
-  }
-
-  public boolean isQuerySQL() {
-    String upperSql = sql.toUpperCase().trim();
-    return upperSql.startsWith("SELECT") || upperSql.startsWith("WITH");
-  }
-
-  @Override
-  public String toString() {
-    return "SqlMeta [sql=" + sql + ", parameter=" + parameter + "]";
-  }
-
-
-}

sqlrest-template/src/main/java/com/gitee/sqlrest/template/XmlSqlTemplate.java

-// Copyright tang.  All rights reserved.
-// https://gitee.com/inrgihc/sqlrest
-//
-// Use of this source code is governed by a BSD-style license
-//
-// Author: tang (inrgihc@126.com)
-// Date : 2024/3/31
-// Location: beijing , china
-/////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.template;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.apache.ibatis.mapping.BoundSql;
-import org.apache.ibatis.mapping.ParameterMapping;
-import org.apache.ibatis.mapping.SqlSource;
-import org.apache.ibatis.parsing.XNode;
-import org.apache.ibatis.parsing.XPathParser;
-import org.apache.ibatis.session.Configuration;
-
-public class XmlSqlTemplate {
-
-  private static final Pattern pattern = Pattern.compile("\\([^()]*\\)|\\[[^\\[\\]]*\\]|\\{[^{}]*}");
-
-  private Configuration configuration;
-  private XNode root;
-
-  public XmlSqlTemplate(String xmlSql) {
-    configuration = new Configuration();
-    configuration.setMapUnderscoreToCamelCase(true);
-    this.root = parseXml(xmlSql);
-  }
-
-  private XNode parseXml(String sql) {
-    String xml = "<script>" + sql + "</script>";
-    XPathParser parser = new XPathParser(xml);
-    List<XNode> xNodes = parser.evalNodes("script");
-    if (xNodes == null || xNodes.size() <= 0) {
-      throw new RuntimeException("Can not find sql statement from text: " + sql);
-    }
-    if (xNodes.size() > 1) {
-      throw new RuntimeException("Only support one sql statement for parse");
-    }
-
-    return xNodes.get(0);
-  }
-
-  public Map<String, Boolean> getParameterNames() {
-    Map<String, Boolean> inputParams = new LinkedHashMap<>();
-    XmlScriptBuilder builder = new XmlScriptBuilder(configuration, root);
-    builder.parseScriptNode(inputParams);
-
-    Map<String, Boolean> names = new LinkedHashMap<>();
-    for (Map.Entry<String, Boolean> entry : inputParams.entrySet()) {
-      String name = entry.getKey();
-      String subName = null;
-      if (null == entry.getValue()) {
-        continue;
-      }
-      Matcher matcher = pattern.matcher(name);
-      while (matcher.find()) {
-        name = name.replaceAll(Pattern.quote(matcher.group()), "");
-        matcher = pattern.matcher(name);
-      }
-
-      int commaIdx = name.indexOf(",");
-      if (commaIdx > 0) {
-        name = name.substring(0, commaIdx);
-      }
-
-      int idx = name.indexOf(".");
-      if (idx > 0) {
-        subName = name;
-        name = name.substring(0, idx);
-        if (entry.getValue()) {
-          names.put(name, false);
-          if (null != subName) {
-            names.put(subName, true);
-          }
-        } else {
-          names.putIfAbsent(name, entry.getValue());
-          if (null != subName) {
-            names.putIfAbsent(subName, entry.getValue());
-          }
-        }
-        continue;
-      } else {
-        if (entry.getValue()) {
-          names.put(name, true);
-          if (null != subName) {
-            names.put(subName, true);
-          }
-        } else {
-          names.putIfAbsent(name, entry.getValue());
-          if (null != subName) {
-            names.putIfAbsent(subName, entry.getValue());
-          }
-        }
-      }
-    }
-
-    return names;
-  }
-
-  public SqlMeta process(Map<String, Object> params) {
-    XmlScriptBuilder builder = new XmlScriptBuilder(configuration, root);
-    Map<String, Boolean> inputParams = new HashMap<>();
-    SqlSource sqlSource = builder.parseScriptNode(inputParams);
-    BoundSql boundSql = sqlSource.getBoundSql(params);
-
-    List<Object> paramValues = new ArrayList<>();
-    for (ParameterMapping parameterMapping : boundSql.getParameterMappings()) {
-      String name = parameterMapping.getProperty();
-      Object value = boundSql.getAdditionalParameter(name);
-      if (null == value) {
-        int idx = name.indexOf(".");
-        if (idx > 0) {
-          String objName = name.substring(0, idx);
-          String subName = name.substring(idx + 1);
-          value = params.get(objName);
-          if (value instanceof Map) {
-            value = ((Map) value).get(subName);
-          }
-        } else {
-          value = params.get(name);
-        }
-      }
-      paramValues.add(value);
-    }
-
-    return new SqlMeta(boundSql.getSql(), paramValues);
-  }
-}
\ No newline at end of file

sqlrest-template/src/main/java/org/dromara/sqlrest/template/SqlMeta.java

+// Copyright tang.  All rights reserved.
+// https://gitee.com/inrgihc/sqlrest
+//
+// Use of this source code is governed by a BSD-style license
+//
+// Author: tang (inrgihc@126.com)
+// Date : 2024/3/31
+// Location: beijing , china
+/////////////////////////////////////////////////////////////
+package org.dromara.sqlrest.template;
+
+import java.util.List;
+
+public class SqlMeta {
+
+  private String sql;
+  private List<Object> parameter;
+
+  public SqlMeta(String sql, List<Object> parameter) {
+    super();
+    this.sql = sql.trim();
+    this.parameter = parameter;
+  }
+
+  public String getSql() {
+    return sql;
+  }
+
+  public void setSql(String sql) {
+    this.sql = sql.trim();
+  }
+
+  public List<Object> getParameter() {
+    return parameter;
+  }
+
+  public void setParameter(List<Object> parameter) {
+    this.parameter = parameter;
+  }
+
+  public boolean isQuerySQL() {
+    String upperSql = sql.toUpperCase().trim();
+    return upperSql.startsWith("SELECT") || upperSql.startsWith("WITH");
+  }
+
+  @Override
+  public String toString() {
+    return "SqlMeta [sql=" + sql + ", parameter=" + parameter + "]";
+  }
+
+
+}

sqlrest-template/src/main/java/com/gitee/sqlrest/template/XmlScriptBuilder.java → sqlrest-template/src/main/java/org/dromara/sqlrest/template/XmlScriptBuilder.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.template;
+package org.dromara.sqlrest.template;
 
 import java.util.ArrayList;
 import java.util.Arrays;

sqlrest-template/src/main/java/org/dromara/sqlrest/template/XmlSqlTemplate.java

+// Copyright tang.  All rights reserved.
+// https://gitee.com/inrgihc/sqlrest
+//
+// Use of this source code is governed by a BSD-style license
+//
+// Author: tang (inrgihc@126.com)
+// Date : 2024/3/31
+// Location: beijing , china
+/////////////////////////////////////////////////////////////
+package org.dromara.sqlrest.template;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.ParameterMapping;
+import org.apache.ibatis.mapping.SqlSource;
+import org.apache.ibatis.parsing.XNode;
+import org.apache.ibatis.parsing.XPathParser;
+import org.apache.ibatis.session.Configuration;
+
+public class XmlSqlTemplate {
+
+  private static final Pattern pattern = Pattern.compile("\\([^()]*\\)|\\[[^\\[\\]]*\\]|\\{[^{}]*}");
+
+  private Configuration configuration;
+  private XNode root;
+
+  public XmlSqlTemplate(String xmlSql) {
+    configuration = new Configuration();
+    configuration.setMapUnderscoreToCamelCase(true);
+    this.root = parseXml(xmlSql);
+  }
+
+  private XNode parseXml(String sql) {
+    String xml = "<script>" + sql + "</script>";
+    XPathParser parser = new XPathParser(xml);
+    List<XNode> xNodes = parser.evalNodes("script");
+    if (xNodes == null || xNodes.size() <= 0) {
+      throw new RuntimeException("Can not find sql statement from text: " + sql);
+    }
+    if (xNodes.size() > 1) {
+      throw new RuntimeException("Only support one sql statement for parse");
+    }
+
+    return xNodes.get(0);
+  }
+
+  public Map<String, Boolean> getParameterNames() {
+    Map<String, Boolean> inputParams = new LinkedHashMap<>();
+    XmlScriptBuilder builder = new XmlScriptBuilder(configuration, root);
+    builder.parseScriptNode(inputParams);
+
+    Map<String, Boolean> names = new LinkedHashMap<>();
+    for (Map.Entry<String, Boolean> entry : inputParams.entrySet()) {
+      String name = entry.getKey();
+      String subName = null;
+      if (null == entry.getValue()) {
+        continue;
+      }
+      Matcher matcher = pattern.matcher(name);
+      while (matcher.find()) {
+        name = name.replaceAll(Pattern.quote(matcher.group()), "");
+        matcher = pattern.matcher(name);
+      }
+
+      int commaIdx = name.indexOf(",");
+      if (commaIdx > 0) {
+        name = name.substring(0, commaIdx);
+      }
+
+      int idx = name.indexOf(".");
+      if (idx > 0) {
+        subName = name;
+        name = name.substring(0, idx);
+        if (entry.getValue()) {
+          names.put(name, false);
+          if (null != subName) {
+            names.put(subName, true);
+          }
+        } else {
+          names.putIfAbsent(name, entry.getValue());
+          if (null != subName) {
+            names.putIfAbsent(subName, entry.getValue());
+          }
+        }
+        continue;
+      } else {
+        if (entry.getValue()) {
+          names.put(name, true);
+          if (null != subName) {
+            names.put(subName, true);
+          }
+        } else {
+          names.putIfAbsent(name, entry.getValue());
+          if (null != subName) {
+            names.putIfAbsent(subName, entry.getValue());
+          }
+        }
+      }
+    }
+
+    return names;
+  }
+
+  public SqlMeta process(Map<String, Object> params) {
+    XmlScriptBuilder builder = new XmlScriptBuilder(configuration, root);
+    Map<String, Boolean> inputParams = new HashMap<>();
+    SqlSource sqlSource = builder.parseScriptNode(inputParams);
+    BoundSql boundSql = sqlSource.getBoundSql(params);
+
+    List<Object> paramValues = new ArrayList<>();
+    for (ParameterMapping parameterMapping : boundSql.getParameterMappings()) {
+      String name = parameterMapping.getProperty();
+      Object value = boundSql.getAdditionalParameter(name);
+      if (null == value) {
+        int idx = name.indexOf(".");
+        if (idx > 0) {
+          String objName = name.substring(0, idx);
+          String subName = name.substring(idx + 1);
+          value = params.get(objName);
+          if (value instanceof Map) {
+            value = ((Map) value).get(subName);
+          }
+        } else {
+          value = params.get(name);
+        }
+      }
+      paramValues.add(value);
+    }
+
+    return new SqlMeta(boundSql.getSql(), paramValues);
+  }
+}
\ No newline at end of file

sqlrest-template/src/test/java/com/gitee/sqlrest/template/TemplateTest.java → sqlrest-template/src/test/java/org/dromara/sqlrest/template/TemplateTest.java

@@ -7,7 +7,7 @@
 // Date : 2024/3/31
 // Location: beijing , china
 /////////////////////////////////////////////////////////////
-package com.gitee.sqlrest.template;
+package org.dromara.sqlrest.template;
 
 import java.util.Arrays;
 import java.util.Date;

version.cmd

 @echo off
 
-set APP_VERSION=1.4.0
+set APP_VERSION=1.5.0
 
 echo "Clean Project ..."
 call mvn clean -f pom.xml