ibiz4j 发布系统代码

app_Web/package.json

@@ -27,7 +27,7 @@
     "file-saver": "^2.0.2",
     "font-awesome": "^4.7.0",
     "ibiz-gantt-elastic": "^1.0.15",
-    "ibiz-vue-lib": "^0.1.9",
+    "ibiz-vue-lib": "^0.1.10",
     "interactjs": "^1.9.4",
     "moment": "^2.24.0",
     "path-to-regexp": "^6.1.0",

app_Web/src/components/ibiz-group-picker/ibiz-group-picker.vue

@@ -4,7 +4,7 @@
             <div v-if="showTree" class="ibiz-group-tree">
                 <ibiz-select-tree :NodesData="treeItems" v-model="treeSelectVal" :treeOnly="true" :defaultChecked="true" @select="treeSelect"></ibiz-select-tree>
             </div>
-            <div class="ibiz-group-content">
+            <div class="ibiz-group-content" :style="{width:showTree?'calc(100% - 400px)':'100%'}">
                 <ibiz-group-card :data="cardItems" text="label" value="id" groupName="group" :multiple="multiple" :defaultSelect="cardSelctVal" @select="groupSelect"></ibiz-group-card>
             </div>
         </div>
@@ -275,26 +275,29 @@ export default class IBizGroupPicker extends Vue {
 </script>
 
 <style lang="less">
-.ibiz-group-container {
-    display: flex;
-    height: calc(100% - 65px);
-    .ibiz-group-tree {
-        width: 400px;
-        border-right: 1px solid #ddd;
-        padding: 0 10px;
-        overflow: auto;
-        height: 100%;
+.ibiz-group-picker{
+    height:100%;
+    .ibiz-group-container {
+        display: flex;
+        height: calc(100% - 65px);
+        .ibiz-group-tree {
+            width: 400px;
+            border-right: 1px solid #ddd;
+            padding: 0 10px;
+            overflow: auto;
+            height: 100%;
+        }
+        .ibiz-group-content {
+            flex-grow: 1;
+            padding: 0 10px;
+            overflow: auto;
+            height: 100%;
+        }
     }
-    .ibiz-group-content {
-        flex-grow: 1;
-        padding: 0 10px;
-        overflow: auto;
-        height: 100%;
+    .ibiz-group-footer {
+        padding: 16px;
+        text-align: right;
+        border-top: 1px solid #ddd;
     }
 }
-.ibiz-group-footer {
-    padding: 16px;
-    text-align: right;
-    border-top: 1px solid #ddd;
-}
 </style>
\ No newline at end of file

config.xml

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

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

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

@@ -3,21 +3,9 @@ services:
   ibzrt-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzrt-app-web:latest
     ports:
-      - "30000:30000"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=30000
-      - 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
     deploy:
       mode: replicated
       replicas: 1

ibzrt-core/pom.xml

@@ -92,6 +92,12 @@
             <artifactId>liquibase-core</artifactId>
         </dependency>
 
+        <!--xxl-job定时服务 -->
+        <dependency>
+            <groupId>com.xuxueli</groupId>
+            <artifactId>xxl-job-core</artifactId>
+        </dependency>
+
 	</dependencies>
 
     <properties>

ibzrt-dependencies/pom.xml

@@ -317,12 +317,6 @@
             <artifactId>h2</artifactId>
         </dependency>
 
-        <!--xxl-job定时服务 -->
-        <dependency>
-            <groupId>com.xuxueli</groupId>
-            <artifactId>xxl-job-core</artifactId>
-        </dependency>
-
         <!--  Error -->
 
         <!--  Security  -->