diff --git a/README.md b/README.md index 64bd21021..759a1f753 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ If you want to use Zero framework, you can add following dependency into you `po vertx-import cn.vertxup - 0.7.0 + 0.8.0 ``` @@ -149,14 +149,27 @@ public final class Statute { ## 3. Other Information -### 3.1. Case Actions - -1. TLK Video Mobile System ( 0.4.6 ) -2. Micro Hotel Platform ( latest ) -3. CMDB/ITSM Platform ( latest ) -4. Training Demo ( latest ) -5. Data Analyzing Platform ( latest ) -6. Workflow Engine Tool ( latest ) +### 3.1. Cases + +> Because of Contract and Confidentiality Agreement, removed Sensitive information of customer include system name, customer name etc. + +* **Deprecated**: Not Running Now +* **In Progress**: In Development or Upgraded Development +* **Running**: Running on Production Environment + +| System Information |Zero Version| System Status | +|-----------------------------------|---|---------------| +| TLK Video Mobile System |0.4.6| Deprecated | +| CMDB Platform of Bank |Latest| Running | +| ITSM/ITIL Platform of Bank |Latest|Running | +| Integration of XBank |Latest| Running | +| Zero Training Demo |Latest| Running | +| Data Analyzing Exam |Latest| Running | +| Commercial Opportunity Management |Latest| Running | +| Hotel Management Platform |Latest| In Progress | +| ISO27000 Management Platform |Latest| In Progress | +| IoT Control System |Latest| In Progress | +| Medical Workflow Management |Latest | In Progress | ### 3.2. WeChat Group diff --git a/pom.xml b/pom.xml index 48fa416af..e36a98435 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 cn.vertxup vertx-zero - 0.8.0-SNAPSHOT + 0.8.0 「vertx-zero」Zero Framework Vertx Zero Framework is a tool for Service Mesh Micro Service. http://www.vertxup.cn @@ -1817,7 +1817,6 @@ - org.codehaus.mojo versions-maven-plugin diff --git a/vertx-gaia/pom.xml b/vertx-gaia/pom.xml index 29abc44f3..bc046ab70 100644 --- a/vertx-gaia/pom.xml +++ b/vertx-gaia/pom.xml @@ -5,7 +5,7 @@ vertx-zero cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 vertx-gaia diff --git a/vertx-gaia/vertx-co/pom.xml b/vertx-gaia/vertx-co/pom.xml index 3f57757c4..f4d5fe58e 100644 --- a/vertx-gaia/vertx-co/pom.xml +++ b/vertx-gaia/vertx-co/pom.xml @@ -5,7 +5,7 @@ vertx-gaia cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-gaia/vertx-rx/pom.xml b/vertx-gaia/vertx-rx/pom.xml index f617cbb75..c33c94dfa 100644 --- a/vertx-gaia/vertx-rx/pom.xml +++ b/vertx-gaia/vertx-rx/pom.xml @@ -5,7 +5,7 @@ vertx-gaia cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 Kernel:「vertx-rx」Reactive Container diff --git a/vertx-gaia/vertx-tp/pom.xml b/vertx-gaia/vertx-tp/pom.xml index 714ecde9c..dd95460b2 100644 --- a/vertx-gaia/vertx-tp/pom.xml +++ b/vertx-gaia/vertx-tp/pom.xml @@ -5,7 +5,7 @@ vertx-gaia cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 Kernel:「vertx-tp」Integration diff --git a/vertx-gaia/vertx-up/pom.xml b/vertx-gaia/vertx-up/pom.xml index e0fd194ad..fac841ac4 100644 --- a/vertx-gaia/vertx-up/pom.xml +++ b/vertx-gaia/vertx-up/pom.xml @@ -5,7 +5,7 @@ vertx-gaia cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 vertx-up diff --git a/vertx-gaia/vertx-up/src/main/java/io/vertx/up/uca/jooq/util/JqOut.java b/vertx-gaia/vertx-up/src/main/java/io/vertx/up/uca/jooq/util/JqOut.java index 0807ea955..29667a6df 100644 --- a/vertx-gaia/vertx-up/src/main/java/io/vertx/up/uca/jooq/util/JqOut.java +++ b/vertx-gaia/vertx-up/src/main/java/io/vertx/up/uca/jooq/util/JqOut.java @@ -3,6 +3,7 @@ import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; import io.vertx.up.atom.pojo.Mojo; +import io.vertx.up.eon.KName; import io.vertx.up.uca.jooq.JqAnalyzer; import io.vertx.up.util.Ut; import org.jooq.Field; @@ -92,6 +93,18 @@ private static void putField(final JsonObject data, final Mojo mojo, resultField = hitField; } } + /* + * `key` could not be overwrite by T2 + * Here are situation of following: + * 1) T1 = X_CATEGORY + * 2) T2 = F_TERM + * + * Situation 1: + * + */ + if (KName.KEY.equals(resultField) && data.containsKey(KName.KEY)) { + return; + } if (value instanceof java.sql.Timestamp) { /* * Resolve issue: java.lang.IllegalStateException: Illegal type in JsonObject: class java.sql.Timestamp diff --git a/vertx-ifx/pom.xml b/vertx-ifx/pom.xml index 84f32d83a..4ba4904ea 100644 --- a/vertx-ifx/pom.xml +++ b/vertx-ifx/pom.xml @@ -5,7 +5,7 @@ vertx-zero cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-ifx/zero-ifx-auth/pom.xml b/vertx-ifx/zero-ifx-auth/pom.xml index b53faf315..f39e62377 100644 --- a/vertx-ifx/zero-ifx-auth/pom.xml +++ b/vertx-ifx/zero-ifx-auth/pom.xml @@ -5,7 +5,7 @@ vertx-ifx cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-ifx/zero-ifx-es/pom.xml b/vertx-ifx/zero-ifx-es/pom.xml index 8ff70a3a2..0f6dd3d0e 100644 --- a/vertx-ifx/zero-ifx-es/pom.xml +++ b/vertx-ifx/zero-ifx-es/pom.xml @@ -5,7 +5,7 @@ vertx-ifx cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-ifx/zero-ifx-excel/pom.xml b/vertx-ifx/zero-ifx-excel/pom.xml index 915934e73..7497f3132 100644 --- a/vertx-ifx/zero-ifx-excel/pom.xml +++ b/vertx-ifx/zero-ifx-excel/pom.xml @@ -5,7 +5,7 @@ vertx-ifx cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-ifx/zero-ifx-feign/pom.xml b/vertx-ifx/zero-ifx-feign/pom.xml index 514e18c89..d2278debd 100644 --- a/vertx-ifx/zero-ifx-feign/pom.xml +++ b/vertx-ifx/zero-ifx-feign/pom.xml @@ -5,7 +5,7 @@ vertx-ifx cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-ifx/zero-ifx-ftp/pom.xml b/vertx-ifx/zero-ifx-ftp/pom.xml index 3a74efe37..495d6ce62 100644 --- a/vertx-ifx/zero-ifx-ftp/pom.xml +++ b/vertx-ifx/zero-ifx-ftp/pom.xml @@ -5,7 +5,7 @@ vertx-ifx cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-ifx/zero-ifx-history/pom.xml b/vertx-ifx/zero-ifx-history/pom.xml index 7ac8f8a33..f8e8b1595 100644 --- a/vertx-ifx/zero-ifx-history/pom.xml +++ b/vertx-ifx/zero-ifx-history/pom.xml @@ -5,7 +5,7 @@ vertx-ifx cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-ifx/zero-ifx-iqiy/pom.xml b/vertx-ifx/zero-ifx-iqiy/pom.xml index bf3747b7e..f49587918 100644 --- a/vertx-ifx/zero-ifx-iqiy/pom.xml +++ b/vertx-ifx/zero-ifx-iqiy/pom.xml @@ -5,7 +5,7 @@ vertx-ifx cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 zero-ifx-iqiy diff --git a/vertx-ifx/zero-ifx-mongo/pom.xml b/vertx-ifx/zero-ifx-mongo/pom.xml index 9900a3e36..640813e25 100644 --- a/vertx-ifx/zero-ifx-mongo/pom.xml +++ b/vertx-ifx/zero-ifx-mongo/pom.xml @@ -5,7 +5,7 @@ vertx-ifx cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-ifx/zero-ifx-neo4j/pom.xml b/vertx-ifx/zero-ifx-neo4j/pom.xml index f6293958d..0e9884269 100644 --- a/vertx-ifx/zero-ifx-neo4j/pom.xml +++ b/vertx-ifx/zero-ifx-neo4j/pom.xml @@ -5,7 +5,7 @@ vertx-ifx cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-ifx/zero-ifx-redis/pom.xml b/vertx-ifx/zero-ifx-redis/pom.xml index 9b33b03b8..d0a891733 100644 --- a/vertx-ifx/zero-ifx-redis/pom.xml +++ b/vertx-ifx/zero-ifx-redis/pom.xml @@ -5,7 +5,7 @@ vertx-ifx cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-ifx/zero-ifx-shell/pom.xml b/vertx-ifx/zero-ifx-shell/pom.xml index 3ea3a8cbb..e23a66998 100644 --- a/vertx-ifx/zero-ifx-shell/pom.xml +++ b/vertx-ifx/zero-ifx-shell/pom.xml @@ -5,7 +5,7 @@ vertx-ifx cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-ifx/zero-ifx-sms/pom.xml b/vertx-ifx/zero-ifx-sms/pom.xml index 35073bd69..e8b0cbfe3 100644 --- a/vertx-ifx/zero-ifx-sms/pom.xml +++ b/vertx-ifx/zero-ifx-sms/pom.xml @@ -5,7 +5,7 @@ vertx-ifx cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 zero-ifx-sms diff --git a/vertx-import/pom.xml b/vertx-import/pom.xml index 7fc2f8dd5..dbd2ef16a 100644 --- a/vertx-import/pom.xml +++ b/vertx-import/pom.xml @@ -5,7 +5,7 @@ vertx-zero cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 vertx-import @@ -15,7 +15,7 @@ UTF-8 11 UTF-8 - 0.8.0-SNAPSHOT + 0.8.0 true diff --git a/vertx-istio/pom.xml b/vertx-istio/pom.xml index 91994fbab..34d715eae 100644 --- a/vertx-istio/pom.xml +++ b/vertx-istio/pom.xml @@ -5,7 +5,7 @@ vertx-zero cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-istio/zero-iproxy/pom.xml b/vertx-istio/zero-iproxy/pom.xml index db3767f2f..f22a09dbe 100644 --- a/vertx-istio/zero-iproxy/pom.xml +++ b/vertx-istio/zero-iproxy/pom.xml @@ -5,7 +5,7 @@ vertx-istio cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 zero-iproxy diff --git a/vertx-pin/pom.xml b/vertx-pin/pom.xml index 50b656248..b7a35d481 100644 --- a/vertx-pin/pom.xml +++ b/vertx-pin/pom.xml @@ -5,7 +5,7 @@ vertx-zero cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-pin/zero-ambient/pom.xml b/vertx-pin/zero-ambient/pom.xml index 04a9b66cc..14b3381f7 100644 --- a/vertx-pin/zero-ambient/pom.xml +++ b/vertx-pin/zero-ambient/pom.xml @@ -5,7 +5,7 @@ vertx-pin cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-pin/zero-ambient/src/main/resources/plugin/ambient/oob/data/ambient.cat.resource.tree.xlsx b/vertx-pin/zero-ambient/src/main/resources/plugin/ambient/oob/data/ambient.cat.resource.tree.xlsx index 8b3d5e497..307f53716 100644 Binary files a/vertx-pin/zero-ambient/src/main/resources/plugin/ambient/oob/data/ambient.cat.resource.tree.xlsx and b/vertx-pin/zero-ambient/src/main/resources/plugin/ambient/oob/data/ambient.cat.resource.tree.xlsx differ diff --git a/vertx-pin/zero-atom/pom.xml b/vertx-pin/zero-atom/pom.xml index 2316c2826..b7e34f90c 100644 --- a/vertx-pin/zero-atom/pom.xml +++ b/vertx-pin/zero-atom/pom.xml @@ -5,7 +5,7 @@ vertx-pin cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-pin/zero-crud/pom.xml b/vertx-pin/zero-crud/pom.xml index 980467123..92e382166 100644 --- a/vertx-pin/zero-crud/pom.xml +++ b/vertx-pin/zero-crud/pom.xml @@ -5,7 +5,7 @@ vertx-pin cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-pin/zero-erp/pom.xml b/vertx-pin/zero-erp/pom.xml index 3787b07c9..605ed8fba 100644 --- a/vertx-pin/zero-erp/pom.xml +++ b/vertx-pin/zero-erp/pom.xml @@ -5,7 +5,7 @@ vertx-pin cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-pin/zero-fm/pom.xml b/vertx-pin/zero-fm/pom.xml index c2fb1b5ac..dbd8d6da0 100644 --- a/vertx-pin/zero-fm/pom.xml +++ b/vertx-pin/zero-fm/pom.xml @@ -5,7 +5,7 @@ vertx-pin cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-pin/zero-graphic/pom.xml b/vertx-pin/zero-graphic/pom.xml index 923089d9b..5c19c2c91 100644 --- a/vertx-pin/zero-graphic/pom.xml +++ b/vertx-pin/zero-graphic/pom.xml @@ -5,7 +5,7 @@ vertx-pin cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-pin/zero-is/pom.xml b/vertx-pin/zero-is/pom.xml index da09d7b3c..ab20de898 100644 --- a/vertx-pin/zero-is/pom.xml +++ b/vertx-pin/zero-is/pom.xml @@ -5,7 +5,7 @@ vertx-pin cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-pin/zero-jet/pom.xml b/vertx-pin/zero-jet/pom.xml index 74607d0bb..10957dc34 100644 --- a/vertx-pin/zero-jet/pom.xml +++ b/vertx-pin/zero-jet/pom.xml @@ -5,7 +5,7 @@ vertx-pin cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-pin/zero-jet/src/main/resources/plugin/jet/oob/data/jet.menu.xlsx b/vertx-pin/zero-jet/src/main/resources/plugin/jet/oob/data/jet.menu.xlsx index 458744b98..bb5822d2f 100644 Binary files a/vertx-pin/zero-jet/src/main/resources/plugin/jet/oob/data/jet.menu.xlsx and b/vertx-pin/zero-jet/src/main/resources/plugin/jet/oob/data/jet.menu.xlsx differ diff --git a/vertx-pin/zero-ke/pom.xml b/vertx-pin/zero-ke/pom.xml index 36b7167e0..494330d8f 100644 --- a/vertx-pin/zero-ke/pom.xml +++ b/vertx-pin/zero-ke/pom.xml @@ -5,7 +5,7 @@ vertx-pin cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-pin/zero-lbs/pom.xml b/vertx-pin/zero-lbs/pom.xml index 5c65861ec..a30eb6f1b 100644 --- a/vertx-pin/zero-lbs/pom.xml +++ b/vertx-pin/zero-lbs/pom.xml @@ -5,7 +5,7 @@ vertx-pin cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-pin/zero-psi/pom.xml b/vertx-pin/zero-psi/pom.xml index 07b78a855..1ec7ee26e 100644 --- a/vertx-pin/zero-psi/pom.xml +++ b/vertx-pin/zero-psi/pom.xml @@ -5,7 +5,7 @@ vertx-pin cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-pin/zero-rbac/pom.xml b/vertx-pin/zero-rbac/pom.xml index 740332701..f92593958 100644 --- a/vertx-pin/zero-rbac/pom.xml +++ b/vertx-pin/zero-rbac/pom.xml @@ -5,7 +5,7 @@ vertx-pin cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-pin/zero-router/pom.xml b/vertx-pin/zero-router/pom.xml index df89ef9f5..b4451569c 100644 --- a/vertx-pin/zero-router/pom.xml +++ b/vertx-pin/zero-router/pom.xml @@ -5,7 +5,7 @@ vertx-pin cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-pin/zero-ui/pom.xml b/vertx-pin/zero-ui/pom.xml index b6285fb14..b8f950845 100644 --- a/vertx-pin/zero-ui/pom.xml +++ b/vertx-pin/zero-ui/pom.xml @@ -5,7 +5,7 @@ vertx-pin cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-pin/zero-vie/pom.xml b/vertx-pin/zero-vie/pom.xml index bc0a91da2..9cb15ef48 100644 --- a/vertx-pin/zero-vie/pom.xml +++ b/vertx-pin/zero-vie/pom.xml @@ -5,7 +5,7 @@ vertx-pin cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-pin/zero-wf/pom.xml b/vertx-pin/zero-wf/pom.xml index c5ebaab4d..6abe2729f 100644 --- a/vertx-pin/zero-wf/pom.xml +++ b/vertx-pin/zero-wf/pom.xml @@ -5,7 +5,7 @@ vertx-pin cn.vertxup - 0.8.0-SNAPSHOT + 0.8.0 4.0.0 diff --git a/vertx-pin/zero-wf/src/main/resources/plugin/wf/oob/cab/wf.menu.xlsx b/vertx-pin/zero-wf/src/main/resources/plugin/wf/oob/cab/wf.menu.xlsx index 05456a8c3..766c4e396 100644 Binary files a/vertx-pin/zero-wf/src/main/resources/plugin/wf/oob/cab/wf.menu.xlsx and b/vertx-pin/zero-wf/src/main/resources/plugin/wf/oob/cab/wf.menu.xlsx differ