ibiz4j 部署微服务接口 [ibz-lite，micorservice]

config.xml

@@ -37,6 +37,11 @@
 	  git clone -b master $para2 ibzlite/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzlite/
+      mvn clean package -Papi
+      cd ibzlite-provider/ibzlite-provider-api
+      mvn -Papi docker:build
+      mvn -Papi docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzlite-provider-api.yaml ibzlab-rt --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzlite-core/src/main/resources/liquibase/h2_table.xml

@@ -132,7 +132,7 @@
 
 
     <!--输出实体[DST_DATASOURCE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_datasource-41-7">
+    <changeSet author="a_A_5d9d78509" id="tab-dst_datasource-42-7">
         <createTable tableName="IBZDATASOURCE">
                 <column name="DSID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_DATASOURCE_DSID"/>
@@ -326,7 +326,7 @@
 
 
     <!--输出实体[META_MODEL]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_model-26-14">
+    <changeSet author="a_A_5d9d78509" id="tab-meta_model-27-14">
         <createTable tableName="IBZMODEL">
                 <column name="MODELID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_MODEL_MODELID"/>

ibzlite-core/src/main/resources/sysmodel/ibzlite.json

@@ -9,6 +9,8 @@
     "table_name":"blade_visual",
     "system_id":"ibzlite",
     "system_name":"ibzlite",
+    "module_id":"avuedata",
+    "module_name":"大屏展示",
     "fields":[
     {
     "fieldname":"ID" ,
@@ -218,6 +220,8 @@
     "table_name":"blade_visual_category",
     "system_id":"ibzlite",
     "system_name":"ibzlite",
+    "module_id":"avuedata",
+    "module_name":"大屏展示",
     "fields":[
     {
     "fieldname":"ID" ,
@@ -289,6 +293,8 @@
     "table_name":"blade_visual_config",
     "system_id":"ibzlite",
     "system_name":"ibzlite",
+    "module_id":"avuedata",
+    "module_name":"大屏展示",
     "fields":[
     {
     "fieldname":"ID" ,
@@ -360,6 +366,8 @@
     "table_name":"blade_visual_map",
     "system_id":"ibzlite",
     "system_name":"ibzlite",
+    "module_id":"avuedata",
+    "module_name":"大屏展示",
     "fields":[
     {
     "fieldname":"ID" ,
@@ -417,6 +425,8 @@
     "table_name":"IBZAPI",
     "system_id":"ibzlite",
     "system_name":"ibzlite",
+    "module_id":"lite",
+    "module_name":"lite",
     "fields":[
     {
     "fieldname":"APIID" ,
@@ -558,6 +568,8 @@
     "table_name":"IBZAPP",
     "system_id":"ibzlite",
     "system_name":"ibzlite",
+    "module_id":"lite",
+    "module_name":"lite",
     "fields":[
     {
     "fieldname":"APPID" ,
@@ -728,6 +740,8 @@
     "table_name":"IBZCOMPONENT",
     "system_id":"ibzlite",
     "system_name":"ibzlite",
+    "module_id":"lite",
+    "module_name":"lite",
     "fields":[
     {
     "fieldname":"CID" ,
@@ -907,6 +921,8 @@
     "table_name":"IBZCFG",
     "system_id":"ibzlite",
     "system_name":"ibzlite",
+    "module_id":"lite",
+    "module_name":"lite",
     "fields":[
     {
     "fieldname":"CFGID" ,
@@ -1035,6 +1051,8 @@
     "table_name":"IBZDATASOURCE",
     "system_id":"ibzlite",
     "system_name":"ibzlite",
+    "module_id":"lite",
+    "module_name":"lite",
     "fields":[
     {
     "fieldname":"DSID" ,
@@ -1112,6 +1130,8 @@
     "table_name":"IBZMS",
     "system_id":"ibzlite",
     "system_name":"ibzlite",
+    "module_id":"lite",
+    "module_name":"lite",
     "fields":[
     {
     "fieldname":"MSID" ,
@@ -1213,6 +1233,8 @@
     "table_name":"IBZROUTER",
     "system_id":"ibzlite",
     "system_name":"ibzlite",
+    "module_id":"lite",
+    "module_name":"lite",
     "fields":[
     {
     "fieldname":"ROUTERID" ,
@@ -1379,6 +1401,8 @@
     "table_name":"IBZPSSYSTEM",
     "system_id":"ibzlite",
     "system_name":"ibzlite",
+    "module_id":"lite",
+    "module_name":"lite",
     "fields":[
     {
     "fieldname":"PSSYSTEMID" ,
@@ -1531,6 +1555,8 @@
     "table_name":"IBZVIEW",
     "system_id":"ibzlite",
     "system_name":"ibzlite",
+    "module_id":"lite",
+    "module_name":"lite",
     "fields":[
     {
     "fieldname":"VIEWID" ,
@@ -1695,6 +1721,8 @@
     "table_name":"IBZDATASET",
     "system_id":"ibzlite",
     "system_name":"ibzlite",
+    "module_id":"lite",
+    "module_name":"lite",
     "fields":[
     {
     "fieldname":"DATASETID" ,
@@ -1824,6 +1852,8 @@
     "table_name":"IBZENTITY",
     "system_id":"ibzlite",
     "system_name":"ibzlite",
+    "module_id":"lite",
+    "module_name":"lite",
     "fields":[
     {
     "fieldname":"ENTITYID" ,
@@ -2100,6 +2130,8 @@
     "table_name":"IBZFIELD",
     "system_id":"ibzlite",
     "system_name":"ibzlite",
+    "module_id":"lite",
+    "module_name":"lite",
     "fields":[
     {
     "fieldname":"FIELDID" ,
@@ -2614,6 +2646,8 @@
     "table_name":"IBZLOOKUP",
     "system_id":"ibzlite",
     "system_name":"ibzlite",
+    "module_id":"lite",
+    "module_name":"lite",
     "fields":[
     {
     "fieldname":"ID" ,
@@ -2695,6 +2729,8 @@
     "table_name":"IBZMODEL",
     "system_id":"ibzlite",
     "system_name":"ibzlite",
+    "module_id":"lite",
+    "module_name":"lite",
     "fields":[
     {
     "fieldname":"MODELID" ,
@@ -2766,6 +2802,8 @@
     "table_name":"IBZMODULE",
     "system_id":"ibzlite",
     "system_name":"ibzlite",
+    "module_id":"lite",
+    "module_name":"lite",
     "fields":[
     {
     "fieldname":"MODULEID" ,
@@ -2868,6 +2906,8 @@
     "table_name":"IBZRELATION",
     "system_id":"ibzlite",
     "system_name":"ibzlite",
+    "module_id":"lite",
+    "module_name":"lite",
     "fields":[
     {
     "fieldname":"RELATIONID" ,

ibzlite-provider/ibzlite-provider-api/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzlite-provider-api.jar
 
-EXPOSE 8081
+EXPOSE 40010
 
 ADD ibzlite-provider-api.jar /ibzlite-provider-api.jar

ibzlite-provider/ibzlite-provider-api/src/main/docker/ibzlite-provider-api.yaml

@@ -3,9 +3,23 @@ services:
   ibzlite-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzlite-provider-api:latest
     ports:
-      - "8081:8081"
+      - "40010:40010"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=40010
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.100.243:8848
+      - SPRING_REDIS_HOST=172.16.100.243
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
+      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
+      - NACOS=172.16.100.243:8848
+      - SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
     deploy:
       resources:
            limits:

ibzlite-util/src/main/java/cn/ibizlab/util/domain/DTOBase.java

 package cn.ibizlab.util.domain;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+import cn.ibizlab.util.helper.DEFieldCacheMap;
+import org.springframework.cglib.beans.BeanMap;
+import org.springframework.data.annotation.Transient;
+import org.springframework.util.StringUtils;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import lombok.Data;
 
 @Data
 public class DTOBase implements Serializable {
@@ -73,9 +77,44 @@ public class DTOBase implements Serializable {
         return extensionparams;
     }
 
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @Transient
+    private BeanMap map;
+
+    private BeanMap getMap()
+    {
+        if(map==null) {
+            map=BeanMap.create(this);
+        }
+        return  map;
+    }
+
+    public Object get(String field) {
+        String fieldRealName= DEFieldCacheMap.getFieldRealName(this.getClass(),field);
+        if(!StringUtils.isEmpty(fieldRealName)) {
+            return getMap().get(fieldRealName);
+        }
+        else {
+            return this.extensionparams.get(field.toLowerCase());
+        }
+    }
+
     @JsonAnySetter
-    public void set(String name, Object value) {
-        extensionparams.put(name.toLowerCase(), value);
+    public void set(String field, Object value) {
+        field=field.toLowerCase();
+        String fieldRealName=DEFieldCacheMap.getFieldRealName(this.getClass(),field);
+        if(!StringUtils.isEmpty(fieldRealName)) {
+            if (value == null) {
+                getMap().put(fieldRealName, null);
+            }
+            else {
+                getMap().put(fieldRealName, DEFieldCacheMap.fieldValueOf(this.getClass(), fieldRealName, value));
+            }
+        }
+        else {
+            this.extensionparams.put(field.toLowerCase(),value);
+        }
     }
 }