lab_qyk 发布系统代码

app_web/package.json

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

app_web/src/components/app-group-picker/app-group-picker.vue

@@ -20,13 +20,13 @@ import { Component, Vue, Prop, Watch } from 'vue-property-decorator';
 import { Subject } from 'rxjs';
 import { Http } from '../../utils';
 @Component({})
-export default class IBizGroupPicker extends Vue {
+export default class AppGroupPicker extends Vue {
 
     /**
      * 视图上下文参数
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     @Prop() viewdata: any;
 
@@ -34,7 +34,7 @@ export default class IBizGroupPicker extends Vue {
      * 视图参数
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     @Prop() viewparam: any;
 
@@ -42,7 +42,7 @@ export default class IBizGroupPicker extends Vue {
      * 多选
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected multiple: boolean = false;
 
@@ -50,7 +50,7 @@ export default class IBizGroupPicker extends Vue {
      * 加载树url
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected treeurl:any;
 
@@ -58,7 +58,7 @@ export default class IBizGroupPicker extends Vue {
      * 加载人员url
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected url:any;
 
@@ -66,7 +66,7 @@ export default class IBizGroupPicker extends Vue {
      * 树数据集
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected treeItems: any[] = [];
 
@@ -74,7 +74,7 @@ export default class IBizGroupPicker extends Vue {
      * 分组表数据集
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected cardItems: any[] = [];
 
@@ -82,7 +82,7 @@ export default class IBizGroupPicker extends Vue {
      * 视图上下文参数对象
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected viewData: any;
 
@@ -90,7 +90,7 @@ export default class IBizGroupPicker extends Vue {
      * 视图参数对象
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected viewParam: any;
 
@@ -98,7 +98,7 @@ export default class IBizGroupPicker extends Vue {
      * 树选中值
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected treeSelectVal: string = '';
 
@@ -106,7 +106,7 @@ export default class IBizGroupPicker extends Vue {
      * 分组表选中集合
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected cardSelctVal: any = [];
 
@@ -114,7 +114,7 @@ export default class IBizGroupPicker extends Vue {
      * 数据选中集合
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected selects: any[] = [];
 
@@ -122,7 +122,7 @@ export default class IBizGroupPicker extends Vue {
      * 是否显示树
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     get showTree() {
         if(this.viewParam) {
@@ -134,7 +134,7 @@ export default class IBizGroupPicker extends Vue {
      * 生命周期
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     public created() {
         if(!this.viewdata || !this.viewparam) {
@@ -158,7 +158,7 @@ export default class IBizGroupPicker extends Vue {
      * 加载数据
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     public load() {
         if(this.showTree) {
@@ -172,7 +172,7 @@ export default class IBizGroupPicker extends Vue {
      * 加载树数据
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     public loadTree() {
         let orgid = this.viewParam.filtervalue;
@@ -191,7 +191,7 @@ export default class IBizGroupPicker extends Vue {
      * 加载分组表数据
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     public loadGroupData(key: string) {
         let tempUrl = this.url.replace('${selected-orgid}',key);
@@ -209,7 +209,7 @@ export default class IBizGroupPicker extends Vue {
      * 树选中
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     public treeSelect(event: any) {
         if(!event || JSON.parse(event).length == 0) {
@@ -223,7 +223,7 @@ export default class IBizGroupPicker extends Vue {
      * 分组表选中
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     public groupSelect(event: any) {
         if (!event || !event.select) {
@@ -255,7 +255,7 @@ export default class IBizGroupPicker extends Vue {
      * 确认
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     public onOK() {
         this.$emit('close', this.selects);
@@ -265,7 +265,7 @@ export default class IBizGroupPicker extends Vue {
      * 取消
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     public onCancel() {
         this.$emit('close');

app_web/src/components/app-group-select/app-group-select.vue

@@ -23,12 +23,12 @@ import { Component, Vue, Prop, Watch } from 'vue-property-decorator';
 import { Subject } from 'rxjs';
 
 @Component({})
-export default class IBizGroupSelect extends Vue {
+export default class AppGroupSelect extends Vue {
     /**
      * 名称标识
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() name!: string;
 
@@ -36,7 +36,7 @@ export default class IBizGroupSelect extends Vue {
      * 树加载地址
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() treeurl?:boolean;
 
@@ -44,7 +44,7 @@ export default class IBizGroupSelect extends Vue {
      * 数据接口地址
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() url!: string;
 
@@ -52,7 +52,7 @@ export default class IBizGroupSelect extends Vue {
      * 多选
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop({default: false}) multiple?: boolean;
 
@@ -60,7 +60,7 @@ export default class IBizGroupSelect extends Vue {
      * 数据对象
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() data: any;
 
@@ -68,7 +68,7 @@ export default class IBizGroupSelect extends Vue {
      * 过滤属性标识
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() filter?: string;
 
@@ -76,7 +76,7 @@ export default class IBizGroupSelect extends Vue {
      * 是否启用
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() disabled?: boolean;
 
@@ -84,7 +84,7 @@ export default class IBizGroupSelect extends Vue {
      * 值
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() value: any;
 
@@ -92,7 +92,7 @@ export default class IBizGroupSelect extends Vue {
      * 上下文参数
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() context: any;
 
@@ -100,7 +100,7 @@ export default class IBizGroupSelect extends Vue {
      * 关联属性
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() valueitem: any;
 
@@ -108,7 +108,7 @@ export default class IBizGroupSelect extends Vue {
      * 填充属性
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() fillmap: any;
 
@@ -116,7 +116,7 @@ export default class IBizGroupSelect extends Vue {
      * 选中项集合
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     protected selects: any[] = [];
 
@@ -124,7 +124,7 @@ export default class IBizGroupSelect extends Vue {
      * 值变化
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Watch('value')
     onValueChange(newVal: any) {
@@ -154,7 +154,7 @@ export default class IBizGroupSelect extends Vue {
      * 单选时选中名称
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     get selectName() {
         if(this.selects.length > 0) {
@@ -166,7 +166,7 @@ export default class IBizGroupSelect extends Vue {
      * 打开选择视图
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     public openView() {
         const view: any = {
@@ -208,7 +208,7 @@ export default class IBizGroupSelect extends Vue {
      * 选择视图关闭
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     public openViewClose(result: any) {
         this.selects = [];
@@ -222,7 +222,7 @@ export default class IBizGroupSelect extends Vue {
      * 数据删除
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     public remove(item: any) {
         this.selects.splice(this.selects.indexOf(item), 1);
@@ -233,7 +233,7 @@ export default class IBizGroupSelect extends Vue {
      * 设置值
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     public setValue() {
         let item: any = {};

config.xml

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

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

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

@@ -3,22 +3,9 @@ services:
   ibzou-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-app-web:latest
     ports:
-      - "30001:30001"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=30001
-      - 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: