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

app_web/src/pages/lite/meta-dynamic-model-edit-view/meta-dynamic-model-edit-view-base.vue

@@ -259,6 +259,7 @@ export default class MetaDynamicModelEditViewBase extends Vue {
 	 * @memberof MetaDynamicModelEditViewBase
 	 */
     public customViewNavContexts:any ={
+    "PDYNAINSTID":{"isRawValue":false,"value":"metadynamicmodel"}
     };
 
 	/**

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-k8s.yaml

@@ -22,34 +22,7 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzlite-app-web:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 30010
-        env:
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
-          value: "172.16.180.237"      
-        - name: SERVER_PORT
-          value: "30010"
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
-          value: "172.16.100.243:8848"
-        - name: SPRING_REDIS_HOST
-          value: "172.16.100.243"
-        - name: SPRING_REDIS_PORT
-          value: "6379"
-        - name: SPRING_REDIS_DATABASE
-          value: "0"
-        - name: SPRING_DATASOURCE_USERNAME
-          value: "a_A_5d9d78509"
-        - name: SPRING_DATASOURCE_PASSWORD
-          value: "@6dEfb3@"
-        - name: SPRING_DATASOURCE_URL
-          value: "jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true"
-        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
-          value: "com.mysql.jdbc.Driver"
-        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
-          value: "a_A_5d9d78509"
-        - name: NACOS
-          value: "172.16.100.243:8848"      
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_GROUP
-          value: "ibizdev"      
+        - containerPort: 8080
         volumeMounts:
         - name: data
           mountPath: /app/file
@@ -69,9 +42,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 30010
-    targetPort: 30010
-    nodePort: 30010
+    port: 8080
+    targetPort: 8080
+    nodePort: 8080
     protocol: TCP
   selector:
     app: ibzlite-app-web

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

@@ -244,7 +244,7 @@
 
 
     <!--输出实体[META_DYNAMICMODEL]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_dynamicmodel-95-12">
+    <changeSet author="a_A_5d9d78509" id="tab-meta_dynamicmodel-96-12">
         <createTable tableName="IBZDYNAMICMODEL">
                 <column name="DYNAINSTID" remarks="" type="VARCHAR(100)">
                 </column>
@@ -448,10 +448,10 @@
         <!--输出实体[DST_VIEW]外键关系 -->
         <!--输出实体[META_DATASET]外键关系 -->
         <!--输出实体[META_DYNAMICMODEL]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-meta_dynamicmodel-95-18">
+    <changeSet author="a_A_5d9d78509" id="fk-meta_dynamicmodel-96-18">
        <addForeignKeyConstraint baseColumnNames="SYSTEMID" baseTableName="IBZDYNAMICMODEL" constraintName="DER1N_META_DYNAMICMODEL_DST_SY" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PSSYSTEMID" referencedTableName="IBZPSSYSTEM" validate="true"/>
     </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-meta_dynamicmodel-95-19">
+    <changeSet author="a_A_5d9d78509" id="fk-meta_dynamicmodel-96-19">
        <addForeignKeyConstraint baseColumnNames="PDYNAINSTID" baseTableName="IBZDYNAMICMODEL" constraintName="DER1N_META_DYNAMICMODEL_META_D" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONFIGID" referencedTableName="IBZDYNAMICMODEL" validate="true"/>
     </changeSet>
         <!--输出实体[META_ENTITY]外键关系 -->