Merge pull request opensolon#309 from kiryu1223/dev

改包路径
jackma009 · Nov 10, 2024 · 98fe55a · 98fe55a
2 parents d931d49 + 589dc76
commit 98fe55a
Show file tree

Hide file tree

Showing 18 changed files with 20 additions and 20 deletions.
diff --git a/...n/data/sqlink/base/annotation/Column.java → .../solon/data/sqlink/annotation/Column.java b/...n/data/sqlink/base/annotation/Column.java → .../solon/data/sqlink/annotation/Column.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.noear.solon.data.sqlink.base.annotation;
+package org.noear.solon.data.sqlink.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...ta/sqlink/base/annotation/EmptyTable.java → ...on/data/sqlink/annotation/EmptyTable.java b/...ta/sqlink/base/annotation/EmptyTable.java → ...on/data/sqlink/annotation/EmptyTable.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.noear.solon.data.sqlink.base.annotation;
+package org.noear.solon.data.sqlink.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...ink/base/annotation/GenerateStrategy.java → ...a/sqlink/annotation/GenerateStrategy.java b/...ink/base/annotation/GenerateStrategy.java → ...a/sqlink/annotation/GenerateStrategy.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.noear.solon.data.sqlink.base.annotation;
+package org.noear.solon.data.sqlink.annotation;
 
 /**
  * 默认值生成策略

diff --git a/.../sqlink/base/annotation/IgnoreColumn.java → .../data/sqlink/annotation/IgnoreColumn.java b/.../sqlink/base/annotation/IgnoreColumn.java → .../data/sqlink/annotation/IgnoreColumn.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.noear.solon.data.sqlink.base.annotation;
+package org.noear.solon.data.sqlink.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...k/base/annotation/InsertDefaultValue.java → ...sqlink/annotation/InsertDefaultValue.java b/...k/base/annotation/InsertDefaultValue.java → ...sqlink/annotation/InsertDefaultValue.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.noear.solon.data.sqlink.base.annotation;
+package org.noear.solon.data.sqlink.annotation;
 
 import org.noear.solon.data.sqlink.base.generate.DynamicGenerator;
 

diff --git a/...data/sqlink/base/annotation/Navigate.java → ...olon/data/sqlink/annotation/Navigate.java b/...data/sqlink/base/annotation/Navigate.java → ...olon/data/sqlink/annotation/Navigate.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.noear.solon.data.sqlink.base.annotation;
+package org.noear.solon.data.sqlink.annotation;
 
 import org.noear.solon.data.sqlink.base.metaData.IMappingTable;
 

diff --git a/...on/data/sqlink/base/annotation/OnGet.java → ...r/solon/data/sqlink/annotation/OnGet.java b/...on/data/sqlink/base/annotation/OnGet.java → ...r/solon/data/sqlink/annotation/OnGet.java
@@ -1,4 +1,4 @@
-package org.noear.solon.data.sqlink.base.annotation;
+package org.noear.solon.data.sqlink.annotation;
 
 import org.noear.solon.data.sqlink.base.intercept.Interceptor;
 import org.noear.solon.data.sqlink.base.intercept.NoInterceptor;

diff --git a/...on/data/sqlink/base/annotation/OnPut.java → ...r/solon/data/sqlink/annotation/OnPut.java b/...on/data/sqlink/base/annotation/OnPut.java → ...r/solon/data/sqlink/annotation/OnPut.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.noear.solon.data.sqlink.base.annotation;
+package org.noear.solon.data.sqlink.annotation;
 
 import org.noear.solon.data.sqlink.base.intercept.Interceptor;
 

diff --git a/.../sqlink/base/annotation/RelationType.java → .../data/sqlink/annotation/RelationType.java b/.../sqlink/base/annotation/RelationType.java → .../data/sqlink/annotation/RelationType.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.noear.solon.data.sqlink.base.annotation;
+package org.noear.solon.data.sqlink.annotation;
 
 /**
  * 关联关系注解

diff --git a/...on/data/sqlink/base/annotation/Table.java → ...r/solon/data/sqlink/annotation/Table.java b/...on/data/sqlink/base/annotation/Table.java → ...r/solon/data/sqlink/annotation/Table.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.noear.solon.data.sqlink.base.annotation;
+package org.noear.solon.data.sqlink.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...qlink/base/annotation/UseTypeHandler.java → ...ata/sqlink/annotation/UseTypeHandler.java b/...qlink/base/annotation/UseTypeHandler.java → ...ata/sqlink/annotation/UseTypeHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.noear.solon.data.sqlink.base.annotation;
+package org.noear.solon.data.sqlink.annotation;
 
 import org.noear.solon.data.sqlink.base.toBean.handler.ITypeHandler;
 

diff --git a/...lon-data-sqlink/src/main/java/org/noear/solon/data/sqlink/api/crud/create/InsertBase.java b/...lon-data-sqlink/src/main/java/org/noear/solon/data/sqlink/api/crud/create/InsertBase.java
@@ -18,8 +18,8 @@
 import org.noear.solon.data.sqlink.api.crud.CRUD;
 import org.noear.solon.data.sqlink.base.SqLinkConfig;
 import org.noear.solon.data.sqlink.base.SqLinkDialect;
-import org.noear.solon.data.sqlink.base.annotation.GenerateStrategy;
-import org.noear.solon.data.sqlink.base.annotation.InsertDefaultValue;
+import org.noear.solon.data.sqlink.annotation.GenerateStrategy;
+import org.noear.solon.data.sqlink.annotation.InsertDefaultValue;
 import org.noear.solon.data.sqlink.base.generate.DynamicGenerator;
 import org.noear.solon.data.sqlink.base.metaData.FieldMetaData;
 import org.noear.solon.data.sqlink.base.metaData.MetaData;

diff --git a/...data/solon-data-sqlink/src/main/java/org/noear/solon/data/sqlink/api/crud/read/Empty.java b/...data/solon-data-sqlink/src/main/java/org/noear/solon/data/sqlink/api/crud/read/Empty.java
@@ -16,7 +16,7 @@
 package org.noear.solon.data.sqlink.api.crud.read;
 
 
-import org.noear.solon.data.sqlink.base.annotation.EmptyTable;
+import org.noear.solon.data.sqlink.annotation.EmptyTable;
 
 /**
  * @author kiryu1223

diff --git a/.../solon-data-sqlink/src/main/java/org/noear/solon/data/sqlink/api/crud/read/QueryBase.java b/.../solon-data-sqlink/src/main/java/org/noear/solon/data/sqlink/api/crud/read/QueryBase.java
@@ -20,7 +20,7 @@
 import io.github.kiryu1223.expressionTree.expressions.LambdaExpression;
 import org.noear.solon.data.sqlink.api.crud.CRUD;
 import org.noear.solon.data.sqlink.base.SqLinkConfig;
-import org.noear.solon.data.sqlink.base.annotation.RelationType;
+import org.noear.solon.data.sqlink.annotation.RelationType;
 import org.noear.solon.data.sqlink.base.expression.*;
 import org.noear.solon.data.sqlink.base.metaData.FieldMetaData;
 import org.noear.solon.data.sqlink.base.metaData.IMappingTable;

diff --git a/...on-data-sqlink/src/main/java/org/noear/solon/data/sqlink/base/metaData/FieldMetaData.java b/...on-data-sqlink/src/main/java/org/noear/solon/data/sqlink/base/metaData/FieldMetaData.java
@@ -15,7 +15,7 @@
  */
 package org.noear.solon.data.sqlink.base.metaData;
 
