lab_qyk 发布系统代码

app_web/src/components/app-checkbox-list/app-checkbox-list.vue

@@ -276,7 +276,7 @@ export default class AppCheckBox extends Vue {
               this.codeListService.getItems(this.tag,_context,_param).then((res:any) => {
                   this.items = res;
               }).catch((error:any)=>{
-                  console.log(`----${this.tag}----${(this.$t('components.appCheckBoxList.notExist') as string)}`);
+                  console.log(`----${this.tag}----${(this.$t('app.commonWords.codeNotExist') as string)}`);
               })
           }
       }

app_web/src/components/app-column-link/app-column-link.vue

@@ -191,7 +191,7 @@ export default class AppColumnLink extends Vue {
     private openRedirectView($event: any, view: any, data: any): void {
         this.$http.get(view.url, data).then((response: any) => {
             if (!response || response.status !== 200) {
-                this.$Notice.error({ title: (this.$t('components.appColumnLink.error') as string), desc: (this.$t('components.appColumnLink.requestError') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.error') as string), desc: (this.$t('app.commonWords.reqException') as string) });
             }
             if (response.status === 401) {
                 return;
@@ -243,7 +243,7 @@ export default class AppColumnLink extends Vue {
             }
         }).catch((response: any) => {
             if (!response || !response.status || !response.data) {
-                this.$Notice.error({ title: (this.$t('components.appColumnLink.error') as string), desc: (this.$t('components.appColumnLink.systemError') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.error') as string), desc: (this.$t('app.commonWords.reqException') as string) });
                 return;
             }
             if (response.status === 401) {

app_web/src/components/app-data-upload/app-data-upload.vue

@@ -443,13 +443,13 @@ export default class AppDataUploadView extends Vue {
                 if (codelist) {
                     resolve([...JSON.parse(JSON.stringify(codelist.items))]);
                 } else {
-                    console.log(`----${codeListObject.tag}----${(this.$t('components.appDataUpload.notExist') as string)}`);
+                    console.log(`----${codeListObject.tag}----${(this.$t('app.commonWords.codeNotExist') as string)}`);
                 }
             }else if(codeListObject.tag && Object.is(codeListObject.type,"DYNAMIC")){
                 this.codeListService.getItems(codeListObject.tag).then((res:any) => {
                     resolve(res);
                 }).catch((error:any) => {
-                    console.log(`----${codeListObject.tag}----${(this.$t('components.appDataUpload.notExist') as string)}`);
+                    console.log(`----${codeListObject.tag}----${(this.$t('app.commonWords.codeNotExist') as string)}`);
                 });
             }
         })

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

@@ -131,7 +131,7 @@ export default class AppDepartmentSelect extends Vue {
           this.$store.commit('addDepData', { srfkey: this.filter, orgData: response.data });
       }).catch((response: any) => {
           if (!response || !response.status || !response.data) {
-              this.$Notice.error({ title: (this.$t('components.appDepartmentSelect.error') as string), desc: (this.$t('components.appDepartmentSelect.systemError') as string) });
+              this.$Notice.error({ title: (this.$t('app.commonWords.error') as string), desc: (this.$t('app.commonWords.sysException') as string) });
               return;
           }
       });

app_web/src/components/app-export-excel/app-export-excel.vue

@@ -107,18 +107,18 @@ export default class AppExportExcel extends Vue {
             this.visible = false;
         } else if (Object.is(type, 'custom')) {
             if (!this.startPage || !this.endPage) {
-                this.$Notice.warning({ title: (this.$t('components.appExportExcel.warning') as string), desc: (this.$t('components.appExportExcel.desc') as string) });
+                this.$Notice.warning({ title: (this.$t('app.commonWords.warning') as string), desc: (this.$t('components.appExportExcel.desc') as string) });
                 return;
             }
             const startPage: any = Number.parseInt(this.startPage, 10);
             const endPage: any = Number.parseInt(this.endPage, 10);
             if (Number.isNaN(startPage) || Number.isNaN(endPage)) {
-                this.$Notice.warning({ title: (this.$t('components.appExportExcel.warning') as string), desc: (this.$t('components.appExportExcel.desc1') as string) });
+                this.$Notice.warning({ title: (this.$t('app.commonWords.warning') as string), desc: (this.$t('components.appExportExcel.desc1') as string) });
                 return;
             }
 
             if (startPage < 1 || endPage < 1 || startPage > endPage) {
-                this.$Notice.warning({ title: (this.$t('components.appExportExcel.warning') as string), desc: (this.$t('components.appExportExcel.desc1') as string) });
+                this.$Notice.warning({ title: (this.$t('app.commonWords.warning') as string), desc: (this.$t('components.appExportExcel.desc1') as string) });
                 return;
             }
             this.startPage = null;

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

@@ -9,8 +9,8 @@
             </div>
         </div>
         <div class="ibiz-group-footer">
-            <el-button size="small" type="primary" @click="onOK">{{$t('components.appGroupPicker.ok')}}</el-button>
-            <el-button size="small" @click="onCancel">{{$t('components.appGroupPicker.cancel')}}</el-button>
+            <el-button size="small" type="primary" @click="onOK">{{$t('app.commonWords.ok')}}</el-button>
+            <el-button size="small" @click="onCancel">{{$t('app.commonWords.cancel')}}</el-button>
         </div>
     </div>
 </template>

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

@@ -88,7 +88,7 @@ export default class AppRadioGroup extends Vue {
               this.codeListService.getItems(this.tag,_context,_param).then((res:any) => {
                   this.items = res;
               }).catch((error:any)=>{
-                  console.log(`----${this.tag}----${(this.$t('components.appRadioGroup.notExist') as string)}`);
+                  console.log(`----${this.tag}----${(this.$t('app.commonWords.codeNotExist') as string)}`);
               })
           }
       }
@@ -204,7 +204,7 @@ export default class AppRadioGroup extends Vue {
             this.codeListService.getItems(this.tag,_context,_param).then((res:any) => {
                 this.items = res;
             }).catch((error:any)=>{
-                console.log(`----${this.tag}----${(this.$t('components.appRadioGroup.notExist') as string)}`);
+                console.log(`----${this.tag}----${(this.$t('app.commonWords.codeNotExist') as string)}`);
             })
         }
     }

app_web/src/components/app-transfer/app-transfer.vue

@@ -174,7 +174,7 @@ export default class AppTransfer extends Vue {
             this.dataLeft = [...JSON.parse(JSON.stringify(codelist.items))];
             this.initData()
         } else {
-            console.log(`----${this.tag}----${(this.$t('components.appTransfer.notExist') as string)}`);
+            console.log(`----${this.tag}----${(this.$t('app.commonWords.codeNotExist') as string)}`);
         }
         } else if (this.tag && Object.is(this.codelistType, "DYNAMIC")) {
             // 处理公共参数
@@ -190,7 +190,7 @@ export default class AppTransfer extends Vue {
                     this.initData()
                 })
                 .catch((error: any) => {
-                    console.log(`----${this.tag}----${(this.$t('components.appTransfer.notExist') as string)}`);
+                    console.log(`----${this.tag}----${(this.$t('app.commonWords.codeNotExist') as string)}`);
                 });
         }
     }

app_web/src/components/app-update-password/app-update-password.vue

@@ -136,7 +136,7 @@ export default class AppUpdatePassword extends Vue {
             }
         }).catch((error: any) =>{
             this.$Notice.error({
-                title: (this.$t('components.appUpdatePassword.error') as string),
+                title: (this.$t('app.codeNotExist.sysException') as string),
                 duration: 3
             });
             console.error(error);

app_web/src/components/codelist/codelist.vue

@@ -192,7 +192,7 @@ export default class CodeList extends Vue {
               let items = res;
               _this.setItems(items, _this);
           }).catch((error: any) => {
-              console.log(`----${_this.tag}----${(this.$t('components.codeList.notExist') as string)}`);
+              console.log(`----${_this.tag}----${(this.$t('app.commonWords.codeNotExist') as string)}`);
           });
       // 静态处理
       } else if(Object.is(this.codelistType, "STATIC")){

app_web/src/components/dropdown-list-dynamic/dropdown-list-dynamic.vue

@@ -201,7 +201,7 @@ export default class DropDownListDynamic extends Vue {
           if (codelist) {
               this.items = [...JSON.parse(JSON.stringify(codelist.items))];
           } else {
-              console.log(`----${this.tag}----${(this.$t('components.dropDownListDynamic.notExist') as string)}`);
+              console.log(`----${this.tag}----${(this.$t('app.commonWords.codeNotExist') as string)}`);
           }
       }else if(this.tag && Object.is(this.codelistType,"DYNAMIC")){
           // 公共参数处理
@@ -213,7 +213,7 @@ export default class DropDownListDynamic extends Vue {
           this.codeListService.getItems(this.tag,_context,_param).then((res:any) => {
               this.items = res;
           }).catch((error:any) => {
-              console.log(`----${this.tag}----${(this.$t('components.dropDownListDynamic.notExist') as string)}`);
+              console.log(`----${this.tag}----${(this.$t('app.commonWords.codeNotExist') as string)}`);
           });
       }
     }
@@ -236,7 +236,7 @@ export default class DropDownListDynamic extends Vue {
                 this.codeListService.getItems(this.tag,_context,_param).then((res:any) => {
                     this.items = res;
                 }).catch((error:any) => {
-                    console.log(`----${this.tag}----${(this.$t('components.dropDownListDynamic.notExist') as string)}`);
+                    console.log(`----${this.tag}----${(this.$t('app.commonWords.codeNotExist') as string)}`);
                 });
             }
         }

app_web/src/components/dropdown-list-mpicker/dropdown-list-mpicker.vue

@@ -187,7 +187,7 @@ export default class DropDownListMpicker extends Vue {
           if (codelist) {
               this.items = [...JSON.parse(JSON.stringify(codelist.items))];
           } else {
-              console.log(`----${this.tag}----${(this.$t('components.dropDownListMpicker.notExist') as string)}`);
+              console.log(`----${this.tag}----${(this.$t('app.commonWords.codeNotExist') as string)}`);
           }
       }else if(this.tag && Object.is(this.codelistType,"DYNAMIC")){
           // 公共参数处理
@@ -199,7 +199,7 @@ export default class DropDownListMpicker extends Vue {
           this.codeListService.getItems(this.tag,_context,_param).then((res:any) => {
               this.items = res;
           }).catch((error:any) => {
-              console.log(`----${this.tag}----${(this.$t('components.dropDownListMpicker.notExist') as string)}`);
+              console.log(`----${this.tag}----${(this.$t('app.commonWords.codeNotExist') as string)}`);
           });
       }
     }
@@ -221,7 +221,7 @@ export default class DropDownListMpicker extends Vue {
             this.codeListService.getItems(this.tag,_context,_param).then((res:any) => {
                 this.items = res;
             }).catch((error:any) => {
-                console.log(`----${this.tag}----${(this.$t('components.dropDownListMpicker.notExist') as string)}`);
+                console.log(`----${this.tag}----${(this.$t('app.commonWords.codeNotExist') as string)}`);
             });
         }
     }

app_web/src/components/dropdown-list/dropdown-list.vue

@@ -201,7 +201,7 @@ export default class DropDownList extends Vue {
           if (codelist) {
               this.items = [...JSON.parse(JSON.stringify(codelist.items))];
           } else {
-              console.log(`----${this.tag}----${(this.$t('components.dropDownList.notExist') as string)}`);
+              console.log(`----${this.tag}----${(this.$t('app.commonWords.codeNotExist') as string)}`);
           }
       }else if(this.tag && Object.is(this.codelistType,"DYNAMIC")){
           // 公共参数处理
@@ -213,7 +213,7 @@ export default class DropDownList extends Vue {
           this.codeListService.getItems(this.tag,_context,_param).then((res:any) => {
               this.items = res;
           }).catch((error:any) => {
-              console.log(`----${this.tag}----${(this.$t('components.dropDownList.notExist') as string)}`);
+              console.log(`----${this.tag}----${(this.$t('app.commonWords.codeNotExist') as string)}`);
           });
       }
     }
@@ -236,7 +236,7 @@ export default class DropDownList extends Vue {
                 this.codeListService.getItems(this.tag,_context,_param).then((res:any) => {
                     this.items = res;
                 }).catch((error:any) => {
-                    console.log(`----${this.tag}----${(this.$t('components.dropDownList.notExist') as string)}`);
+                    console.log(`----${this.tag}----${(this.$t('app.commonWords.codeNotExist') as string)}`);
                 });
             }
         }

app_web/src/components/input-box/input-box.vue

@@ -192,7 +192,6 @@ export default class InputBox extends Vue {
    * 指定输入框展示值的格式
    */
   public formatter(value:any){
-    console.log(this.precision);
     if(this.precision===0) return this.CurrentVal;
     if(value.indexOf('.')!==-1){
       let arr:Array<any> = value.split('.');
@@ -210,7 +209,6 @@ export default class InputBox extends Vue {
    * 指定从 formatter 里转换回数字的方式
    */
   public parser(value:any){
-    if(this.precision===0) return this.CurrentVal;
     return value;
   }
 }

app_web/src/components/tab-page-exp/tab-page-exp.vue

@@ -21,7 +21,7 @@
     <div v-show="$store.state.pageMetas.length > 0" class="right">
       <el-dropdown @command="handlerClose">
         <el-button size="mini" type="primary">
-          更多<i class="el-icon-arrow-down el-icon--right"></i>
+          {{$t('components.tabPageExp.more')}}<i class="el-icon-arrow-down el-icon--right"></i>
         </el-button>
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item :command="item" v-for="(item,index) in actions" :key="index">{{ $t(item.text) }}</el-dropdown-item>

app_web/src/components/upload-file/upload-file.vue

@@ -20,8 +20,8 @@
           :on-exceeded-size="exceededsize" 
           :on-progress="progress">
             <div class="upload-text">
-                <p>将图片拖到这里替换</p>
-                <p><span class="text-style">本地上传</span>或<span class="text-style">从素材库选择</span></p>
+                <p>{{$t('components.uploadFile.imgMsg')}}</p>
+                <p><span class="text-style">{{$t('components.uploadFile.localUpload')}}</span>{{$t('components.uploadFile.or')}}<span class="text-style">{{$t('components.uploadFile.imgMsg1')}}</span></p>
             </div>
         </upload>
     </div>

app_web/src/locale/lang/en-US.ts

@@ -16,6 +16,10 @@ export default {
             success: "Success",
             ok: "OK",
             cancel: "Cancel",
+            codeNotExist: 'Code list does not exist',
+            reqException: "Request exception",
+            sysException: "System abnormality",
+            warning: "Warning",
         },
         local:{
             new: "New"

app_web/src/locale/lang/zh-CN.ts

@@ -16,6 +16,10 @@ export default {
             success: "成功",
             ok: "确认",
             cancel: "取消",
+            codeNotExist: "代码表不存在",
+            reqException: "请求异常",
+            sysException: "系统异常",
+            warning: "警告",
         },
         local:{
             new: "新建"

app_web/src/locale/lanres/components/components_en_US.ts

@@ -55,6 +55,8 @@ export default {
       max: 'At Most',
       row: 'Lines',
       currentPage: 'Current Page',
+      desc:'Please enter the start page',
+      desc1:'Please enter a valid start page',
     },
     appFileUpload: {
       preview: 'preview',
@@ -64,6 +66,11 @@ export default {
     },
     appFormDRUIPart: {
       blockUITipInfo: 'Please save the major data first',
+      viewLoadComp:'After the multi data view is loaded, the subsequent form item update will be triggered',
+      save:'Relationship data save complete',
+      change:'Relationship data value change',
+      change1:'View data changes',
+      loadComp:'View loading complete',
     },
     appHeaderMenus: {
       ibizlab:{
@@ -130,19 +137,25 @@ export default {
       endPlaceholder: 'End Dat4e',
     },
     dropDownList: {
-      placeholder: 'please select...'
+      placeholder: 'please select...',
     },
     dropDownListDynamic: {
-      placeholder: 'please select...'
+      placeholder: 'please select...',
     },
     dropDownListMpicker: {
-      placeholder: 'please select...'
+      placeholder: 'please select...',
     },
     login: {
       error: 'Error',
       caption: 'Welcome to login',
+      placeholder1:'User name',
+      placeholder2:'Password',
       name: 'Login',
+      reset:'Reset',
+      other:'Other login methods',
       tip: 'Enter username and password',
+      warning1:'QQ authorization login not supported',
+      warning2:'Wechat authorized login not supported',
       loginname: {
           placeholder: 'Username',
           message: 'The username cannot be empty',
@@ -174,4 +187,65 @@ export default {
       hide: 'hide',
       showMore: 'show more',
     },
+    appUpdatePassword: {
+      oldPwd: 'Original password',
+      newPwd: 'New password',
+      confirmPwd: 'Confirm password',
+      sure: 'Confirm modification',
+      oldPwdErr: 'The original password cannot be empty!',
+      newPwdErr: 'New password cannot be empty!',
+      confirmPwdErr: 'The two input passwords are inconsistent!',
+    },
+    appAddressSelection: {
+      loadDataFail: 'City data loading failed'
+    },
+    appGroupSelect:{
+      groupSelect:'Group selection', 
+    },
+    appImageUpload:{
+      uploadFail:'Upload failed'
+    },
+    appOrgSelect:{
+      loadFail:'Failed to load data'
+    },
+    appTransfer:{
+      title1:'Not selected',
+      title2:'Selected',
+    },
+    appWFApproval:{
+      commit:'Commit',
+      wait:'Waiting',
+      handle:'Handle',
+      placeholder:'Please enter the content',
+      end:'End'
+    },
+    contextMenuDrag:{
+      allApp:'All applications',
+      noFind:'The app was not found'
+    },
+    filterMode:{
+      placeholder:'Conditional logic',  
+    },
+    filterTree:{
+      title1:'Add condition',
+      title2:'Add group',
+      placeholder:'Attribute', 
+    },
+    iBizGroupPicker:{
+      ok:'Ok',
+      cancel:'Cancel',
+    },
+    iBizGroupSelect:{
+      groupSelect:'Group selection'
+    },
+    tabPageExp:{
+      more:'More',
+    },
+    uploadFile:{
+      imgMsg:'Drag the picture here to replace it',
+      localUpload:'Local upload',
+      or:'Or',
+      imgMsg1:'Select from stock'
+    }
+
 };
\ No newline at end of file

app_web/src/locale/lanres/components/components_zh_CN.ts

@@ -25,7 +25,7 @@ export default {
     appColumnLink: {
       error: '错误',
       valueItemException:"值项异常",
-      rowDataException:"表格行数据异常"
+      rowDataException:"表格行数据异常",
     },
     appColumnRender: {
       select: '请选择...',
@@ -55,6 +55,8 @@ export default {
       max: '最大',
       row: '行',
       currentPage: '当前页',
+      desc:'请输入起始页',
+      desc1:'请输入有效的起始页',
     },
     appFileUpload: {
       preview: '查看',
@@ -65,6 +67,11 @@ export default {
     },
     appFormDRUIPart: {
       blockUITipInfo: '请先保存主数据',
+      viewLoadComp:'多数据视图加载完成，触发后续表单项更新',
+      save:'关系数据保存完成',
+      change:'关系数据值变化',
+      change1:'视图数据变化',
+      loadComp:'视图加载完成',
     },
     appHeaderMenus: {
       ibizlab:{
@@ -131,19 +138,25 @@ export default {
       endPlaceholder: '结束日期',
     },
     dropDownList: {
-      placeholder: '请选择...'
+      placeholder: '请选择...',
     },
     dropDownListDynamic: {
-      placeholder: '请选择...'
+      placeholder: '请选择...',
     },
     dropDownListMpicker: {
-      placeholder: '请选择...'
+      placeholder: '请选择...',
     },
     login: {
       error: '错误',
       caption: '欢迎登录',
+      placeholder1:'用户名',
+      placeholder2:'密码',
       name: '登录',
+      reset:'重置',
+      other:'其他登录方式',
       tip: '输入用户名和密码',
+      warning1:'qq授权登录暂未支持',
+      warning2:'微信授权登录暂未支持',
       loginname: {
           placeholder: '请输入用户名',
           message: '用户名不能为空',
@@ -175,4 +188,64 @@ export default {
       hide: '隐藏字段',
       showMore: '显示更多字段',
     },
+    appUpdatePassword: {
+      oldPwd: '原密码',
+      newPwd: '新密码',
+      confirmPwd: '确认密码',
+      sure: '确认修改',
+      oldPwdErr: '原密码不能为空！',
+      newPwdErr: '新密码不能为空！',
+      confirmPwdErr: '两次输入密码不一致！',
+    },
+    appAddressSelection: {
+      loadDataFail: '城市数据加载失败'
+    },
+    appGroupSelect:{
+      groupSelect:'分组选择', 
+    },
+    appImageUpload:{
+      uploadFail:'上传失败'
+    },
+    appOrgSelect:{
+      loadFail:'加载数据失败'
+    },
+    appTransfer:{
+      title1:'未选择',
+      title2:'已选择',
+    },
+    appWFApproval:{
+      commit:'提交',
+      wait:'等待',
+      handle:'处理',
+      placeholder:'请输入内容',
+      end:'结束'
+    },
+    contextMenuDrag:{
+      allApp:'全部应用',
+      noFind:'未找到该应用'
+    },
+    filterMode:{
+      placeholder:'条件逻辑',  
+    },
+    filterTree:{
+      title1:'添加条件',
+      title2:'添加组',
+      placeholder:'属性', 
+    },
+    iBizGroupPicker:{
+      ok:'确认',
+      cancel:'取消',
+    },
+    iBizGroupSelect:{
+      groupSelect:'分组选择'
+    },
+    tabPageExp:{
+      more:'更多',
+    },
+    uploadFile:{
+      imgMsg:'将图片拖到这里替换',
+      localUpload:'本地上传',
+      or:'或',
+      imgMsg1:'从素材库选择'
+    }
 };
\ No newline at end of file

app_web/src/widgets/sys-app/main-grid/main-grid-base.vue

@@ -708,8 +708,8 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {boolean}
      * @memberof AppEmbedPicker
      */
-    public isDragendCol: boolean = false;
-
+    public isDragendCol: boolean = true;
+    
     /**
      * 所有列成员
      *

app_web/src/widgets/sys-auth-log/main-grid/main-grid-base.vue

@@ -597,8 +597,8 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {boolean}
      * @memberof AppEmbedPicker
      */
-    public isDragendCol: boolean = false;
-
+    public isDragendCol: boolean = true;
+    
     /**
      * 所有列成员
      *

app_web/src/widgets/sys-permission/main-grid/main-grid-base.vue

@@ -509,8 +509,8 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {boolean}
      * @memberof AppEmbedPicker
      */
-    public isDragendCol: boolean = false;
-
+    public isDragendCol: boolean = true;
+    
     /**
      * 所有列成员
      *

app_web/src/widgets/sys-role-permission/main-grid/main-grid-base.vue

@@ -535,8 +535,8 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {boolean}
      * @memberof AppEmbedPicker
      */
-    public isDragendCol: boolean = false;
-
+    public isDragendCol: boolean = true;
+    
     /**
      * 所有列成员
      *

app_web/src/widgets/sys-role/main-grid/main-grid-base.vue

@@ -547,8 +547,8 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {boolean}
      * @memberof AppEmbedPicker
      */
-    public isDragendCol: boolean = false;
-
+    public isDragendCol: boolean = true;
+    
     /**
      * 所有列成员
      *

app_web/src/widgets/sys-user-role/main-grid/main-grid-base.vue

@@ -573,8 +573,8 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {boolean}
      * @memberof AppEmbedPicker
      */
-    public isDragendCol: boolean = false;
-
+    public isDragendCol: boolean = true;
+    
     /**
      * 所有列成员
      *

app_web/src/widgets/sys-user/main-grid/main-grid-base.vue

@@ -571,8 +571,8 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {boolean}
      * @memberof AppEmbedPicker
      */
-    public isDragendCol: boolean = false;
-
+    public isDragendCol: boolean = true;
+    
     /**
      * 所有列成员
      *

config.xml

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

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

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

@@ -3,24 +3,9 @@ services:
   ibzuaa-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-app-web:latest
     ports:
-      - "30002:30002"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=30002
-      - 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
-      - ABC=1
-      - DEC=2
-      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits:

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

-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-
-
-
-
-
-    <!--输出实体[SYS_AUTHLOG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_authlog-39-1">
-        <createTable tableName="IBZAUTHLOG">
-                <column name="LOGID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_SYS_AUTHLOG_LOGID"/>
-                </column>
-                <column name="USERNAME" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="PERSONNAME" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="DOMAIN" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="AUTHTIME" remarks="" type="DATETIME">
-                </column>
-                <column name="IPADDR" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="MACADDR" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="USERAGENT" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="AUTHCODE" remarks="" type="VARCHAR(15)">
-                </column>
-        </createTable>
-    </changeSet>
-
-
-    <!--输出实体[SYS_PSSYSTEM]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_pssystem-39-2">
-        <createTable tableName="IBZPSSYSTEM">
-                <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_SYS_PSSYSTEM_PSSYSTEMID"/>
-                </column>
-                <column name="PSSYSTEMNAME" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="SYSSTRUCTURE" remarks="" type="TEXT(1048576)">
-                </column>
-                <column name="APPS" remarks="" type="TEXT(1048576)">
-                </column>
-                <column name="MD5CHECK" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="SHOWORDER" remarks="" type="INT">
-                </column>
-        </createTable>
-    </changeSet>
-
-
-    <!--输出实体[SYS_PERMISSION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_permission-219-3">
-        <createTable tableName="IBZPERMISSION">
-                <column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
-                    <constraints primaryKey="true" primaryKeyName="PK_SYS_PERMISSION_SYS_PERMISSI"/>
-                </column>
-                <column name="SYS_PERMISSIONNAME" remarks="" type="VARCHAR(200)">
-                </column>
-                <column name="PERMISSIONTYPE" remarks="" type="VARCHAR(60)">
-                </column>
-                <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="ENABLE" remarks="" type="INT">
-                </column>
-                <column name="CREATEDATE" remarks="" type="DATETIME">
-                </column>
-                <column name="UPDATEDATE" remarks="" type="DATETIME">
-                </column>
-        </createTable>
-    </changeSet>
-
-
-    <!--输出实体[SYS_ROLE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_role-90-4">
-        <createTable tableName="IBZROLE">
-                <column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_SYS_ROLEID"/>
-                </column>
-                <column name="SYS_ROLENAME" remarks="" type="VARCHAR(200)">
-                </column>
-                <column name="MEMO" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="CREATEDATE" remarks="" type="DATETIME">
-                </column>
-                <column name="UPDATEDATE" remarks="" type="DATETIME">
-                </column>
-        </createTable>
-    </changeSet>
-
-
-    <!--输出实体[SYS_ROLE_PERMISSION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_role_permission-93-5">
-        <createTable tableName="IBZROLE_PERMISSION">
-                <column name="SYS_ROLE_PERMISSIONID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_PERMISSION_SYS_ROL"/>
-                </column>
-                <column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
-                </column>
-                <column name="CREATEDATE" remarks="" type="DATETIME">
-                </column>
-                <column name="UPDATEDATE" remarks="" type="DATETIME">
-                </column>
-        </createTable>
-    </changeSet>
-
-
-
-
-    <!--输出实体[SYS_USER_ROLE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_user_role-70-6">
-        <createTable tableName="IBZUSER_ROLE">
-                <column name="SYS_USER_ROLEID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_SYS_USER_ROLE_SYS_USER_ROLE"/>
-                </column>
-                <column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="SYS_USERID" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="CREATEDATE" remarks="" type="DATETIME">
-                </column>
-                <column name="UPDATEDATE" remarks="" type="DATETIME">
-                </column>
-        </createTable>
-    </changeSet>
-
-        <!--输出实体[SYS_AUTHLOG]外键关系 -->
-        <!--输出实体[SYS_PSSYSTEM]外键关系 -->
-        <!--输出实体[SYS_PERMISSION]外键关系 -->
-        <!--输出实体[SYS_ROLE]外键关系 -->
-        <!--输出实体[SYS_ROLE_PERMISSION]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_role_permission-93-7">
-       <addForeignKeyConstraint baseColumnNames="SYS_PERMISSIONID" baseTableName="IBZROLE_PERMISSION" constraintName="DER1N_SYS_ROLE_PERMISSION_SYS_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_PERMISSIONID" referencedTableName="IBZPERMISSION" validate="true"/>
-    </changeSet>
-        <!--输出实体[SYS_USER_ROLE]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_user_role-70-9">
-       <addForeignKeyConstraint baseColumnNames="SYS_ROLEID" baseTableName="IBZUSER_ROLE" constraintName="DER1N_SYS_USER_ROLE_SYS_ROLE_S" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_ROLEID" referencedTableName="IBZROLE" validate="true"/>
-    </changeSet>
-
-</databaseChangeLog>
+!!!!模版产生代码错误:----
+Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
+----
+
+----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${dbinst.getUserName()}  [in template "CODETEMPL_zh_CN" at line 28, column 24]
+----
\ No newline at end of file