sdk

pom.xml

@@ -6,18 +6,17 @@
 
     <groupId>logwire</groupId>
     <artifactId>logwire-bo-sdk</artifactId>
-    <version>1.0</version>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>8</source>
-                    <target>8</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+    <version>1.0.0</version>
+    <parent>
+        <groupId>logwire</groupId>
+        <artifactId>logwire-parent</artifactId>
+        <version>1.4.0</version>
+    </parent>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>1.8</java.version>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
 
 </project>
\ No newline at end of file

src/main/java/logwire/web/bo/annotation/Array.java → src/main/java/logwire/core/bo/annotation/Array.java

-package logwire.web.bo.annotation;
+package logwire.core.bo.annotation;
 
 public @interface Array{
     String label() default "";

src/main/java/logwire/web/bo/annotation/AuxField.java → src/main/java/logwire/core/bo/annotation/AuxField.java

-package logwire.web.bo.annotation;
+package logwire.core.bo.annotation;
 
 public @interface AuxField {
     String label() default "";

src/main/java/logwire/web/bo/annotation/BizModel.java → src/main/java/logwire/core/bo/annotation/BizModel.java

-package logwire.web.bo.annotation;
+package logwire.core.bo.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/logwire/web/bo/annotation/BizQueries.java → src/main/java/logwire/core/bo/annotation/BizQueries.java

-package logwire.web.bo.annotation;
+package logwire.core.bo.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/logwire/web/bo/annotation/BizQuery.java → src/main/java/logwire/core/bo/annotation/BizQuery.java

-package logwire.web.bo.annotation;
+package logwire.core.bo.annotation;
 
 import java.lang.annotation.*;
 

src/main/java/logwire/web/bo/annotation/Category.java → src/main/java/logwire/core/bo/annotation/Category.java

-package logwire.web.bo.annotation;
+package logwire.core.bo.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/logwire/web/bo/annotation/Choice.java → src/main/java/logwire/core/bo/annotation/Choice.java

-package logwire.web.bo.annotation;
+package logwire.core.bo.annotation;
 
-import logwire.web.bo.field.IChoice;
+import logwire.core.bo.field.IChoice;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/logwire/web/bo/annotation/Column.java → src/main/java/logwire/core/bo/annotation/Column.java

-package logwire.web.bo.annotation;
+package logwire.core.bo.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/logwire/web/bo/annotation/Composite.java → src/main/java/logwire/core/bo/annotation/Composite.java

-package logwire.web.bo.annotation;
+package logwire.core.bo.annotation;
 
 public @interface Composite {
     String label() default "";

src/main/java/logwire/web/bo/annotation/ForeignKey.java → src/main/java/logwire/core/bo/annotation/ForeignKey.java

-package logwire.web.bo.annotation;
+package logwire.core.bo.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/logwire/web/bo/annotation/Item.java → src/main/java/logwire/core/bo/annotation/Item.java

-package logwire.web.bo.annotation;
+package logwire.core.bo.annotation;
 
 public @interface Item {
     String label() default "";

src/main/java/logwire/web/bo/annotation/ListOperationProvider.java → src/main/java/logwire/core/bo/annotation/ListOperationProvider.java

-package logwire.web.bo.annotation;
+package logwire.core.bo.annotation;
 
-import logwire.web.bo.object.BizObject;
+import logwire.core.bo.object.BizObject;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/logwire/web/bo/annotation/Many.java → src/main/java/logwire/core/bo/annotation/Many.java

-package logwire.web.bo.annotation;
+package logwire.core.bo.annotation;
 
 public @interface Many {
     String label() default "";

src/main/java/logwire/web/bo/annotation/ObjectOperationProvider.java → src/main/java/logwire/core/bo/annotation/ObjectOperationProvider.java

-package logwire.web.bo.annotation;
+package logwire.core.bo.annotation;
 
-import logwire.web.bo.object.BizObject;
+import logwire.core.bo.object.BizObject;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/logwire/web/bo/annotation/Operation.java → src/main/java/logwire/core/bo/annotation/Operation.java

-package logwire.web.bo.annotation;
+package logwire.core.bo.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({ElementType.TYPE})
+@Target({ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Operation {
 
     String label() default "";
 
-    OperationArg[] args();
+    OperationArg[] args() default {};
 
     /**
      * 对结果做线程缓存，当self、输入参数一致时直接返回上次计算结果
+     *
      * @return
      */
     boolean cached() default false;

src/main/java/logwire/web/bo/annotation/OperationArg.java → src/main/java/logwire/core/bo/annotation/OperationArg.java

-package logwire.web.bo.annotation;
+package logwire.core.bo.annotation;
 
 /**
  * Operation参数说明
  */
 public @interface OperationArg {
-    String name();
+    String name() default "";
     String label() default "";
 }

src/main/java/logwire/web/bo/annotation/OperationParameter.java → src/main/java/logwire/core/bo/annotation/OperationParameter.java

-package logwire.web.bo.annotation;
+package logwire.core.bo.annotation;
 
 public @interface OperationParameter {
     String label() default "";

src/main/java/logwire/web/bo/annotation/SlaveMany.java → src/main/java/logwire/core/bo/annotation/SlaveMany.java

-package logwire.web.bo.annotation;
+package logwire.core.bo.annotation;
 
 public @interface SlaveMany {
     String label() default "";

src/main/java/logwire/web/bo/annotation/Text.java → src/main/java/logwire/core/bo/annotation/Text.java

-package logwire.web.bo.annotation;
+package logwire.core.bo.annotation;
 
 public @interface Text {
     String label() default "";

src/main/java/logwire/web/bo/annotation/TypeOperationProvider.java → src/main/java/logwire/core/bo/annotation/TypeOperationProvider.java

-package logwire.web.bo.annotation;
+package logwire.core.bo.annotation;
 
-import logwire.web.bo.object.BizObject;
+import logwire.core.bo.object.BizObject;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/logwire/web/bo/eventhandler/ListOperationEventHandler.java → src/main/java/logwire/core/bo/eventhandler/ListOperationEventEventHandler.java

-package logwire.web.bo.eventhandler;
+package logwire.core.bo.eventhandler;
 
-import logwire.web.bo.object.BizObject;
+import logwire.core.bo.object.BizObject;
 
 import java.util.List;
 
-public interface ListOperationEventHandler<X extends BizObject> {
+public interface ListOperationEventEventHandler<X extends BizObject> extends OperationEventHandler {
     String getOperation();
 
     boolean isEnabled();

src/main/java/logwire/web/bo/eventhandler/ObjectOperationEventHandler.java → src/main/java/logwire/core/bo/eventhandler/ObjectOperationEventEventHandler.java

-package logwire.web.bo.eventhandler;
+package logwire.core.bo.eventhandler;
 
-import logwire.web.bo.object.BizObject;
+import logwire.core.bo.object.BizObject;
 
-public interface ObjectOperationEventHandler<X extends BizObject> {
+public interface ObjectOperationEventEventHandler<X extends BizObject> extends OperationEventHandler {
     String getOperation();
 
     boolean isEnabled();

src/main/java/logwire/core/bo/eventhandler/OperationEventHandler.java

+package logwire.core.bo.eventhandler;
+
+public interface OperationEventHandler {
+}

src/main/java/logwire/web/bo/eventhandler/TypeOperationEventHandler.java → src/main/java/logwire/core/bo/eventhandler/TypeOperationEventEventHandler.java

-package logwire.web.bo.eventhandler;
+package logwire.core.bo.eventhandler;
 
-import logwire.web.bo.object.BizObject;
+import logwire.core.bo.object.BizObject;
 
-public interface TypeOperationEventHandler<X extends BizObject> {
+public interface TypeOperationEventEventHandler<X extends BizObject> extends OperationEventHandler {
     String getOperation();
 
     boolean isEnabled();

src/main/java/logwire/web/bo/field/BizArray.java → src/main/java/logwire/core/bo/field/BizArray.java

-package logwire.web.bo.field;
+package logwire.core.bo.field;
 
 public interface BizArray<X> extends Iterable<X> {
     void add(X x);

src/main/java/logwire/web/bo/field/BizComposite.java → src/main/java/logwire/core/bo/field/BizComposite.java

-package logwire.web.bo.field;
+package logwire.core.bo.field;
 
 public interface BizComposite {
 }

src/main/java/logwire/web/bo/field/BizExpando.java → src/main/java/logwire/core/bo/field/BizExpando.java

-package logwire.web.bo.field;
+package logwire.core.bo.field;
 
-import logwire.web.bo.object.BizObject;
+import logwire.core.bo.object.BizObject;
 
 public interface BizExpando<X extends BizObject> extends BizComposite {
 

src/main/java/logwire/web/bo/field/BizItem.java → src/main/java/logwire/core/bo/field/BizItem.java

-package logwire.web.bo.field;
+package logwire.core.bo.field;
 
-import logwire.web.bo.object.BizObject;
-import logwire.web.bo.list.BizList;
+import logwire.core.bo.object.BizObject;
+import logwire.core.bo.list.BizList;
 
 import java.lang.reflect.Field;
 import java.util.Map;

src/main/java/logwire/web/bo/field/BizMany.java → src/main/java/logwire/core/bo/field/BizMany.java

-package logwire.web.bo.field;
+package logwire.core.bo.field;
 
-import logwire.web.bo.object.BizObject;
-import logwire.web.bo.list.BizList;
+import logwire.core.bo.object.BizObject;
+import logwire.core.bo.list.BizList;
 
 public interface BizMany<X extends BizObject> extends Iterable<Object> {
     void add(Long id);

src/main/java/logwire/web/bo/field/BizOne.java → src/main/java/logwire/core/bo/field/BizOne.java

-package logwire.web.bo.field;
+package logwire.core.bo.field;
 
-import logwire.web.bo.object.ModelObject;
+import logwire.core.bo.object.ModelObject;
 
 public interface BizOne<X extends ModelObject> {
     Long getValue();

src/main/java/logwire/web/bo/field/BizText.java → src/main/java/logwire/core/bo/field/BizText.java

-package logwire.web.bo.field;
+package logwire.core.bo.field;
 
 public interface BizText {
     String getValue();

src/main/java/logwire/web/bo/field/IChoice.java → src/main/java/logwire/core/bo/field/IChoice.java

-package logwire.web.bo.field;
+package logwire.core.bo.field;
 
 /**
  * 枚举字典接口

src/main/java/logwire/web/bo/handler/ListOperationHandler.java → src/main/java/logwire/core/bo/handler/ListOperationHandler.java

-package logwire.web.bo.handler;
+package logwire.core.bo.handler;
 
-import logwire.web.bo.object.BizObject;
+import logwire.core.bo.object.BizObject;
 
 import java.util.List;
 
-public interface ListOperationHandler<X extends BizObject> {
-    String getOperation();
-
-    boolean isEnabled();
-
-    default String getQuery() {
-        return "";
-    }
-
-    default int getOrder() {
-        return 1000;
-    }
+public interface ListOperationHandler<X extends BizObject> extends OperationHandler {
 
     default boolean accept(List<X> xList, Object... args) {
         return true;

src/main/java/logwire/core/bo/handler/ObjectOperationHandler.java

+package logwire.core.bo.handler;
+
+import logwire.core.bo.object.BizObject;
+
+public interface ObjectOperationHandler<X extends BizObject> extends OperationHandler {
+
+    default boolean accept(X x, Object... args) {
+        return true;
+    }
+
+    Object execute(X x, Object... args);
+}

src/main/java/logwire/web/bo/handler/ObjectOperationHandler.java → src/main/java/logwire/core/bo/handler/OperationHandler.java

-package logwire.web.bo.handler;
+package logwire.core.bo.handler;
 
-import logwire.web.bo.object.BizObject;
 
-public interface ObjectOperationHandler<X extends BizObject> {
+public interface OperationHandler {
     String getOperation();
 
     boolean isEnabled();
@@ -11,13 +10,8 @@ public interface ObjectOperationHandler<X extends BizObject> {
         return "";
     }
 
-    default int getOrder() {
+    default Integer getOrder() {
         return 1000;
     }
 
-    default boolean accept(X x, Object... args) {
-        return true;
-    }
-
-    Object execute(X x, Object... args);
 }

src/main/java/logwire/web/bo/handler/TypeOperationHandler.java → src/main/java/logwire/core/bo/handler/TypeOperationHandler.java

-package logwire.web.bo.handler;
+package logwire.core.bo.handler;
 
-import logwire.web.bo.object.BizObject;
+import logwire.core.bo.object.BizObject;
 
-public interface TypeOperationHandler<X extends BizObject> {
-    String getOperation();
-
-    boolean isEnabled();
-
-    default int getOrder() {
-        return 1000;
-    }
+public interface TypeOperationHandler<X extends BizObject> extends OperationHandler {
 
     default boolean accept(Class<X> xClass, Object... args) {
         return true;

src/main/java/logwire/web/bo/list/BizList.java → src/main/java/logwire/core/bo/list/BizList.java

-package logwire.web.bo.list;
+package logwire.core.bo.list;
 
-import logwire.web.bo.object.BizObject;
+import logwire.core.bo.object.BizObject;
 
 import java.util.Map;
 

src/main/java/logwire/web/bo/object/BizObject.java → src/main/java/logwire/core/bo/object/BizObject.java

-package logwire.web.bo.object;
-
-import logwire.web.bo.annotation.Column;
-import logwire.web.bo.annotation.Composite;
-import logwire.web.bo.field.BizExpando;
-import logwire.web.bo.field.BizOne;
+package logwire.core.bo.object;
 
+import logwire.core.bo.annotation.Column;
+import logwire.core.bo.annotation.Composite;
+import logwire.core.bo.field.BizExpando;
+import logwire.core.bo.field.BizOne;
 import java.time.OffsetDateTime;
 import java.util.Map;
 

src/main/java/logwire/web/bo/object/ModelObject.java → src/main/java/logwire/core/bo/object/ModelObject.java

-package logwire.web.bo.object;
+package logwire.core.bo.object;
 
 /**
  *考虑兼容平台的XML Model

src/main/java/logwire/web/bo/object/User.java → src/main/java/logwire/core/bo/object/User.java

-package logwire.web.bo.object;
+package logwire.core.bo.object;
 
-import logwire.web.bo.annotation.BizModel;
-import logwire.web.bo.annotation.Column;
+import logwire.core.bo.annotation.BizModel;
+import logwire.core.bo.annotation.Column;
 
 @BizModel(label = "用户")
 public abstract class User extends ModelObject {

src/main/java/logwire/web/bo/select/BizChildSelect.java → src/main/java/logwire/core/bo/select/BizChildSelect.java

-package logwire.web.bo.select;
+package logwire.core.bo.select;
 
 public interface BizChildSelect extends BizSelect {
 }

src/main/java/logwire/web/bo/select/BizSelect.java → src/main/java/logwire/core/bo/select/BizSelect.java

-package logwire.web.bo.select;
+package logwire.core.bo.select;
 
 public interface BizSelect {
 }