-import org.noear.solon.data.sqlink.base.annotation.InsertDefaultValue;
+import org.noear.solon.data.sqlink.annotation.InsertDefaultValue;
 import org.noear.solon.data.sqlink.base.intercept.Interceptor;
 import org.noear.solon.data.sqlink.base.toBean.handler.ITypeHandler;
 

diff --git a/...a/solon-data-sqlink/src/main/java/org/noear/solon/data/sqlink/base/metaData/MetaData.java b/...a/solon-data-sqlink/src/main/java/org/noear/solon/data/sqlink/base/metaData/MetaData.java
@@ -15,7 +15,7 @@
  */
 package org.noear.solon.data.sqlink.base.metaData;
 
-import org.noear.solon.data.sqlink.base.annotation.*;
+import org.noear.solon.data.sqlink.annotation.*;
 import org.noear.solon.data.sqlink.base.intercept.DoNothingInterceptor;
 import org.noear.solon.data.sqlink.base.intercept.Interceptor;
 import org.noear.solon.data.sqlink.base.intercept.NoInterceptor;

diff --git a/...lon-data-sqlink/src/main/java/org/noear/solon/data/sqlink/base/metaData/NavigateData.java b/...lon-data-sqlink/src/main/java/org/noear/solon/data/sqlink/base/metaData/NavigateData.java
@@ -15,8 +15,8 @@
  */
 package org.noear.solon.data.sqlink.base.metaData;
 
-import org.noear.solon.data.sqlink.base.annotation.Navigate;
-import org.noear.solon.data.sqlink.base.annotation.RelationType;
+import org.noear.solon.data.sqlink.annotation.Navigate;
+import org.noear.solon.data.sqlink.annotation.RelationType;
 
 import java.util.Collection;
 

diff --git a/solon-projects/solon-data/solon-data-sqlink/src/test/java/demo/sqlink/model/User.java b/solon-projects/solon-data/solon-data-sqlink/src/test/java/demo/sqlink/model/User.java
@@ -17,7 +17,7 @@
 
 import demo.sqlink.interceptor.Base64Decryption;
 import demo.sqlink.interceptor.Base64Encryption;
-import org.noear.solon.data.sqlink.base.annotation.*;
+import org.noear.solon.data.sqlink.annotation.*;
 
 import java.time.LocalDateTime;