update 修改包名为org.dromara

ruoyi-common/ruoyi-common-mybatis/pom.xml

@@ -3,7 +3,7 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.ruoyi</groupId>
+        <groupId>org.dromara</groupId>
         <artifactId>ruoyi-common</artifactId>
         <version>1.6.0</version>
     </parent>
@@ -17,12 +17,12 @@
 
 	<dependencies>
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-satoken</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-dubbo</artifactId>
             <optional>true</optional>
         </dependency>

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.mybatis.annotation;
+package org.dromara.common.mybatis.annotation;
 
 import java.lang.annotation.*;
 

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.mybatis.annotation;
+package org.dromara.common.mybatis.annotation;
 
 import java.lang.annotation.*;
 

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfiguration.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.mybatis.config;
+package org.dromara.common.mybatis.config;
 
 import cn.hutool.core.net.NetUtil;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
-import com.ruoyi.common.mybatis.handler.CreateAndUpdateMetaObjectHandler;
-import com.ruoyi.common.mybatis.interceptor.PlusDataPermissionInterceptor;
+import org.dromara.common.mybatis.handler.CreateAndUpdateMetaObjectHandler;
+import org.dromara.common.mybatis.interceptor.PlusDataPermissionInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.mybatis.core.mapper;
+package org.dromara.common.mybatis.core.mapper;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.toolkit.Db;
-import com.ruoyi.common.core.utils.BeanCopyUtils;
+import org.dromara.common.core.utils.BeanCopyUtils;
 import org.apache.ibatis.logging.Log;
 import org.apache.ibatis.logging.LogFactory;
 

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java

@@ -1,12 +1,12 @@
-package com.ruoyi.common.mybatis.core.page;
+package org.dromara.common.mybatis.core.page;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.sql.SqlUtil;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.sql.SqlUtil;
 import lombok.Data;
 
 import java.io.Serializable;

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.mybatis.core.page;
+package org.dromara.common.mybatis.core.page;
 
 import cn.hutool.http.HttpStatus;
 import com.baomidou.mybatisplus.core.metadata.IPage;

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java

@@ -1,6 +1,6 @@
-package com.ruoyi.common.mybatis.enums;
+package org.dromara.common.mybatis.enums;
 
-import com.ruoyi.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java

@@ -1,6 +1,6 @@
-package com.ruoyi.common.mybatis.enums;
+package org.dromara.common.mybatis.enums;
 
-import com.ruoyi.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -10,7 +10,7 @@ import lombok.Getter;
  * 语法支持 spel 模板表达式
  * <p>
  * 内置数据 user 当前用户 内容参考 SysUser
- * 如需扩展数据 可使用 {@link com.ruoyi.common.mybatis.helper.DataPermissionHelper} 操作
+ * 如需扩展数据 可使用 {@link org.dromara.common.mybatis.helper.DataPermissionHelper} 操作
  * 内置服务 sdss 系统数据权限服务 内容参考 SysDataScopeService
  * 如需扩展更多自定义服务 可以参考 sdss 自行编写
  *

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/filter/DubboDataPermissionFilter.java

@@ -1,6 +1,6 @@
-package com.ruoyi.common.mybatis.filter;
+package org.dromara.common.mybatis.filter;
 
-import com.ruoyi.common.mybatis.helper.DataPermissionHelper;
+import org.dromara.common.mybatis.helper.DataPermissionHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.common.constants.CommonConstants;
 import org.apache.dubbo.common.extension.Activate;

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/CreateAndUpdateMetaObjectHandler.java

@@ -1,13 +1,13 @@
-package com.ruoyi.common.mybatis.handler;
+package org.dromara.common.mybatis.handler;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpStatus;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import com.ruoyi.common.satoken.utils.LoginHelper;
-import com.ruoyi.system.api.model.LoginUser;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.web.domain.BaseEntity;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.api.model.LoginUser;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.reflection.MetaObject;
 

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java

@@ -1,6 +1,6 @@
-package com.ruoyi.common.mybatis.handler;
+package org.dromara.common.mybatis.handler;
 
-import com.ruoyi.common.core.domain.R;
+import org.dromara.common.core.domain.R;
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.MyBatisSystemException;
 import org.springframework.dao.DuplicateKeyException;

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.mybatis.handler;
+package org.dromara.common.mybatis.handler;
 
 import cn.hutool.core.annotation.AnnotationUtil;
 import cn.hutool.core.collection.CollUtil;
@@ -6,17 +6,17 @@ import cn.hutool.core.collection.ConcurrentHashSet;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ClassUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.core.utils.StreamUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.mybatis.annotation.DataColumn;
-import com.ruoyi.common.mybatis.annotation.DataPermission;
-import com.ruoyi.common.mybatis.enums.DataScopeType;
-import com.ruoyi.common.mybatis.helper.DataPermissionHelper;
-import com.ruoyi.common.satoken.utils.LoginHelper;
-import com.ruoyi.system.api.model.LoginUser;
-import com.ruoyi.system.api.model.RoleDTO;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.annotation.DataColumn;
+import org.dromara.common.mybatis.annotation.DataPermission;
+import org.dromara.common.mybatis.enums.DataScopeType;
+import org.dromara.common.mybatis.helper.DataPermissionHelper;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.api.model.LoginUser;
+import org.dromara.system.api.model.RoleDTO;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.Expression;

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java

@@ -1,10 +1,10 @@
-package com.ruoyi.common.mybatis.helper;
+package org.dromara.common.mybatis.helper;
 
 import cn.hutool.core.convert.Convert;
 import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
-import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.mybatis.enums.DataBaseType;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.mybatis.enums.DataBaseType;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.mybatis.helper;
+package org.dromara.common.mybatis.helper;
 
 import cn.dev33.satoken.context.SaHolder;
 import cn.dev33.satoken.context.model.SaStorage;

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java

@@ -1,10 +1,10 @@
-package com.ruoyi.common.mybatis.interceptor;
+package org.dromara.common.mybatis.interceptor;
 
 import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper;
 import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
 import com.baomidou.mybatisplus.extension.parser.JsqlParserSupport;
 import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
-import com.ruoyi.common.mybatis.handler.PlusDataPermissionHandler;
+import org.dromara.common.mybatis.handler.PlusDataPermissionHandler;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.statement.delete.Delete;
 import net.sf.jsqlparser.statement.select.PlainSelect;

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/service/SysDataScopeService.java

@@ -1,6 +1,6 @@
-package com.ruoyi.common.mybatis.service;
+package org.dromara.common.mybatis.service;
 
-import com.ruoyi.system.api.RemoteDataScopeService;
+import org.dromara.system.api.RemoteDataScopeService;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
 

ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter

@@ -1 +1 @@
-dubboDataPermissionFilter=com.ruoyi.common.mybatis.filter.DubboDataPermissionFilter
+dubboDataPermissionFilter=org.dromara.common.mybatis.filter.DubboDataPermissionFilter

ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,3 +1,3 @@
-com.ruoyi.common.mybatis.config.MybatisPlusConfiguration
-com.ruoyi.common.mybatis.handler.MybatisExceptionHandler
-com.ruoyi.common.mybatis.service.SysDataScopeService
+org.dromara.common.mybatis.config.MybatisPlusConfiguration
+org.dromara.common.mybatis.handler.MybatisExceptionHandler
+org.dromara.common.mybatis.service.SysDataScopeService