MoneyQ 部署微服务接口 [后台服务，接口示例]

bc50c4b0 · ibizdev · e229d390 · bc50c4b0 · bc50c4b0 · bc50c4b0
--- a/config.xml
+++ b/config.xml
@@ -55,6 +55,23 @@
 	  git clone -b master $para2 demosys/
      export NODE_OPTIONS=--max-old-space-size=4096
      cd demosys/
+      cd demo-boot
+      mvn ibizlabcli:code
+      cd ..
+      set +e
+      git config user.name "ibizdev"
+      git add .
+      git commit -m "generator before deploy $para5"
+      git push origin master
+      git config user.name "root"
+      set -e
+      mvn package -Pboot
+      cd demo-boot
+      sed -i "s#dstimage#$para5#g" pom.xml
+      sed -i "s#dstimage#$para5#g" src/main/docker/demo-boot-demoapi.yaml
+      mvn -Pboot docker:build
+      mvn -Pboot docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/demo-boot-demoapi.yaml iBizDemo --with-registry-auth      
      </command>
    </hudson.tasks.Shell>
  </builders>

--- a/demo-boot/src/main/docker/Dockerfile
+++ b/demo-boot/src/main/docker/Dockerfile
@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
    sleep ${IBIZ_SLEEP} && \
    java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /demo-boot.jar

-EXPOSE 8081
+EXPOSE 52000

 ADD demo-boot.jar /demo-boot.jar
