Skip to content

Commit

Permalink
Merge pull request #358 from silentbalanceyh/develop
Browse files Browse the repository at this point in the history 
0.8.0 Release
  • Loading branch information
@silentbalanceyh
silentbalanceyh committed Feb 28, 2022
2 parents 6680e9e + 9eab143 commit d8e6a1c
Show file tree
Hide file tree
Showing 44 changed files with 75 additions and 51 deletions.
31 changes: 22 additions & 9 deletions README.md
View file
Expand Up @@ -74,7 +74,7 @@ If you want to use Zero framework, you can add following dependency into you `po
<parent>
<artifactId>vertx-import</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.7.0</version>
<version>0.8.0</version>
</parent>
```

Expand Down Expand Up @@ -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

Expand Down
4 changes: 1 addition & 3 deletions pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>cn.vertxup</groupId>
<artifactId>vertx-zero</artifactId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
<name>「vertx-zero」Zero Framework</name>
<description>Vertx Zero Framework is a tool for Service Mesh Micro Service.</description>
<url>http://www.vertxup.cn</url>
Expand Down Expand Up @@ -1817,7 +1817,6 @@
</configuration>
</plugin>
<!-- Deploy Only -->
<!--
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
<version>${maven.plugin.pgp}</version>
Expand All @@ -1836,7 +1835,6 @@
</execution>
</executions>
</plugin>
-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion vertx-gaia/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-zero</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>vertx-gaia</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion vertx-gaia/vertx-co/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-gaia</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion vertx-gaia/vertx-rx/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-gaia</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>Kernel:「vertx-rx」Reactive Container</name>
Expand Down
2 changes: 1 addition & 1 deletion vertx-gaia/vertx-tp/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-gaia</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>Kernel:「vertx-tp」Integration</name>
Expand Down
2 changes: 1 addition & 1 deletion vertx-gaia/vertx-up/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-gaia</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>vertx-up</artifactId>
Expand Down
13 changes: 13 additions & 0 deletions vertx-gaia/vertx-up/src/main/java/io/vertx/up/uca/jooq/util/JqOut.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion vertx-ifx/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-zero</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion vertx-ifx/zero-ifx-auth/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-ifx</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion vertx-ifx/zero-ifx-es/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-ifx</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion vertx-ifx/zero-ifx-excel/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-ifx</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion vertx-ifx/zero-ifx-feign/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-ifx</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion vertx-ifx/zero-ifx-ftp/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-ifx</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion vertx-ifx/zero-ifx-history/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-ifx</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion vertx-ifx/zero-ifx-iqiy/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-ifx</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>zero-ifx-iqiy</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion vertx-ifx/zero-ifx-mongo/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-ifx</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion vertx-ifx/zero-ifx-neo4j/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-ifx</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion vertx-ifx/zero-ifx-redis/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-ifx</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion vertx-ifx/zero-ifx-shell/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-ifx</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion vertx-ifx/zero-ifx-sms/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-ifx</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>zero-ifx-sms</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions vertx-import/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-zero</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>vertx-import</artifactId>
Expand All @@ -15,7 +15,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>11</java.version>
<encoding>UTF-8</encoding>
<zero.version>0.8.0-SNAPSHOT</zero.version>
<zero.version>0.8.0</zero.version>
<maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion vertx-istio/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-zero</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion vertx-istio/zero-iproxy/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-istio</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>zero-iproxy</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion vertx-pin/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-zero</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion vertx-pin/zero-ambient/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-pin</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Binary file modified ...in/zero-ambient/src/main/resources/plugin/ambient/oob/data/ambient.cat.resource.tree.xlsx
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion vertx-pin/zero-atom/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-pin</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion vertx-pin/zero-crud/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-pin</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion vertx-pin/zero-erp/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-pin</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion vertx-pin/zero-fm/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-pin</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion vertx-pin/zero-graphic/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-pin</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion vertx-pin/zero-is/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-pin</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion vertx-pin/zero-jet/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-pin</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Binary file modified vertx-pin/zero-jet/src/main/resources/plugin/jet/oob/data/jet.menu.xlsx
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion vertx-pin/zero-ke/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-pin</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion vertx-pin/zero-lbs/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>vertx-pin</artifactId>
<groupId>cn.vertxup</groupId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down

0 comments on commit d8e6a1c

Please sign in to comment.