zhouweidong 发布系统代码 [ibz-lite，应用]

app_web/src/widgets/meta-field/edit-main-grid/edit-main-grid-base.vue

@@ -1027,7 +1027,7 @@ export default class EditMainBase extends Vue implements ControlInterface {
      * @type {string}
      * @memberof EditMainBase
      */
-    public minorSortDir: string = '';
+    public minorSortDir: string = 'ASC';
 
     /**
      * 排序字段
@@ -1035,7 +1035,7 @@ export default class EditMainBase extends Vue implements ControlInterface {
      * @type {string}
      * @memberof EditMainBase
      */
-    public minorSortPSDEF: string = '';
+    public minorSortPSDEF: string = 'showorder';
 
     /**
      * 分页条数

app_web/src/widgets/meta-field/main-grid/main-grid-base.vue

@@ -692,7 +692,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {string}
      * @memberof MainBase
      */
-    public minorSortDir: string = '';
+    public minorSortDir: string = 'ASC';
 
     /**
      * 排序字段
@@ -700,7 +700,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {string}
      * @memberof MainBase
      */
-    public minorSortPSDEF: string = '';
+    public minorSortPSDEF: string = 'showorder';
 
     /**
      * 分页条数

config.xml

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

ibzlite-app/ibzlite-app-web/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-app-web.jar
 
-EXPOSE 30010
+EXPOSE 8080
 
 ADD ibzlite-app-web.jar /ibzlite-app-web.jar

ibzlite-app/ibzlite-app-web/src/main/docker/ibzlite-app-web.yaml

@@ -3,23 +3,9 @@ services:
   ibzlite-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzlite-app-web:latest
     ports:
-      - "30010:30010"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=30010
-      - 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-core/src/main/resources/liquibase/h2_table.xml

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[BLADE_VISUAL]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-blade_visual-55-1">
+    <changeSet author="root" id="tab-blade_visual-55-1">
         <createTable tableName="blade_visual">
                 <column name="ID" remarks="" type="BIGINT">
                     <constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_ID"/>
@@ -36,7 +36,7 @@
 
 
     <!--输出实体[BLADE_VISUAL_CATEGORY]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-blade_visual_category-23-2">
+    <changeSet author="root" id="tab-blade_visual_category-23-2">
         <createTable tableName="blade_visual_category">
                 <column name="ID" remarks="" type="BIGINT">
                     <constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_CATEGORY_ID"/>
@@ -52,7 +52,7 @@
 
 
     <!--输出实体[BLADE_VISUAL_CONFIG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-blade_visual_config-18-3">
+    <changeSet author="root" id="tab-blade_visual_config-18-3">
         <createTable tableName="blade_visual_config">
                 <column name="ID" remarks="" type="BIGINT">
                     <constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_CONFIG_ID"/>
@@ -68,7 +68,7 @@
 
 
     <!--输出实体[BLADE_VISUAL_MAP]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-blade_visual_map-18-4">
+    <changeSet author="root" id="tab-blade_visual_map-18-4">
         <createTable tableName="blade_visual_map">
                 <column name="ID" remarks="" type="BIGINT">
                     <constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_MAP_ID"/>
@@ -86,7 +86,7 @@
 
 
     <!--输出实体[DST_COMPONENT]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_component-58-5">
+    <changeSet author="root" id="tab-dst_component-58-5">
         <createTable tableName="IBZCOMPONENT">
                 <column name="CID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_COMPONENT_CID"/>
@@ -112,7 +112,7 @@
 
 
     <!--输出实体[DST_CONFIG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_config-32-6">
+    <changeSet author="root" id="tab-dst_config-32-6">
         <createTable tableName="IBZCFG">
                 <column name="CFGID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_CONFIG_CFGID"/>
@@ -134,7 +134,7 @@
 
 
     <!--输出实体[DST_DATASOURCE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_datasource-59-7">
+    <changeSet author="root" id="tab-dst_datasource-59-7">
         <createTable tableName="IBZDATASOURCE">
                 <column name="DSID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_DATASOURCE_DSID"/>
@@ -152,7 +152,7 @@
 
 
     <!--输出实体[DST_ROUTER]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_router-37-8">
+    <changeSet author="root" id="tab-dst_router-37-8">
         <createTable tableName="IBZROUTER">
                 <column name="ROUTERID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_ROUTER_ROUTERID"/>
@@ -178,7 +178,7 @@
 
 
     <!--输出实体[DST_SYSTEM]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_system-41-9">
+    <changeSet author="root" id="tab-dst_system-41-9">
         <createTable tableName="IBZPSSYSTEM">
                 <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_SYSTEM_PSSYSTEMID"/>
@@ -198,7 +198,7 @@
 
 
     <!--输出实体[DST_VIEW]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_view-45-10">
+    <changeSet author="root" id="tab-dst_view-45-10">
         <createTable tableName="IBZVIEW">
                 <column name="VIEWID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_VIEW_VIEWID"/>
@@ -222,7 +222,7 @@
 
 
     <!--输出实体[META_DATASET]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_dataset-32-11">
+    <changeSet author="root" id="tab-meta_dataset-32-11">
         <createTable tableName="IBZDATASET">
                 <column name="DATASETID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_DATASET_DATASETID"/>
@@ -244,7 +244,7 @@
 
 
     <!--输出实体[META_ENTITY]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_entity-94-12">
+    <changeSet author="root" id="tab-meta_entity-94-12">
         <createTable tableName="IBZENTITY">
                 <column name="ENTITYID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_ENTITY_ENTITYID"/>
@@ -276,7 +276,7 @@
 
 
     <!--输出实体[META_FIELD]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_field-151-13">
+    <changeSet author="root" id="tab-meta_field-153-13">
         <createTable tableName="IBZFIELD">
                 <column name="FIELDID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_FIELD_FIELDID"/>
@@ -340,7 +340,7 @@
 
 
     <!--输出实体[META_MODEL]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_model-44-14">
+    <changeSet author="root" id="tab-meta_model-44-14">
         <createTable tableName="IBZMODEL">
                 <column name="MODELID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_MODEL_MODELID"/>
@@ -366,7 +366,7 @@
 
 
     <!--输出实体[META_MODULE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_module-34-15">
+    <changeSet author="root" id="tab-meta_module-34-15">
         <createTable tableName="IBZMODULE">
                 <column name="MODULEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_MODULE_MODULEID"/>
@@ -384,7 +384,7 @@
 
 
     <!--输出实体[META_RELATION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_relation-102-16">
+    <changeSet author="root" id="tab-meta_relation-102-16">
         <createTable tableName="IBZRELATION">
                 <column name="RELATIONID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_RELATION_RELATIONID"/>