lab_qyk 部署微服务应用

app_web/src/locale/lanres/entities/jobs-info/jobs-info_en_US.ts

@@ -95,6 +95,22 @@ export default {
 			caption: "执行",
 			tip: "执行",
 		},
+		deuiaction4: {
+			caption: "New",
+			tip: "New",
+		},
+		deuiaction5: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		deuiaction6: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+		deuiaction7: {
+			caption: "Filter",
+			tip: "Filter",
+		},
 	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {

app_web/src/locale/lanres/entities/jobs-info/jobs-info_zh_CN.ts

@@ -94,6 +94,22 @@ export default {
 			caption: '执行',
 			tip: '执行',
 		},
+		deuiaction4: {
+			caption: '新建',
+			tip: '新建',
+		},
+		deuiaction5: {
+			caption: '编辑',
+			tip: '编辑',
+		},
+		deuiaction6: {
+			caption: '删除',
+			tip: '删除',
+		},
+		deuiaction7: {
+			caption: '过滤',
+			tip: '过滤',
+		},
 	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {

app_web/src/locale/lanres/entities/jobs-registry/jobs-registry_en_US.ts

@@ -121,4 +121,18 @@ export default {
 			tip: "Help",
 		},
 	},
+	gridviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "New",
+			tip: "New",
+		},
+		tbitem4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+	},
 };
\ No newline at end of file

app_web/src/locale/lanres/entities/jobs-registry/jobs-registry_zh_CN.ts

@@ -120,4 +120,18 @@ export default {
 			tip: '帮助',
 		},
 	},
+	gridviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: '新建',
+			tip: '新建',
+		},
+		tbitem4: {
+			caption: '编辑',
+			tip: '编辑',
+		},
+		tbitem8: {
+			caption: '删除',
+			tip: '删除',
+		},
+	},
 };
\ No newline at end of file

app_web/src/pages/task/jobs-registry-grid-view/jobs-registry-grid-view.less

 .jobs-registry-grid-view{
     position: relative;
 }
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
 
 

config.xml

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

ibztask-app/ibztask-app-web/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibztask-app-web.jar
 
-EXPOSE 8080
+EXPOSE 30005
 
 ADD ibztask-app-web.jar /ibztask-app-web.jar

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

@@ -3,9 +3,22 @@ services:
   ibztask-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibztask-app-web:latest
     ports:
-      - "8080:8080"
+      - "30005:30005"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=30005
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211: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
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
+      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits:

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

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[JOBS_INFO]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-jobs_info-74-1">
+    <changeSet author="a_A_5d9d78509" id="tab-jobs_info-78-1">
         <createTable tableName="JOBS_INFO">
                 <column name="ID" remarks="" type="BIGINT">
                     <constraints primaryKey="true" primaryKeyName="PK_JOBS_INFO_ID"/>
@@ -42,7 +42,7 @@
 
 
     <!--输出实体[JOBS_REGISTRY]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-jobs_registry-27-2">
+    <changeSet author="a_A_5d9d78509" id="tab-jobs_registry-29-2">
         <createTable tableName="JOBS_REGISTRY">
                 <column name="ID" remarks="" type="BIGINT">
                     <constraints primaryKey="true" primaryKeyName="PK_JOBS_REGISTRY_ID"/>