--- a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSGANTTS/Usr.json
+++ b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSGANTTS/Usr.json
@@ -11,6 +11,16 @@
    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
  },
  "getPSDETreeColumns" : [ {
+    "caption" : "图书名称",
+    "codeName" : "ibizbookname",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "ibizbookname",
+    "name" : "ibizbookname",
+    "width" : 200,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
+  }, {
    "caption" : "归还日期",
    "codeName" : "returntime",
    "columnType" : "DEFGRIDCOLUMN",
@@ -50,16 +60,6 @@
    "widthUnit" : "px",
    "enableExpand" : false,
    "enableSort" : false
-  }, {
-    "caption" : "图书名称",
-    "codeName" : "ibizbookname",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "ibizbookname",
-    "name" : "ibizbookname",
-    "width" : 200,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
  } ],
  "getPSDETreeNodeRSs" : [ {
    "getChildPSDETreeNode" : {

--- a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSTREEGRIDICES/TreeTable.json
+++ b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSTREEGRIDICES/TreeTable.json
@@ -19,16 +19,6 @@
    }
  } ],
  "getPSDETreeColumns" : [ {
-    "caption" : "作者",
-    "codeName" : "author",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "author",
-    "name" : "author",
-    "width" : 50,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
-  }, {
    "caption" : "图书描述",
    "codeName" : "subtext",
    "columnType" : "DEFGRIDCOLUMN",
@@ -48,6 +38,16 @@
    "widthUnit" : "px",
    "enableExpand" : false,
    "enableSort" : false
+  }, {
+    "caption" : "作者",
+    "codeName" : "author",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "author",
+    "name" : "author",
+    "width" : 50,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
  } ],
  "getPSDETreeNodeRSs" : [ {
    "getChildPSDETreeNode" : {

--- a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKDashboardView_layout.json
+++ b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKDashboardView_layout.json
@@ -1447,8 +1447,10 @@
            "itemType" : "CTRLPOS",
            "name" : "dashboard",
            "getPSLayoutPos" : {
+              "heightMode" : "FULL",
              "layout" : "BORDER",
-              "layoutPos" : "CENTER"
+              "layoutPos" : "CENTER",
+              "widthMode" : "FULL"
            },
            "showCaption" : true
          } ],

--- a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKGanttView.json
+++ b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKGanttView.json
@@ -34,6 +34,16 @@
      "id" : "GANTT"
    },
    "getPSDETreeColumns" : [ {
+      "caption" : "图书名称",
+      "codeName" : "ibizbookname",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "ibizbookname",
+      "name" : "ibizbookname",
+      "width" : 200,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
+    }, {
      "caption" : "归还日期",
      "codeName" : "returntime",
      "columnType" : "DEFGRIDCOLUMN",
@@ -73,16 +83,6 @@
      "widthUnit" : "px",
      "enableExpand" : false,
      "enableSort" : false
-    }, {
-      "caption" : "图书名称",
-      "codeName" : "ibizbookname",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "ibizbookname",
-      "name" : "ibizbookname",
-      "width" : 200,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
    } ],
    "getPSDETreeNodeRSs" : [ {
      "getChildPSDETreeNode" : {

--- a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKTreeGridExView.json
+++ b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKTreeGridExView.json
@@ -75,16 +75,6 @@
      "id" : "TREEGRIDEX"
    },
    "getPSDETreeColumns" : [ {
-      "caption" : "作者",
-      "codeName" : "author",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "author",
-      "name" : "author",
-      "width" : 50,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
-    }, {
      "caption" : "图书描述",
      "codeName" : "subtext",
      "columnType" : "DEFGRIDCOLUMN",
@@ -104,6 +94,16 @@
      "widthUnit" : "px",
      "enableExpand" : false,
      "enableSort" : false
+    }, {
+      "caption" : "作者",
+      "codeName" : "author",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "author",
+      "name" : "author",
+      "width" : 50,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
    } ],
    "getPSDETreeNodeRSs" : [ {
      "getChildPSDETreeNode" : {

--- a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKUsr2MEditView9_layout.json
+++ b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKUsr2MEditView9_layout.json
@@ -381,8 +381,8 @@
        "showCaption" : true
      }, {
        "caption" : "面板容器",
-        "contentHeight" : 80.0,
-        "height" : 80.0,
+        "contentHeight" : 50.0,
+        "height" : 50.0,
        "itemStyle" : "DEFAULT",
        "itemType" : "CONTAINER",
        "name" : "container_scroll_header1",
@@ -390,7 +390,7 @@
          "layout" : "BORDER"
        },
        "getPSLayoutPos" : {
-          "height" : 80,
+          "height" : 50,
          "heightMode" : "PX",
          "layout" : "BORDER",
          "layoutPos" : "NORTH"

--- a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderGanttView_layout.json
+++ b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderGanttView_layout.json
@@ -347,16 +347,18 @@
          "itemType" : "CTRLPOS",
          "name" : "gantt",
          "getPSLayoutPos" : {
+            "heightMode" : "FULL",
            "layout" : "BORDER",
-            "layoutPos" : "CENTER"
+            "layoutPos" : "CENTER",
+            "widthMode" : "FULL"
          },
          "showCaption" : true
        } ],
        "showCaption" : true
      }, {
        "caption" : "面板容器",
-        "contentHeight" : 80.0,
-        "height" : 80.0,
+        "contentHeight" : 50.0,
+        "height" : 50.0,
        "itemStyle" : "DEFAULT",
        "itemType" : "CONTAINER",
        "name" : "container_scroll_header1",
@@ -364,7 +366,7 @@
          "layout" : "BORDER"
        },
        "getPSLayoutPos" : {
-          "height" : 80,
+          "height" : 50,
          "heightMode" : "PX",
          "layout" : "BORDER",
          "layoutPos" : "NORTH"

--- a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderSEditView2_layout.json
+++ b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderSEditView2_layout.json
@@ -1293,8 +1293,8 @@
        "showCaption" : true
      }, {
        "caption" : "面板容器",
-        "contentHeight" : 80.0,
-        "height" : 80.0,
+        "contentHeight" : 50.0,
+        "height" : 50.0,
        "itemStyle" : "DEFAULT",
        "itemType" : "CONTAINER",
        "name" : "container_scroll_header1",
@@ -1302,7 +1302,7 @@
          "layout" : "BORDER"
        },
        "getPSLayoutPos" : {
-          "height" : 80,
+          "height" : 50,
          "heightMode" : "PX",
          "layout" : "BORDER",
          "layoutPos" : "NORTH"

--- a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderSEditView4_layout.json
+++ b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderSEditView4_layout.json
@@ -1370,8 +1370,8 @@
        "showCaption" : true
      }, {
        "caption" : "面板容器",
-        "contentHeight" : 80.0,
-        "height" : 80.0,
+        "contentHeight" : 50.0,
+        "height" : 50.0,
        "itemStyle" : "DEFAULT",
        "itemType" : "CONTAINER",
        "name" : "container_scroll_header1",
@@ -1379,7 +1379,7 @@
          "layout" : "BORDER"
        },
        "getPSLayoutPos" : {
-          "height" : 80,
+          "height" : 50,
          "heightMode" : "PX",
          "layout" : "BORDER",
          "layoutPos" : "NORTH"

--- a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderUsr2GridView.json
+++ b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderUsr2GridView.json
@@ -879,8 +879,8 @@
        "showCaption" : true
      }, {
        "caption" : "面板容器",
-        "contentHeight" : 120.0,
-        "height" : 120.0,
+        "contentHeight" : 50.0,
+        "height" : 50.0,
        "itemStyle" : "DEFAULT",
        "itemType" : "CONTAINER",
        "name" : "container_scroll_header1",
@@ -888,7 +888,7 @@
          "layout" : "BORDER"
        },
        "getPSLayoutPos" : {
-          "height" : 120,
+          "height" : 50,
          "heightMode" : "PX",
          "layout" : "BORDER",
          "layoutPos" : "NORTH"

--- a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZSample0003STabExpView_layout.json
+++ b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZSample0003STabExpView_layout.json
@@ -979,9 +979,6 @@
  "getPSDEViewCodeName" : "STabExpView_layout",
  "getPSDEViewId" : "56B4E537-B83E-4643-8466-7E9BE592874D",
  "getPSViewLayoutPanel" : {
-    "getAllPSPanelFields" : [ {
-      "id" : "view_pagecaption"
-    } ],
    "codeName" : "Layoutpanel",
    "controlType" : "VIEWLAYOUTPANEL",
    "layoutMode" : "TABLE_24COL",
@@ -996,145 +993,6 @@
      "columnCount" : 24,
      "layout" : "TABLE_24COL"
    },
-    "getRootPSPanelItems" : [ {
-      "caption" : "容器",
-      "itemStyle" : "DEFAULT",
-      "itemType" : "CONTAINER",
-      "name" : "page_container",
-      "getPSLayout" : {
-        "layout" : "FLEX"
-      },
-      "getPSLayoutPos" : {
-        "colMD" : 24,
-        "layout" : "TABLE_24COL"
-      },
-      "getPSPanelItems" : [ {
-        "caption" : "栅格容器",
-        "itemStyle" : "DEFAULT",
-        "itemType" : "CONTAINER",
-        "name" : "container_grid1",
-        "getPSLayout" : {
-          "layout" : "SIMPLEFLEX"
-        },
-        "getPSLayoutPos" : {
-          "grow" : -1,
-          "layout" : "FLEX"
-        },
-        "getPSPanelItems" : [ {
-          "caption" : "面板容器",
-          "itemStyle" : "DEFAULT",
-          "itemType" : "CONTAINER",
-          "name" : "container1",
-          "getPSLayout" : {
-            "layout" : "SIMPLEFLEX"
-          },
-          "getPSLayoutPos" : {
-            "grow" : 3,
-            "layout" : "SIMPLEFLEX"
-          },
-          "getPSPanelItems" : [ {
-            "caption" : "页面标题",
-            "itemStyle" : "DEFAULT",
-            "itemType" : "FIELD",
-            "name" : "view_pagecaption",
-            "getPSEditor" : {
-              "editorType" : "SPAN",
-              "name" : "view_pagecaption",
-              "predefinedType" : "VIEW_PAGECAPTION",
-              "renderMode" : "HEADING1",
-              "enableLinkView" : false
-            },
-            "getPSLayoutPos" : {
-              "grow" : -1,
-              "layout" : "SIMPLEFLEX"
-            },
-            "hidden" : false,
-            "showCaption" : false
-          } ]
-        }, {
-          "caption" : "面板容器",
-          "itemStyle" : "DEFAULT",
-          "itemType" : "CONTAINER",
-          "name" : "container2",
-          "getPSLayout" : {
-            "layout" : "SIMPLEFLEX"
-          },
-          "getPSLayoutPos" : {
-            "grow" : 9,
-            "layout" : "SIMPLEFLEX"
-          }
-        } ]
-      }, {
-        "caption" : "滚动条容器",
-        "itemStyle" : "DEFAULT",
-        "itemType" : "CONTAINER",
-        "name" : "container_scroll1",
-        "getPSLayout" : {
-          "layout" : "BORDER"
-        },
-        "getPSLayoutPos" : {
-          "grow" : -1,
-          "layout" : "FLEX"
-        },
-        "getPSPanelItems" : [ {
-          "caption" : "面板容器",
-          "itemStyle" : "DEFAULT",
-          "itemType" : "CONTAINER",
-          "name" : "container_scroll_main1",
-          "getPSLayout" : {
-            "layout" : "BORDER"
-          },
-          "getPSLayoutPos" : {
-            "layout" : "BORDER",
-            "layoutPos" : "CENTER"
-          },
-          "getPSPanelItems" : [ {
-            "caption" : "导航区占位",
-            "itemStyle" : "DEFAULT",
-            "itemType" : "RAWITEM",
-            "name" : "nav_pos1",
-            "getPSLayoutPos" : {
-              "layout" : "BORDER",
-              "layoutPos" : "CENTER"
-            },
-            "getPSRawItem" : {
-              "name" : "nav_pos1",
-              "predefinedType" : "NAV_POS"
-            },
-            "showCaption" : true
-          } ],
-          "showCaption" : true
-        }, {
-          "caption" : "面板容器",
-          "contentHeight" : 80.0,
-          "height" : 80.0,
-          "itemStyle" : "DEFAULT",
-          "itemType" : "CONTAINER",
-          "name" : "container_scroll_header1",
-          "getPSLayout" : {
-            "layout" : "BORDER"
-          },
-          "getPSLayoutPos" : {
-            "height" : 80,
-            "heightMode" : "PX",
-            "layout" : "BORDER",
-            "layoutPos" : "NORTH"
-          },
-          "getPSPanelItems" : [ {
-            "caption" : "分页导航面板",
-            "itemStyle" : "DEFAULT",
-            "itemType" : "CTRLPOS",
-            "name" : "tabexppanel",
-            "getPSLayoutPos" : {
-              "layout" : "BORDER",
-              "layoutPos" : "CENTER"
-            },
-            "showCaption" : true
-          } ],
-          "showCaption" : true
-        } ]
-      } ]
-    } ],
    "layoutBodyOnly" : true,
    "layoutPanel" : true,
    "useDefaultLayout" : false,

--- a/demo-core/src/main/resources/liquibase/h2_table.xml
+++ b/demo-core/src/main/resources/liquibase/h2_table.xml
@@ -172,7 +172,7 @@


    <!--输出实体[IBIZBOOK]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-316-7">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-320-7">
        <createTable tableName="T_IBIZBOOK">
                <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                </column>
@@ -340,7 +340,7 @@


    <!--输出实体[IBIZORDER]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-453-14">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-463-14">
        <createTable tableName="T_IBIZORDER">
                <column name="TP" remarks="" type="TEXT(1048576)">
                </column>
@@ -640,7 +640,7 @@


    <!--输出实体[IBIZSAMPLE0003]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizsample0003-61-21">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizsample0003-69-21">
        <createTable tableName="T_IBIZSAMPLE0003">
                <column name="IBIZSAMPLE0003NAME" remarks="" type="VARCHAR(200)">
                </column>

--- a/demo-core/src/main/resources/liquibase/view.xml
+++ b/demo-core/src/main/resources/liquibase/view.xml
@@ -37,7 +37,7 @@
         </createView>
     </changeSet>
        <!--输出实体[IBIZORDER]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizorder-453-8" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizorder-463-8" runOnChange="true">
         <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZORDER">
               <![CDATA[ SELECT t1.[AMOUNT], t1.[CREATEDATE], t1.[CREATEMAN], t1.[DETAILNUM], t1.[IBIZCUSTOMERID], t11.[IBIZCUSTOMERNAME], t1.[IBIZORDERID], t1.[IBIZORDERNAME], t1.[MEMO], t1.[ORDERSTATE], t1.[ORDERTIME], t1.[ORDERTYPE], t1.[ORDERUID], t1.[UPDATEDATE], t1.[UPDATEMAN], t1.[WFINSTANCEID], t1.[WFSTATE], t1.[WFSTEP] FROM [T_IBIZORDER] t1  LEFT JOIN T_IBIZCUSTOMER t11 ON t1.IBIZCUSTOMERID = t11.IBIZCUSTOMERID  ]]>
         </createView>
@@ -79,7 +79,7 @@
         </createView>
     </changeSet>
        <!--输出实体[IBIZSAMPLE0003]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizsample0003-61-15" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizsample0003-69-15" runOnChange="true">
         <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZSAMPLE0003">
               <![CDATA[ SELECT t1.[CREATEDATE], t1.[CREATEMAN], t1.[FIELD01], t1.[IBIZSAMPLE0003ID], t1.[IBIZSAMPLE0003NAME], t1.[MEMO], t1.[PIBIZSAMPLE0003ID], t11.[IBIZSAMPLE0003NAME] AS [PIBIZSAMPLE0003NAME], t1.[UPDATEDATE], t1.[UPDATEMAN] FROM [T_IBIZSAMPLE0003] t1  LEFT JOIN T_IBIZSAMPLE0003 t11 ON t1.PIBIZSAMPLE0003ID = t11.IBIZSAMPLE0003ID  ]]>
         </createView>