ibiz4j 发布系统代码

app_web/public/assets/json/view-config.json

@@ -5,15 +5,23 @@
         "viewtype": "DEEDITVIEW",
         "viewmodule": "pay",
         "viewname": "PayTradeEditView",
-        "viewtag": "1ebd898d7c9c1d6c0f9f6c2944e92148"
+        "viewtag": "089cc88e549cef536c3380ccb1ce465f"
     },
-    "payopenaccesspickupgridview": {
-        "title": "支付平台选择表格视图",
+    "paytradegridview": {
+        "title": "支付交易表格视图",
+        "caption": "支付交易",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "pay",
+        "viewname": "PayTradeGridView",
+        "viewtag": "1f1889a2c3e7f49d9221021499a0f78a"
+    },
+    "payopenaccessgridview": {
+        "title": "支付平台表格视图",
         "caption": "支付平台",
-        "viewtype": "DEPICKUPGRIDVIEW",
+        "viewtype": "DEGRIDVIEW",
         "viewmodule": "pay",
-        "viewname": "PayOpenAccessPickupGridView",
-        "viewtag": "32bd7f047dffe91d62357bff08f6e5d1"
+        "viewname": "PayOpenAccessGridView",
+        "viewtag": "60fe0b9b8535b02baf1a02d5f56c5a9c"
     },
     "payindexview": {
         "title": "pay",
@@ -21,23 +29,15 @@
         "viewtype": "APPINDEXVIEW",
         "viewmodule": "pay",
         "viewname": "PayIndexView",
-        "viewtag": "48CC4447-52C4-4B23-810E-1C0E2465A0D7"
-    },
-    "paytradegridview": {
-        "title": "支付交易表格视图",
-        "caption": "支付交易",
-        "viewtype": "DEGRIDVIEW",
-        "viewmodule": "pay",
-        "viewname": "PayTradeGridView",
-        "viewtag": "6e9610d7cd8dc92a1305216e416207c0"
+        "viewtag": "9bc4c8beaa1b07a28cb977318653a0bd"
     },
-    "payopenaccesseditview": {
-        "title": "支付平台编辑视图",
+    "payopenaccesspickupgridview": {
+        "title": "支付平台选择表格视图",
         "caption": "支付平台",
-        "viewtype": "DEEDITVIEW",
+        "viewtype": "DEPICKUPGRIDVIEW",
         "viewmodule": "pay",
-        "viewname": "PayOpenAccessEditView",
-        "viewtag": "8bbba1ab4ef6cfce89b59175e1efecd0"
+        "viewname": "PayOpenAccessPickupGridView",
+        "viewtag": "b1fe00a9dfb2160b1589b4e1e2b1d2fc"
     },
     "payopenaccesspickupview": {
         "title": "支付平台数据选择视图",
@@ -45,14 +45,14 @@
         "viewtype": "DEPICKUPVIEW",
         "viewmodule": "pay",
         "viewname": "PayOpenAccessPickupView",
-        "viewtag": "94f275381f7b5d6c18c715afdba9b484"
+        "viewtag": "f3bb55ce97b7b94c99782d0cea879eaa"
     },
-    "payopenaccessgridview": {
-        "title": "支付平台表格视图",
+    "payopenaccesseditview": {
+        "title": "支付平台编辑视图",
         "caption": "支付平台",
-        "viewtype": "DEGRIDVIEW",
+        "viewtype": "DEEDITVIEW",
         "viewmodule": "pay",
-        "viewname": "PayOpenAccessGridView",
-        "viewtag": "c6788e489ffbe107540ffa19650faf5a"
+        "viewname": "PayOpenAccessEditView",
+        "viewtag": "f5f50734bb86ba01097a7cb19b63d36c"
     }
 }

app_web/src/app-register.ts

@@ -86,9 +86,6 @@ import AppLockScren from './components/app-lock-scren/app-lock-scren.vue'
 import ActionTimeline from './components/action-timeline/action-timeline.vue'
 import CronEditor from './components/cron-editor/cron-editor.vue'
 import AppMessagePopover from './components/app-message-popover/app-message-popover.vue'
-import AppPanelField from './components/app-panel-field/app-panel-field.vue'
-import AppPanelItem from './components/app-panel-item/app-panel-item.vue'
-
 
 // 全局挂载UI实体服务注册中心
 window['uiServiceRegister'] = uiServiceRegister;
@@ -114,8 +111,6 @@ export const AppComponents = {
         v.prototype.$verify = Verify;
         v.prototype.$viewTool = ViewTool;
         v.prototype.$uiActionTool = UIActionTool;
-        v.component('app-panel-item',AppPanelItem);
-        v.component('app-panel-field',AppPanelField);
         v.component('app-full-scren',AppFullScren);
         v.component('app-lock-scren',AppLockScren);
         v.component('input-box', InputBox);

app_web/src/authservice/auth-service-register.ts

@@ -39,8 +39,8 @@ export class AuthServiceRegister {
      * @memberof AuthServiceRegister
      */
     protected init(): void {
-                this.allAuthService.set('payopenaccess', () => import('@/authservice/pay-open-access/pay-open-access-auth-service'));
-        this.allAuthService.set('paytrade', () => import('@/authservice/pay-trade/pay-trade-auth-service'));
+                this.allAuthService.set('paytrade', () => import('@/authservice/pay-trade/pay-trade-auth-service'));
+        this.allAuthService.set('payopenaccess', () => import('@/authservice/pay-open-access/pay-open-access-auth-service'));
     }
 
     /**

app_web/src/authservice/auth-service.ts

@@ -112,9 +112,6 @@ export default class AuthService {
      * @memberof AuthService
      */
     public getMenusPermission(item: any): boolean {
-        if(!this.$store.getters['authresource/getEnablePermissionValid']) {
-            return true;
-        }
         return this.$store.getters['authresource/getAuthMenu'](item);
     }
 
@@ -126,9 +123,6 @@ export default class AuthService {
      * @memberof AuthService
      */
     public getResourcePermission(tag: any): boolean {
-        if(!this.$store.getters['authresource/getEnablePermissionValid']) {
-            return true;
-        }
         return this.$store.getters['authresource/getResourceData'](tag);
     }
 

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

@@ -100,37 +100,39 @@ export default class AppActionBar extends Vue {
    * @memberof AppActionBar
    */
   public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){
-    for (const key in ActionModel) {
-        if (!ActionModel.hasOwnProperty(key)) {
-            return;
-        }
-        const _item = ActionModel[key];
-        if(_item && _item['dataaccaction'] && UIService){
-            let dataActionResult:any;
-            if(Object.is(_item['actiontarget'],"NONE")){
-                dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
-            }else{
-                if(data && Object.keys(data).length >0){
-                    dataActionResult = UIService.getAllOPPrivs(data)[_item['dataaccaction']];
-                }
-            }
-            // 无权限:0;有权限:1
-            if(dataActionResult === 0){
-                // 禁用:1;隐藏:2;隐藏且默认隐藏:6
-                if(_item.noprivdisplaymode === 1){
-                    _item.disabled = true;
-                }
-                if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
-                    _item.visabled = false;
-                }else{
-                    _item.visabled = true;
-                }
-            }
-            if(dataActionResult === 1){
-                _item.visabled = true;
-                _item.disabled = false;
-            }
-        }
+    if(Environment.enablePermissionValid){
+      for (const key in ActionModel) {
+          if (!ActionModel.hasOwnProperty(key)) {
+              return;
+          }
+          const _item = ActionModel[key];
+          if(_item && _item['dataaccaction'] && UIService){
+              let dataActionResult:any;
+              if(Object.is(_item['actiontarget'],"NONE")){
+                  dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
+              }else{
+                  if(data && Object.keys(data).length >0){
+                      dataActionResult = UIService.getAllOPPrivs(data)[_item['dataaccaction']];
+                  }
+              }
+              // 无权限:0;有权限:1
+              if(dataActionResult === 0){
+                  // 禁用:1;隐藏:2;隐藏且默认隐藏:6
+                  if(_item.noprivdisplaymode === 1){
+                      _item.disabled = true;
+                  }
+                  if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
+                      _item.visabled = false;
+                  }else{
+                      _item.visabled = true;
+                  }
+              }
+              if(dataActionResult === 1){
+                  _item.visabled = true;
+                  _item.disabled = false;
+              }
+          }
+      }
     }
   } 
 

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

@@ -18,7 +18,4 @@
         font-family: '微软雅黑','黑体','宋体';
         font-size: 16px;
     }
-    .progress {
-        margin-top: -15px;
-    }
 }
\ No newline at end of file

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

 <template>
-    <div class="app-data-upload-view" v-loading.fullscreen="isUploading" element-loading-background="rgba(57, 57, 57, 0.2)">
+    <div class="app-data-upload-view">
         <el-row style="margin-top:24px" :gutter="20">
             <el-col :span="4">
                 <el-button type="primary" @click="handleUpLoad">{{$t('components.appDataUploadView.selectfile')}}</el-button>
@@ -13,7 +13,6 @@
             </el-col>
         </el-row>
         <el-divider></el-divider>
-        <el-progress class="progress" v-show="isUploading" :text-inside="true" :stroke-width="14" :percentage="uploadProgress"></el-progress>
         <el-row style="height:480px;padding: 0px 12px;">
             <div class="data-info-content" >
                 <template v-if="importDataArray.length >0 && isUploading === false">
@@ -51,7 +50,6 @@ import XLSX from 'xlsx';
 import CodeListService from "@service/app/codelist-service";
 import EntityService from '@/service/entity-service';
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
-import { Environment } from '@/environments/environment';
 
 @Component({
 })
@@ -193,22 +191,6 @@ export default class AppDataUploadView extends Vue {
      * @memberof AppDataUploadView
      */
     public allFieldMap:Map<string,any> = new Map();
-    
-    /**
-     * 上传服务器数据切片数
-     *
-     * @type {number}
-     * @memberof AppDataUploadView
-     */
-    public sliceUploadCnt: number = Environment.sliceUploadCnt;
-
-    /**
-     * 上传服务器进度条百分比
-     *
-     * @type {number}
-     * @memberof AppDataUploadView
-     */
-    public uploadProgress: number = 0;
 
     /**
      * 视图参数变化
@@ -300,29 +282,10 @@ export default class AppDataUploadView extends Vue {
         this.transformData(this.importDataArray,tempDataArray);
         this.hasImported = true;
         this.isUploading = true;
-        this.uploadProgress = 0;
         this.importDataArray = [];
-        this.sliceUploadService(tempDataArray, 0);
-    }
-
-    /**
-     * 数据切片上传
-     *
-     * @memberof AppDataUploadView
-     */
-    public sliceUploadService(dataArray: Array<any>, cnt: number) {
-        if(cnt > dataArray.length) {
-            this.isUploading = false;
-            this.uploadProgress = 100;
-            return;
-        }
-        let sliceArray: Array<any> = [];
-        if(dataArray) {
-            sliceArray = dataArray.slice(cnt, cnt+this.sliceUploadCnt);
-        }
         try{
             this.entityService.getService(this.viewparams.serviceName).then((service:any) =>{
-            service.ImportData(this.viewdata,{name:this.importId,importData:sliceArray}).then((res:any) =>{
+            service.ImportData(this.viewdata,{name:this.importId,importData:tempDataArray}).then((res:any) =>{
                 const result:any = res.data;
                 if(result && result.rst !== 0){
                     this.promptInfo = (this.$t('components.appDataUploadView.importfailed') as string);
@@ -331,8 +294,7 @@ export default class AppDataUploadView extends Vue {
                 }
                 this.importSuccessData = result.data;
                 this.promptInfo = (this.$t('components.appDataUploadView.completed') as string);
-                this.uploadProgress = Number((cnt / dataArray.length * 100).toFixed(2));
-                this.sliceUploadService(dataArray, cnt + this.sliceUploadCnt);
+                this.isUploading = false;
             }).catch((error:any) =>{
                 this.isUploading = false;
                 this.promptInfo = (this.$t('components.appDataUploadView.importfailed') as string);
@@ -349,6 +311,7 @@ export default class AppDataUploadView extends Vue {
             console.error(error);
         };
     }
+
     /**
      * 导出excel
      *

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

@@ -158,36 +158,38 @@ export default class AppFormGroup extends Vue {
      * @memberof AppFormGroup
      */
     public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){
-        for (const key in ActionModel) {
-            if (!ActionModel.hasOwnProperty(key)) {
-                return;
-            }
-            const _item = ActionModel[key];
-            if(_item && _item['dataaccaction'] && UIService){
-                let dataActionResult:any;
-                if(Object.is(_item['actiontarget'],"NONE")){
-                    dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
-                }else{
-                    if(data && Object.keys(data).length >0){
-                        dataActionResult = UIService.getAllOPPrivs(data)[_item['dataaccaction']];
-                    }
+        if(Environment.enablePermissionValid){
+            for (const key in ActionModel) {
+                if (!ActionModel.hasOwnProperty(key)) {
+                    return;
                 }
-                // 无权限:0;有权限:1
-                if(dataActionResult === 0){
-                    // 禁用:1;隐藏:2;隐藏且默认隐藏:6
-                    if(_item.noprivdisplaymode === 1){
-                        _item.disabled = true;
-                    }
-                    if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
-                        _item.visabled = false;
+                const _item = ActionModel[key];
+                if(_item && _item['dataaccaction'] && UIService){
+                    let dataActionResult:any;
+                    if(Object.is(_item['actiontarget'],"NONE")){
+                        dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
                     }else{
+                        if(data && Object.keys(data).length >0){
+                            dataActionResult = UIService.getAllOPPrivs(data)[_item['dataaccaction']];
+                        }
+                    }
+                    // 无权限:0;有权限:1
+                    if(dataActionResult === 0){
+                        // 禁用:1;隐藏:2;隐藏且默认隐藏:6
+                        if(_item.noprivdisplaymode === 1){
+                            _item.disabled = true;
+                        }
+                        if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
+                            _item.visabled = false;
+                        }else{
+                            _item.visabled = true;
+                        }
+                    }
+                    if(dataActionResult === 1){
                         _item.visabled = true;
+                        _item.disabled = false;
                     }
                 }
-                if(dataActionResult === 1){
-                    _item.visabled = true;
-                    _item.disabled = false;
-                }
             }
         }
     } 

app_web/src/components/app-header-menus/app-header-menus.vue

@@ -41,7 +41,7 @@ export default class AppHeaderMenus extends Vue {
       {
           name: "ibizstudio",
           title: "components.appHeaderMenus.ibizstudio.title",
-          url: `${Environment.StudioUrl}?#/common_mosindex/srfkeys=${Environment.SysId}`,
+          url: `${Environment.StudioUrl}?#/common_slnindex/srfkeys=${Environment.SlnId}/sysdesign_psdevslnsysmodeltreeexpview`,
           iconcls: 'fa fa-wrench',
       },
       {

app_web/src/components/app-message-popover/app-message-popover.vue

@@ -149,7 +149,7 @@
                     this.getMyMsgs();
                 }
             }).catch((error: any) => {
-                console.warn("加载数据错误");
+                this.$Notice.error({title: '错误', desc: error});
             })
         }
 

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

@@ -214,8 +214,7 @@ export default class AppSpan extends Vue {
             this.text = Number(number.toFixed(this.precision)).toLocaleString('en-US')+ ' '+ this.unitName;   
         }else if(Object.is(this.dataType,"FLOAT") || Object.is(this.dataType,"DECIMAL")){
             let number:any = Number(this.value);
-            const decimalCnt:number = this.value.toString().split('.').length > 1 ? this.value.toString().split('.')[1].length : 0;
-            this.text = (Number(this.precision) === 0 && decimalCnt !== 0) ? number.toFixed(decimalCnt) : number.toFixed(this.precision);
+            this.text = number.toFixed(this.precision);
         }else {
             this.text = this.value;
         }

app_web/src/components/context-menu-drag/context-menu-drag.vue

@@ -293,13 +293,12 @@ export default class ContextMenuDrag extends Vue {
   mounted() {
     let that: any = this;
     const get: Promise<any> = this.entityService.getAllApp(null,{});
-    get.then((response: any) => {
+    get
+      .then((response: any) => {
         if (response) {
           that.list = response.data.model;
           that.listFilter();
         }
-      }).catch((error:any) =>{
-        console.warn("加载数据错误")
       });
   }
 }

app_web/src/components/context-menu/context-menu.tsx

@@ -92,14 +92,6 @@ export default class ContextMenu extends Vue {
      */
     @Prop()
     public menus?: any[]
-    /**
-     * 是否阻止默认绘制上下文菜单
-     *
-     * @type {any}
-     * @memberof ContextMenu
-     */
-    @Prop({default:false})
-    public isBlocked?:any;
 
     /**
      * 显示右键菜单
@@ -203,10 +195,7 @@ export default class ContextMenu extends Vue {
         if (contextRef) {
             contextRef.oncontextmenu = (event: MouseEvent) => {
                 event.preventDefault();
-                if(!this.isBlocked){
-                    this.showContextMenu(event.clientX, event.clientY);
-                }
-                this.$emit("showContext",event);
+                this.showContextMenu(event.clientX, event.clientY);
             };
         }
     }

app_web/src/engine/view/view-engine.ts

@@ -186,37 +186,39 @@ export default class ViewEngine {
      * @memberof ViewEngine
      */
     public calcToolbarItemAuthState(data:any){
-        const _this: any = this;
-        for (const key in _this.view.toolBarModels) {
-            if (!_this.view.toolBarModels.hasOwnProperty(key)) {
-                return;
-            }
-            const _item = _this.view.toolBarModels[key];
-            if(_item && _item['dataaccaction'] && _this.view.appUIService){
-                let dataActionResult:any;
-                if (_item.uiaction && (Object.is(_item.uiaction.target, 'NONE'))){
-                    dataActionResult = _this.view.appUIService.getResourceOPPrivs(_item['dataaccaction']);
-                }else{
-                    if(data && Object.keys(data).length >0){
-                        dataActionResult= _this.view.appUIService.getAllOPPrivs(data)[_item['dataaccaction']];       
-                    }
+        if(Environment.enablePermissionValid){
+            const _this: any = this;
+            for (const key in _this.view.toolBarModels) {
+                if (!_this.view.toolBarModels.hasOwnProperty(key)) {
+                    return;
                 }
-                // 无权限:0;有权限:1
-                if(dataActionResult === 0){
-                    // 禁用:1;隐藏:2;隐藏且默认隐藏:6
-                    if(_item.noprivdisplaymode === 1){
-                        _this.view.toolBarModels[key].disabled = true;
-                    }
-                    if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
-                        _this.view.toolBarModels[key].visabled = false;
+                const _item = _this.view.toolBarModels[key];
+                if(_item && _item['dataaccaction'] && _this.view.appUIService){
+                    let dataActionResult:any;
+                    if (_item.uiaction && (Object.is(_item.uiaction.target, 'NONE'))){
+                        dataActionResult = _this.view.appUIService.getResourceOPPrivs(_item['dataaccaction']);
                     }else{
+                        if(data && Object.keys(data).length >0){
+                            dataActionResult= _this.view.appUIService.getAllOPPrivs(data)[_item['dataaccaction']];       
+                        }
+                    }
+                    // 无权限:0;有权限:1
+                    if(dataActionResult === 0){
+                        // 禁用:1;隐藏:2;隐藏且默认隐藏:6
+                        if(_item.noprivdisplaymode === 1){
+                            _this.view.toolBarModels[key].disabled = true;
+                        }
+                        if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
+                            _this.view.toolBarModels[key].visabled = false;
+                        }else{
+                            _this.view.toolBarModels[key].visabled = true;
+                        }
+                    }
+                    if(dataActionResult === 1){
                         _this.view.toolBarModels[key].visabled = true;
+                        _this.view.toolBarModels[key].disabled = false;
                     }
                 }
-                if(dataActionResult === 1){
-                    _this.view.toolBarModels[key].visabled = true;
-                    _this.view.toolBarModels[key].disabled = false;
-                }
             }
         }
     }   

app_web/src/environments/environment.ts

@@ -15,8 +15,6 @@ export const Environment = {
     ExportFile: '/ibizutil/download',
     // 文件上传
     UploadFile: '/ibizutil/upload',
-    // 数据导入单次上传最大数量
-    sliceUploadCnt: 100,
     // 是否为pc端应用
     isAppMode:true,
     //统一地址
@@ -38,7 +36,7 @@ export const Environment = {
     // 前端应用标识
     AppId: "6e0b7357169ef4eba84e1347ed94bd84",
     // 项目发布文件地址
-    PublishProjectUrl: 'http://oauth2:ymrzrgzh97axsgq_TjR3@labcs.ibizee.cn/ibiz4jteam/ibzpay.git',
+    PublishProjectUrl: 'http://oauth2:cTux_e7Aoz1PrasP5dDq@demo.ibizlab.cn/ibiz4jteam/ibzpay.git',
     // ibiz开放平台地址
     ibizlabtUrl: 'https://www.ibizlab.cn',
     // ibiz论坛地址

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

-import payopenaccess_en_US from '@locale/lanres/entities/pay-open-access/pay-open-access_en_US';
 import paytrade_en_US from '@locale/lanres/entities/pay-trade/pay-trade_en_US';
+import payopenaccess_en_US from '@locale/lanres/entities/pay-open-access/pay-open-access_en_US';
 import components_en_US from '@locale/lanres/components/components_en_US';
 import codelist_en_US from '@locale/lanres/codelist/codelist_en_US';
 import userCustom_en_US from '@locale/lanres/userCustom/userCustom_en_US';
@@ -216,8 +216,8 @@ export default {
         },
     },
     entities: {
-        payopenaccess: payopenaccess_en_US,
         paytrade: paytrade_en_US,
+        payopenaccess: payopenaccess_en_US,
     },
     components: components_en_US,
     codelist: codelist_en_US,

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

-import payopenaccess_zh_CN from '@locale/lanres/entities/pay-open-access/pay-open-access_zh_CN';
 import paytrade_zh_CN from '@locale/lanres/entities/pay-trade/pay-trade_zh_CN';
+import payopenaccess_zh_CN from '@locale/lanres/entities/pay-open-access/pay-open-access_zh_CN';
 import components_zh_CN from '@locale/lanres/components/components_zh_CN';
 import codelist_zh_CN from '@locale/lanres/codelist/codelist_zh_CN';
 import userCustom_zh_CN from '@locale/lanres/userCustom/userCustom_zh_CN';
@@ -215,8 +215,8 @@ export default {
         },
     },
     entities: {
-        payopenaccess: payopenaccess_zh_CN,
         paytrade: paytrade_zh_CN,
+        payopenaccess: payopenaccess_zh_CN,
     },
     components: components_zh_CN,
     codelist: codelist_zh_CN,

app_web/src/locale/lanres/entities/pay-open-access/pay-open-access_en_US.ts

@@ -13,21 +13,21 @@ export default {
     redirect_uri: "RedirectURI",
   },
 	views: {
-		pickupgridview: {
+		gridview: {
 			caption: "支付平台",
-      		title: "支付平台选择表格视图",
+      		title: "支付平台表格视图",
 		},
-		editview: {
+		pickupgridview: {
 			caption: "支付平台",
-      		title: "支付平台编辑视图",
+      		title: "支付平台选择表格视图",
 		},
 		pickupview: {
 			caption: "支付平台",
       		title: "支付平台数据选择视图",
 		},
-		gridview: {
+		editview: {
 			caption: "支付平台",
-      		title: "支付平台表格视图",
+      		title: "支付平台编辑视图",
 		},
 	},
 	main_form: {

app_web/src/locale/lanres/entities/pay-open-access/pay-open-access_zh_CN.ts

@@ -12,21 +12,21 @@ export default {
     redirect_uri: "RedirectURI",
   },
 	views: {
-		pickupgridview: {
+		gridview: {
 			caption: "支付平台",
-      		title: "支付平台选择表格视图",
+      		title: "支付平台表格视图",
 		},
-		editview: {
+		pickupgridview: {
 			caption: "支付平台",
-      		title: "支付平台编辑视图",
+      		title: "支付平台选择表格视图",
 		},
 		pickupview: {
 			caption: "支付平台",
       		title: "支付平台数据选择视图",
 		},
-		gridview: {
+		editview: {
 			caption: "支付平台",
-      		title: "支付平台表格视图",
+      		title: "支付平台编辑视图",
 		},
 	},
 	main_form: {

app_web/src/locale/lanres/entities/pay-trade/pay-trade_en_US.ts

 
 export default {
   fields: {
-    trade_id: "交易标识",
-    trade_name: "交易名称",
     subject: "订单标题",
-    out_trade_no: "订单号",
     total_amount: "订单金额",
-    access_id: "支付平台接入标识",
-    access_name: "支付平台",
-    app_id: "AccessKey(AppId)",
+    trade_name: "交易名称",
     trade_type: "支付类型",
     trade_status: "支付状态",
+    out_trade_no: "订单号",
+    trade_id: "交易标识",
+    app_id: "AccessKey(AppId)",
+    access_name: "支付平台",
+    access_id: "支付平台接入标识",
   },
 	views: {
 		editview: {

app_web/src/locale/lanres/entities/pay-trade/pay-trade_zh_CN.ts

 export default {
   fields: {
-    trade_id: "交易标识",
-    trade_name: "交易名称",
     subject: "订单标题",
-    out_trade_no: "订单号",
     total_amount: "订单金额",
-    access_id: "支付平台接入标识",
-    access_name: "支付平台",
-    app_id: "AccessKey(AppId)",
+    trade_name: "交易名称",
     trade_type: "支付类型",
     trade_status: "支付状态",
+    out_trade_no: "订单号",
+    trade_id: "交易标识",
+    app_id: "AccessKey(AppId)",
+    access_name: "支付平台",
+    access_id: "支付平台接入标识",
   },
 	views: {
 		editview: {

app_web/src/mock/app/pay-index-view-appmenu/pay-index-view-appmenu.ts

@@ -11,7 +11,7 @@ mock.onGet('v7/pay-index-viewappmenu').reply((config: any) => {
         name: 'appmenu',
         items:  [
             {
-	id: '29375D3A-9707-4A76-A914-177A8DDDF566',
+	id: '62d37d214c3103bf6ed1e946106ec677',
 	name: 'menuitem1',
 	text: '支付平台',
 	type: 'MENUITEM',
@@ -29,7 +29,7 @@ mock.onGet('v7/pay-index-viewappmenu').reply((config: any) => {
 	resourcetag: '',
 },
             {
-	id: '3045EF5E-281B-4D8B-AF05-759C4845FB77',
+	id: '1e7394867e71eec256933bda6257bcc2',
 	name: 'menuitem2',
 	text: '交易记录',
 	type: 'MENUITEM',

app_web/src/mock/appdata/appdata.ts

@@ -33,7 +33,6 @@ mock.onGet('/appdata').reply((config: any) => {
           // 当前用户条线代码
          srfsectorbc:""
         },
-        enablepermissionvalid:false,
         unires:["RESOURCE1","RESOURCE2"],
          //当前用户所有组织部门标识
          srforgsections:[{"srforgsectorid":"5bd1ecf4d3c31e31cb66373df56b852f","srforgsectorname":"项目一部"},{"srforgsectorid":"2ad1ecf4d3c31e31cb66373df56b852f","srforgsectorname":"项目二部"}]

app_web/src/mock/index.ts

@@ -7,5 +7,5 @@ import './login/login';
 import './upload/upload';
 
 // 实体级接口对象
-import './entity/pay-open-accesss/pay-open-accesss';
 import './entity/pay-trades/pay-trades';
+import './entity/pay-open-accesss/pay-open-accesss';

app_web/src/mock/viewconfig/viewconfig.ts

@@ -13,15 +13,23 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtype": "DEEDITVIEW",
             "viewmodule": "pay",
             "viewname": "PayTradeEditView",
-            "viewtag": "1ebd898d7c9c1d6c0f9f6c2944e92148"
+            "viewtag": "089cc88e549cef536c3380ccb1ce465f"
         },
-        "payopenaccesspickupgridview": {
-            "title": "支付平台选择表格视图",
+        "paytradegridview": {
+            "title": "支付交易表格视图",
+            "caption": "支付交易",
+            "viewtype": "DEGRIDVIEW",
+            "viewmodule": "pay",
+            "viewname": "PayTradeGridView",
+            "viewtag": "1f1889a2c3e7f49d9221021499a0f78a"
+        },
+        "payopenaccessgridview": {
+            "title": "支付平台表格视图",
             "caption": "支付平台",
-            "viewtype": "DEPICKUPGRIDVIEW",
+            "viewtype": "DEGRIDVIEW",
             "viewmodule": "pay",
-            "viewname": "PayOpenAccessPickupGridView",
-            "viewtag": "32bd7f047dffe91d62357bff08f6e5d1"
+            "viewname": "PayOpenAccessGridView",
+            "viewtag": "60fe0b9b8535b02baf1a02d5f56c5a9c"
         },
         "payindexview": {
             "title": "pay",
@@ -29,23 +37,15 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtype": "APPINDEXVIEW",
             "viewmodule": "pay",
             "viewname": "PayIndexView",
-            "viewtag": "48CC4447-52C4-4B23-810E-1C0E2465A0D7"
-        },
-        "paytradegridview": {
-            "title": "支付交易表格视图",
-            "caption": "支付交易",
-            "viewtype": "DEGRIDVIEW",
-            "viewmodule": "pay",
-            "viewname": "PayTradeGridView",
-            "viewtag": "6e9610d7cd8dc92a1305216e416207c0"
+            "viewtag": "9bc4c8beaa1b07a28cb977318653a0bd"
         },
-        "payopenaccesseditview": {
-            "title": "支付平台编辑视图",
+        "payopenaccesspickupgridview": {
+            "title": "支付平台选择表格视图",
             "caption": "支付平台",
-            "viewtype": "DEEDITVIEW",
+            "viewtype": "DEPICKUPGRIDVIEW",
             "viewmodule": "pay",
-            "viewname": "PayOpenAccessEditView",
-            "viewtag": "8bbba1ab4ef6cfce89b59175e1efecd0"
+            "viewname": "PayOpenAccessPickupGridView",
+            "viewtag": "b1fe00a9dfb2160b1589b4e1e2b1d2fc"
         },
         "payopenaccesspickupview": {
             "title": "支付平台数据选择视图",
@@ -53,15 +53,15 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtype": "DEPICKUPVIEW",
             "viewmodule": "pay",
             "viewname": "PayOpenAccessPickupView",
-            "viewtag": "94f275381f7b5d6c18c715afdba9b484"
+            "viewtag": "f3bb55ce97b7b94c99782d0cea879eaa"
         },
-        "payopenaccessgridview": {
-            "title": "支付平台表格视图",
+        "payopenaccesseditview": {
+            "title": "支付平台编辑视图",
             "caption": "支付平台",
-            "viewtype": "DEGRIDVIEW",
+            "viewtype": "DEEDITVIEW",
             "viewmodule": "pay",
-            "viewname": "PayOpenAccessGridView",
-            "viewtag": "c6788e489ffbe107540ffa19650faf5a"
+            "viewname": "PayOpenAccessEditView",
+            "viewtag": "f5f50734bb86ba01097a7cb19b63d36c"
         }
     }];
 });
\ No newline at end of file

app_web/src/pages/pay/pay-index-view/page-register.ts

 export const PageComponents = {
     install(Vue: any, opt: any) {
-                Vue.component('pay-open-access-edit-view', () => import('@pages/pay/pay-open-access-edit-view/pay-open-access-edit-view.vue'));
-        Vue.component('pay-open-access-pickup-grid-view', () => import('@pages/pay/pay-open-access-pickup-grid-view/pay-open-access-pickup-grid-view.vue'));
-        Vue.component('pay-trade-grid-view', () => import('@pages/pay/pay-trade-grid-view/pay-trade-grid-view.vue'));
-        Vue.component('pay-open-access-grid-view', () => import('@pages/pay/pay-open-access-grid-view/pay-open-access-grid-view.vue'));
+                Vue.component('pay-trade-edit-view', () => import('@pages/pay/pay-trade-edit-view/pay-trade-edit-view.vue'));
         Vue.component('pay-open-access-pickup-view', () => import('@pages/pay/pay-open-access-pickup-view/pay-open-access-pickup-view.vue'));
-        Vue.component('pay-trade-edit-view', () => import('@pages/pay/pay-trade-edit-view/pay-trade-edit-view.vue'));
+        Vue.component('pay-open-access-grid-view', () => import('@pages/pay/pay-open-access-grid-view/pay-open-access-grid-view.vue'));
+        Vue.component('pay-open-access-edit-view', () => import('@pages/pay/pay-open-access-edit-view/pay-open-access-edit-view.vue'));
+        Vue.component('pay-trade-grid-view', () => import('@pages/pay/pay-trade-grid-view/pay-trade-grid-view.vue'));
+        Vue.component('pay-open-access-pickup-grid-view', () => import('@pages/pay/pay-open-access-pickup-grid-view/pay-open-access-pickup-grid-view.vue'));
     }
 };
\ No newline at end of file

app_web/src/pages/pay/pay-index-view/pay-index-view-base.vue

@@ -130,7 +130,7 @@ export default class PayIndexViewBase extends Vue {
 	 * @type {string}
 	 * @memberof PayIndexViewBase
 	 */
-	public viewtag: string = '48CC4447-52C4-4B23-810E-1C0E2465A0D7';
+	public viewtag: string = '9bc4c8beaa1b07a28cb977318653a0bd';
 
 	/**
 	 * 自定义视图导航上下文集合

app_web/src/pages/pay/pay-open-access-edit-view/pay-open-access-edit-view.less

@@ -8,19 +8,19 @@
 .pay-open-access-edit-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
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
 
 

app_web/src/pages/pay/pay-open-access-grid-view/pay-open-access-grid-view.less

 .pay-open-access-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
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
 
 

app_web/src/pages/pay/pay-open-access-pickup-grid-view/pay-open-access-pickup-grid-view-base.vue

@@ -3,43 +3,43 @@
     <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="payopenaccesspickupgridview"></app-studioaction>
     <card class='view-card view-no-caption  view-no-toolbar' :dis-hover="true" :bordered="false">
         <div class='content-container pickup-grid-view'>
-            <view_searchform 
-                :viewState="viewState"  
-                :viewparams="viewparams" 
-                :context="context" 
-                :showBusyIndicator="true"
-                v-show="isExpandSearchForm"
-                loaddraftAction="FilterGetDraft"
-                loadAction="FilterGet"
-            
-                name="searchform"  
-                ref='searchform' 
-                @save="searchform_save($event)"  
-                @search="searchform_search($event)"  
-                @load="searchform_load($event)"  
-                @closeview="closeView($event)">
-            </view_searchform>
-            <view_grid 
-                :viewState="viewState"  
-                :viewparams="viewparams" 
-                :context="context" 
-                :isSingleSelect="isSingleSelect"
-                :selectedData="selectedData"
-                :showBusyIndicator="true"
-                updateAction=""
-                removeAction="Remove"
-                loaddraftAction=""
-                loadAction=""
-                createAction=""
-                fetchAction="FetchDefault"
-                name="grid"  
-                ref='grid' 
-                @selectionchange="grid_selectionchange($event)"  
-                @beforeload="grid_beforeload($event)"  
-                @rowdblclick="grid_rowdblclick($event)"  
-                @load="grid_load($event)"  
-                @closeview="closeView($event)">
-            </view_grid>
+            <view_searchform 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :showBusyIndicator="true"
+                v-show="isExpandSearchForm"
+                loaddraftAction="FilterGetDraft"
+                loadAction="FilterGet"
+            
+                name="searchform"  
+                ref='searchform' 
+                @save="searchform_save($event)"  
+                @search="searchform_search($event)"  
+                @load="searchform_load($event)"  
+                @closeview="closeView($event)">
+            </view_searchform>
+            <view_grid 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :isSingleSelect="isSingleSelect"
+                :selectedData="selectedData"
+                :showBusyIndicator="true"
+                updateAction=""
+                removeAction="Remove"
+                loaddraftAction=""
+                loadAction=""
+                createAction=""
+                fetchAction="FetchDefault"
+                name="grid"  
+                ref='grid' 
+                @selectionchange="grid_selectionchange($event)"  
+                @beforeload="grid_beforeload($event)"  
+                @rowdblclick="grid_rowdblclick($event)"  
+                @load="grid_load($event)"  
+                @closeview="closeView($event)">
+            </view_grid>
         </div>
     </card>
 </div>
@@ -140,7 +140,7 @@ export default class PayOpenAccessPickupGridViewBase extends Vue {
 	 * @type {string}
 	 * @memberof PayOpenAccessPickupGridViewBase
 	 */
-	public viewtag: string = '32bd7f047dffe91d62357bff08f6e5d1';
+	public viewtag: string = 'b1fe00a9dfb2160b1589b4e1e2b1d2fc';
 
 	/**
 	 * 自定义视图导航上下文集合

app_web/src/pages/pay/pay-open-access-pickup-view/pay-open-access-pickup-view-base.vue

@@ -3,20 +3,20 @@
     <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="payopenaccesspickupview"></app-studioaction>
     <card class='view-card view-no-caption  view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false">
         <div class="content-container pickup-view">
-            <view_pickupviewpanel 
-                :viewState="viewState"  
-                :viewparams="JSON.parse(JSON.stringify(viewparams))" 
-                :context="JSON.parse(JSON.stringify(context))" 
-                :isSingleSelect="isSingleSelect"
-                :selectedData="selectedData"
-                :isShowButton="isShowButton"
-                name="pickupviewpanel"  
-                ref='pickupviewpanel' 
-                @selectionchange="pickupviewpanel_selectionchange($event)"  
-                @activated="pickupviewpanel_activated($event)"  
-                @load="pickupviewpanel_load($event)"  
-                @closeview="closeView($event)">
-            </view_pickupviewpanel>
+            <view_pickupviewpanel 
+                :viewState="viewState"  
+                :viewparams="JSON.parse(JSON.stringify(viewparams))" 
+                :context="JSON.parse(JSON.stringify(context))" 
+                :isSingleSelect="isSingleSelect"
+                :selectedData="selectedData"
+                :isShowButton="isShowButton"
+                name="pickupviewpanel"  
+                ref='pickupviewpanel' 
+                @selectionchange="pickupviewpanel_selectionchange($event)"  
+                @activated="pickupviewpanel_activated($event)"  
+                @load="pickupviewpanel_load($event)"  
+                @closeview="closeView($event)">
+            </view_pickupviewpanel>
             <card v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer">
                 <row :style="{ textAlign: 'right' }">
                     <i-button type="primary" :disabled="this.viewSelections.length > 0 ? false : true" @click="onClickOk">{{this.containerModel.view_okbtn.text}}</i-button>
@@ -125,7 +125,7 @@ export default class PayOpenAccessPickupViewBase extends Vue {
 	 * @type {string}
 	 * @memberof PayOpenAccessPickupViewBase
 	 */
-	public viewtag: string = '94f275381f7b5d6c18c715afdba9b484';
+	public viewtag: string = 'f3bb55ce97b7b94c99782d0cea879eaa';
 
 	/**
 	 * 自定义视图导航上下文集合

app_web/src/pages/pay/pay-trade-edit-view/pay-trade-edit-view.less

@@ -8,19 +8,19 @@
 .pay-trade-edit-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
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
 
 

app_web/src/pages/pay/pay-trade-grid-view/pay-trade-grid-view.less

 .pay-trade-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
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
 
 

app_web/src/service/entity-service-register.ts

@@ -39,8 +39,8 @@ export class EntityServiceRegister {
      * @memberof EntityServiceRegister
      */
     protected init(): void {
-                this.allEntityService.set('payopenaccess', () => import('@/service/pay-open-access/pay-open-access-service'));
-        this.allEntityService.set('paytrade', () => import('@/service/pay-trade/pay-trade-service'));
+                this.allEntityService.set('paytrade', () => import('@/service/pay-trade/pay-trade-service'));
+        this.allEntityService.set('payopenaccess', () => import('@/service/pay-open-access/pay-open-access-service'));
     }
 
     /**

app_web/src/store/modules/view-action/state.ts

@@ -4,72 +4,72 @@
 export const viewstate: any = {
     appviews: [
         {
-            viewtag: '1ebd898d7c9c1d6c0f9f6c2944e92148',
+            viewtag: '089cc88e549cef536c3380ccb1ce465f',
             viewmodule: 'pay',
             viewname: 'PayTradeEditView',
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '94f275381f7b5d6c18c715afdba9b484',
+                'f3bb55ce97b7b94c99782d0cea879eaa',
             ],
         },
         {
-            viewtag: '32bd7f047dffe91d62357bff08f6e5d1',
+            viewtag: '1f1889a2c3e7f49d9221021499a0f78a',
             viewmodule: 'pay',
-            viewname: 'PayOpenAccessPickupGridView',
+            viewname: 'PayTradeGridView',
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                '089cc88e549cef536c3380ccb1ce465f',
             ],
         },
         {
-            viewtag: '48CC4447-52C4-4B23-810E-1C0E2465A0D7',
+            viewtag: '60fe0b9b8535b02baf1a02d5f56c5a9c',
             viewmodule: 'pay',
-            viewname: 'PayIndexView',
+            viewname: 'PayOpenAccessGridView',
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '6e9610d7cd8dc92a1305216e416207c0',
-                'c6788e489ffbe107540ffa19650faf5a',
+                'f5f50734bb86ba01097a7cb19b63d36c',
             ],
         },
         {
-            viewtag: '6e9610d7cd8dc92a1305216e416207c0',
+            viewtag: '9bc4c8beaa1b07a28cb977318653a0bd',
             viewmodule: 'pay',
-            viewname: 'PayTradeGridView',
+            viewname: 'PayIndexView',
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '1ebd898d7c9c1d6c0f9f6c2944e92148',
+                '60fe0b9b8535b02baf1a02d5f56c5a9c',
+                '1f1889a2c3e7f49d9221021499a0f78a',
             ],
         },
         {
-            viewtag: '8bbba1ab4ef6cfce89b59175e1efecd0',
+            viewtag: 'b1fe00a9dfb2160b1589b4e1e2b1d2fc',
             viewmodule: 'pay',
-            viewname: 'PayOpenAccessEditView',
+            viewname: 'PayOpenAccessPickupGridView',
             viewaction: '',
             viewdatachange: false,
             refviews: [
             ],
         },
         {
-            viewtag: '94f275381f7b5d6c18c715afdba9b484',
+            viewtag: 'f3bb55ce97b7b94c99782d0cea879eaa',
             viewmodule: 'pay',
             viewname: 'PayOpenAccessPickupView',
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '32bd7f047dffe91d62357bff08f6e5d1',
+                'b1fe00a9dfb2160b1589b4e1e2b1d2fc',
             ],
         },
         {
-            viewtag: 'c6788e489ffbe107540ffa19650faf5a',
+            viewtag: 'f5f50734bb86ba01097a7cb19b63d36c',
             viewmodule: 'pay',
-            viewname: 'PayOpenAccessGridView',
+            viewname: 'PayOpenAccessEditView',
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '8bbba1ab4ef6cfce89b59175e1efecd0',
             ],
         },
     ],

app_web/src/uiservice/pay-open-access/pay-open-access-ui-service-base.ts

@@ -89,10 +89,10 @@ export default class PayOpenAccessUIServiceBase extends UIService {
      * @memberof  PayOpenAccessUIServiceBase
      */  
     public initViewMap(){
+        this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'payopenaccesses'});
         this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'payopenaccesses'});
-        this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'payopenaccesses'});
         this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'payopenaccesses'});
-        this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'payopenaccesses'});
+        this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'payopenaccesses'});
     }
 
     /**

app_web/src/uiservice/ui-service-register.ts

@@ -39,8 +39,8 @@ export class UIServiceRegister {
      * @memberof UIServiceRegister
      */
     protected init(): void {
-                this.allUIService.set('payopenaccess', () => import('@/uiservice/pay-open-access/pay-open-access-ui-service'));
-        this.allUIService.set('paytrade', () => import('@/uiservice/pay-trade/pay-trade-ui-service'));
+                this.allUIService.set('paytrade', () => import('@/uiservice/pay-trade/pay-trade-ui-service'));
+        this.allUIService.set('payopenaccess', () => import('@/uiservice/pay-open-access/pay-open-access-ui-service'));
     }
 
     /**

app_web/src/widgets/app/pay-index-view-appmenu/pay-index-view-appmenu-base.vue

@@ -516,52 +516,52 @@ export default class PayIndexViewBase extends Vue implements ControlInterface {
         }
     }
 
-    
-    /**
-     * 交易记录
-     *
-     * @param {*} [item={}]
-     * @memberof PayIndexView
-     */
-    public clickAuto2(item: any = {}) {
-        const viewparam: any = {};
-        Object.assign(viewparam, {});
-        const deResParameters: any[] = [];
-        const parameters: any[] = [
-            { pathName: 'paytrades', parameterName: 'paytrade' },
-            { pathName: 'gridview', parameterName: 'gridview' },
-        ];
-        const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
-        if(Object.is(this.$route.fullPath,path)){
-            return;
-        }
-        this.$nextTick(function(){
-            this.$router.push(path);
-        })
-    }
-    
-    /**
-     * 支付平台
-     *
-     * @param {*} [item={}]
-     * @memberof PayIndexView
-     */
-    public clickAuto1(item: any = {}) {
-        const viewparam: any = {};
-        Object.assign(viewparam, {});
-        const deResParameters: any[] = [];
-        const parameters: any[] = [
-            { pathName: 'payopenaccesses', parameterName: 'payopenaccess' },
-            { pathName: 'gridview', parameterName: 'gridview' },
-        ];
-        const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
-        if(Object.is(this.$route.fullPath,path)){
-            return;
-        }
-        this.$nextTick(function(){
-            this.$router.push(path);
-        })
-    }
+    
+    /**
+     * 交易记录
+     *
+     * @param {*} [item={}]
+     * @memberof PayIndexView
+     */
+    public clickAuto2(item: any = {}) {
+        const viewparam: any = {};
+        Object.assign(viewparam, {});
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'paytrades', parameterName: 'paytrade' },
+            { pathName: 'gridview', parameterName: 'gridview' },
+        ];
+        const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
+        if(Object.is(this.$route.fullPath,path)){
+            return;
+        }
+        this.$nextTick(function(){
+            this.$router.push(path);
+        })
+    }
+    
+    /**
+     * 支付平台
+     *
+     * @param {*} [item={}]
+     * @memberof PayIndexView
+     */
+    public clickAuto1(item: any = {}) {
+        const viewparam: any = {};
+        Object.assign(viewparam, {});
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'payopenaccesses', parameterName: 'payopenaccess' },
+            { pathName: 'gridview', parameterName: 'gridview' },
+        ];
+        const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
+        if(Object.is(this.$route.fullPath,path)){
+            return;
+        }
+        this.$nextTick(function(){
+            this.$router.push(path);
+        })
+    }
 
     /**
      * 数据加载
@@ -580,7 +580,7 @@ export default class PayIndexViewBase extends Vue implements ControlInterface {
      * @memberof PayIndexViewBase
      */
     public handleMenusResource(inputMenus:Array<any>){
-        if(this.$store.getters['authresource/getEnablePermissionValid']){
+        if(Environment.enablePermissionValid){
             this.computedEffectiveMenus(inputMenus);
             this.computeParentMenus(inputMenus);
         }

app_web/src/widgets/app/pay-index-view-appmenu/pay-index-view-appmenu-model.ts

@@ -15,7 +15,7 @@ export default class PayIndexViewModel {
      */
     public items: any[] = [
         {
-	id: '29375D3A-9707-4A76-A914-177A8DDDF566',
+	id: '62d37d214c3103bf6ed1e946106ec677',
 	name: 'menuitem1',
 	text: '支付平台',
 	type: 'MENUITEM',
@@ -34,7 +34,7 @@ export default class PayIndexViewModel {
 	authtag:'web-PayIndexView-menuitem1',
 },
         {
-	id: '3045EF5E-281B-4D8B-AF05-759C4845FB77',
+	id: '1e7394867e71eec256933bda6257bcc2',
 	name: 'menuitem2',
 	text: '交易记录',
 	type: 'MENUITEM',

app_web/src/widgets/pay-open-access/default-searchform/default-searchform-base.vue

@@ -589,7 +589,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'PayOpenAccessGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'PayOpenAccessPickupGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -625,7 +625,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'PayOpenAccessGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'PayOpenAccessPickupGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_web/src/widgets/pay-open-access/main-form/main-form-base.vue

@@ -1215,18 +1215,20 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public computeButtonState(data:any){
-        let targetData:any = this.transformData(data);
-        if(this.detailsModel && Object.keys(this.detailsModel).length >0){
-            Object.keys(this.detailsModel).forEach((name:any) =>{
-                if(this.detailsModel[name] && this.detailsModel[name].uiaction && this.detailsModel[name].uiaction.dataaccaction && Object.is(this.detailsModel[name].detailType,"BUTTON")){
-                    this.detailsModel[name].isPower = true;
-                    let tempUIAction:any = JSON.parse(JSON.stringify(this.detailsModel[name].uiaction));
-                    let result: any[] = ViewTool.calcActionItemAuthState(targetData,[tempUIAction],this.appUIService);
-                    this.detailsModel[name].visible = tempUIAction.visabled;
-                    this.detailsModel[name].disabled = tempUIAction.disabled;
-                    this.detailsModel[name].isPower = result[0] === 1 ? true : false;
-                }
-            })
+        if(Environment.enablePermissionValid){
+            let targetData:any = this.transformData(data);
+            if(this.detailsModel && Object.keys(this.detailsModel).length >0){
+                Object.keys(this.detailsModel).forEach((name:any) =>{
+                    if(this.detailsModel[name] && this.detailsModel[name].uiaction && this.detailsModel[name].uiaction.dataaccaction && Object.is(this.detailsModel[name].detailType,"BUTTON")){
+                        this.detailsModel[name].isPower = true;
+                        let tempUIAction:any = JSON.parse(JSON.stringify(this.detailsModel[name].uiaction));
+                        let result: any[] = ViewTool.calcActionItemAuthState(targetData,[tempUIAction],this.appUIService);
+                        this.detailsModel[name].visible = tempUIAction.visabled;
+                        this.detailsModel[name].disabled = tempUIAction.disabled;
+                        this.detailsModel[name].isPower = result[0] === 1 ? true : false;
+                    }
+                })
+            }
         }
     }
 

app_web/src/widgets/pay-trade/main-form/main-form-base.vue

@@ -1143,18 +1143,20 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public computeButtonState(data:any){
-        let targetData:any = this.transformData(data);
-        if(this.detailsModel && Object.keys(this.detailsModel).length >0){
-            Object.keys(this.detailsModel).forEach((name:any) =>{
-                if(this.detailsModel[name] && this.detailsModel[name].uiaction && this.detailsModel[name].uiaction.dataaccaction && Object.is(this.detailsModel[name].detailType,"BUTTON")){
-                    this.detailsModel[name].isPower = true;
-                    let tempUIAction:any = JSON.parse(JSON.stringify(this.detailsModel[name].uiaction));
-                    let result: any[] = ViewTool.calcActionItemAuthState(targetData,[tempUIAction],this.appUIService);
-                    this.detailsModel[name].visible = tempUIAction.visabled;
-                    this.detailsModel[name].disabled = tempUIAction.disabled;
-                    this.detailsModel[name].isPower = result[0] === 1 ? true : false;
-                }
-            })
+        if(Environment.enablePermissionValid){
+            let targetData:any = this.transformData(data);
+            if(this.detailsModel && Object.keys(this.detailsModel).length >0){
+                Object.keys(this.detailsModel).forEach((name:any) =>{
+                    if(this.detailsModel[name] && this.detailsModel[name].uiaction && this.detailsModel[name].uiaction.dataaccaction && Object.is(this.detailsModel[name].detailType,"BUTTON")){
+                        this.detailsModel[name].isPower = true;
+                        let tempUIAction:any = JSON.parse(JSON.stringify(this.detailsModel[name].uiaction));
+                        let result: any[] = ViewTool.calcActionItemAuthState(targetData,[tempUIAction],this.appUIService);
+                        this.detailsModel[name].visible = tempUIAction.visabled;
+                        this.detailsModel[name].disabled = tempUIAction.disabled;
+                        this.detailsModel[name].isPower = result[0] === 1 ? true : false;
+                    }
+                })
+            }
         }
     }
 

app_web/src/widgets/pay-trade/main-grid/main-grid-base.vue

@@ -21,66 +21,66 @@
             <template v-if="!isSingleSelect">
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
-            <template v-if="getColumnState('tradename')">
-                <el-table-column show-overflow-tooltip :prop="'tradename'" :label="$t('entities.paytrade.main_grid.columns.tradename')" :width="150"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.paytrade.main_grid.columns.tradename')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.tradename}}</span>
-                    </template>
-                </el-table-column>
-            </template>
-            <template v-if="getColumnState('subject')">
-                <el-table-column show-overflow-tooltip :prop="'subject'" :label="$t('entities.paytrade.main_grid.columns.subject')" :width="150"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.paytrade.main_grid.columns.subject')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.subject}}</span>
-                    </template>
-                </el-table-column>
-            </template>
-            <template v-if="getColumnState('outtradeno')">
-                <el-table-column show-overflow-tooltip :prop="'outtradeno'" :label="$t('entities.paytrade.main_grid.columns.outtradeno')" :width="150"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.paytrade.main_grid.columns.outtradeno')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.outtradeno}}</span>
-                    </template>
-                </el-table-column>
-            </template>
-            <template v-if="getColumnState('totalamount')">
-                <el-table-column show-overflow-tooltip :prop="'totalamount'" :label="$t('entities.paytrade.main_grid.columns.totalamount')" :width="150"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.paytrade.main_grid.columns.totalamount')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.totalamount}}</span>
-                    </template>
-                </el-table-column>
-            </template>
-            <template v-if="getColumnState('accessname')">
-                <el-table-column show-overflow-tooltip :prop="'accessname'" :label="$t('entities.paytrade.main_grid.columns.accessname')" :width="150"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.paytrade.main_grid.columns.accessname')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.accessname}}</span>
-                    </template>
-                </el-table-column>
-            </template>
+            <template v-if="getColumnState('tradename')">
+                <el-table-column show-overflow-tooltip :prop="'tradename'" :label="$t('entities.paytrade.main_grid.columns.tradename')" :width="150"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.paytrade.main_grid.columns.tradename')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.tradename}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('subject')">
+                <el-table-column show-overflow-tooltip :prop="'subject'" :label="$t('entities.paytrade.main_grid.columns.subject')" :width="150"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.paytrade.main_grid.columns.subject')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.subject}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('outtradeno')">
+                <el-table-column show-overflow-tooltip :prop="'outtradeno'" :label="$t('entities.paytrade.main_grid.columns.outtradeno')" :width="150"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.paytrade.main_grid.columns.outtradeno')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.outtradeno}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('totalamount')">
+                <el-table-column show-overflow-tooltip :prop="'totalamount'" :label="$t('entities.paytrade.main_grid.columns.totalamount')" :width="150"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.paytrade.main_grid.columns.totalamount')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.totalamount}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('accessname')">
+                <el-table-column show-overflow-tooltip :prop="'accessname'" :label="$t('entities.paytrade.main_grid.columns.accessname')" :width="150"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.paytrade.main_grid.columns.accessname')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.accessname}}</span>
+                    </template>
+                </el-table-column>
+            </template>
             <template v-if="adaptiveState">
                 <el-table-column></el-table-column>
             </template>
@@ -679,8 +679,10 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public getActionState(data:any){
         let tempActionModel:any = JSON.parse(JSON.stringify(this.ActionModel));
-        let targetData:any = this.transformData(data);
-        ViewTool.calcActionItemAuthState(targetData,tempActionModel,this.appUIService);
+        if(Environment.enablePermissionValid){
+            let targetData:any = this.transformData(data);
+            ViewTool.calcActionItemAuthState(targetData,tempActionModel,this.appUIService);
+        }
         return tempActionModel;
     }
 

config.xml

+<?xml version='1.1' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>ibzpay</description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>para1</name>
+          <description></description>
+          <defaultValue>para1</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>para2</name>
+          <description></description>
+          <defaultValue>para2</defaultValue>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>        
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>
+      BUILD_ID=DONTKILLME
+      source /etc/profile
+      rm -rf ibzpay
+	  git clone -b master $para2 ibzpay/
+      export NODE_OPTIONS=--max-old-space-size=4096
+      cd ibzpay/
+      </command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.plugins.ws__cleanup.WsCleanup plugin="ws-cleanup@0.34">
+      <patterns class="empty-list"/>
+      <deleteDirs>false</deleteDirs>
+      <skipWhenFailed>false</skipWhenFailed>
+      <cleanWhenSuccess>true</cleanWhenSuccess>
+      <cleanWhenUnstable>true</cleanWhenUnstable>
+      <cleanWhenFailure>true</cleanWhenFailure>
+      <cleanWhenNotBuilt>true</cleanWhenNotBuilt>
+      <cleanWhenAborted>true</cleanWhenAborted>
+      <notFailBuild>false</notFailBuild>
+      <cleanupMatrixParent>false</cleanupMatrixParent>
+      <externalDelete></externalDelete>
+    </hudson.plugins.ws__cleanup.WsCleanup>
+  </publishers>
+  <buildWrappers/>
+</project>

ibzpay-app/ibzpay-app-web/src/main/resources/application-web-prod.yml

@@ -7,14 +7,14 @@ logging:
 #zuul网关路由设置
 zuul:
   routes:
-    pay_open_access:
-      path: /payopenaccesses/**
-      serviceId: ${ibiz.ref.service.ibzpay-api:ibzpay-api}
-      stripPrefix: false
     pay_trade:
       path: /paytrades/**
       serviceId: ${ibiz.ref.service.ibzpay-api:ibzpay-api}
       stripPrefix: false
+    pay_open_access:
+      path: /payopenaccesses/**
+      serviceId: ${ibiz.ref.service.ibzpay-api:ibzpay-api}
+      stripPrefix: false
     loginv7:
       path: /v7/login
       serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}

ibzpay-core/src/main/java/cn/ibizlab/core/pay/domain/PayTrade.java

@@ -41,13 +41,19 @@ public class PayTrade extends EntityMP implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 交易标识
+     * 订单标题
      */
-    @DEField(isKeyField=true)
-    @TableId(value= "tradeid",type=IdType.ASSIGN_UUID)
-    @JSONField(name = "trade_id")
-    @JsonProperty("trade_id")
-    private String tradeId;
+    @TableField(value = "subject")
+    @JSONField(name = "subject")
+    @JsonProperty("subject")
+    private String subject;
+    /**
+     * 订单金额
+     */
+    @TableField(value = "totalamount")
+    @JSONField(name = "total_amount")
+    @JsonProperty("total_amount")
+    private String totalAmount;
     /**
      * 交易名称
      */
@@ -56,12 +62,19 @@ public class PayTrade extends EntityMP implements Serializable {
     @JsonProperty("trade_name")
     private String tradeName;
     /**
-     * 订单标题
+     * 支付类型
      */
-    @TableField(value = "subject")
-    @JSONField(name = "subject")
-    @JsonProperty("subject")
-    private String subject;
+    @TableField(value = "tradetype")
+    @JSONField(name = "trade_type")
+    @JsonProperty("trade_type")
+    private String tradeType;
+    /**
+     * 支付状态
+     */
+    @TableField(value = "tradestatus")
+    @JSONField(name = "trade_status")
+    @JsonProperty("trade_status")
+    private String tradeStatus;
     /**
      * 订单号
      */
@@ -70,26 +83,13 @@ public class PayTrade extends EntityMP implements Serializable {
     @JsonProperty("out_trade_no")
     private String outTradeNo;
     /**
-     * 订单金额
-     */
-    @TableField(value = "totalamount")
-    @JSONField(name = "total_amount")
-    @JsonProperty("total_amount")
-    private String totalAmount;
-    /**
-     * 支付平台接入标识
-     */
-    @TableField(value = "accessid")
-    @JSONField(name = "access_id")
-    @JsonProperty("access_id")
-    private String accessId;
-    /**
-     * 支付平台
+     * 交易标识
      */
-    @TableField(value = "accessname")
-    @JSONField(name = "access_name")
-    @JsonProperty("access_name")
-    private String accessName;
+    @DEField(isKeyField=true)
+    @TableId(value= "tradeid",type=IdType.ASSIGN_UUID)
+    @JSONField(name = "trade_id")
+    @JsonProperty("trade_id")
+    private String tradeId;
     /**
      * AccessKey(AppId)
      */
@@ -98,19 +98,19 @@ public class PayTrade extends EntityMP implements Serializable {
     @JsonProperty("app_id")
     private String appId;
     /**
-     * 支付类型
+     * 支付平台
      */
-    @TableField(value = "tradetype")
-    @JSONField(name = "trade_type")
-    @JsonProperty("trade_type")
-    private String tradeType;
+    @TableField(value = "accessname")
+    @JSONField(name = "access_name")
+    @JsonProperty("access_name")
+    private String accessName;
     /**
-     * 支付状态
+     * 支付平台接入标识
      */
-    @TableField(value = "tradestatus")
-    @JSONField(name = "trade_status")
-    @JsonProperty("trade_status")
-    private String tradeStatus;
+    @TableField(value = "accessid")
+    @JSONField(name = "access_id")
+    @JsonProperty("access_id")
+    private String accessId;
 
     /**
      * 接入平台
@@ -122,14 +122,6 @@ public class PayTrade extends EntityMP implements Serializable {
 
 
 
-    /**
-     * 设置 [交易名称]
-     */
-    public void setTradeName(String tradeName){
-        this.tradeName = tradeName ;
-        this.modify("tradename",tradeName);
-    }
-
     /**
      * 设置 [订单标题]
      */
@@ -138,14 +130,6 @@ public class PayTrade extends EntityMP implements Serializable {
         this.modify("subject",subject);
     }
 
-    /**
-     * 设置 [订单号]
-     */
-    public void setOutTradeNo(String outTradeNo){
-        this.outTradeNo = outTradeNo ;
-        this.modify("outtradeno",outTradeNo);
-    }
-
     /**
      * 设置 [订单金额]
      */
@@ -155,19 +139,35 @@ public class PayTrade extends EntityMP implements Serializable {
     }
 
     /**
-     * 设置 [支付平台接入标识]
+     * 设置 [交易名称]
      */
-    public void setAccessId(String accessId){
-        this.accessId = accessId ;
-        this.modify("accessid",accessId);
+    public void setTradeName(String tradeName){
+        this.tradeName = tradeName ;
+        this.modify("tradename",tradeName);
     }
 
     /**
-     * 设置 [支付平台]
+     * 设置 [支付类型]
      */
-    public void setAccessName(String accessName){
-        this.accessName = accessName ;
-        this.modify("accessname",accessName);
+    public void setTradeType(String tradeType){
+        this.tradeType = tradeType ;
+        this.modify("tradetype",tradeType);
+    }
+
+    /**
+     * 设置 [支付状态]
+     */
+    public void setTradeStatus(String tradeStatus){
+        this.tradeStatus = tradeStatus ;
+        this.modify("tradestatus",tradeStatus);
+    }
+
+    /**
+     * 设置 [订单号]
+     */
+    public void setOutTradeNo(String outTradeNo){
+        this.outTradeNo = outTradeNo ;
+        this.modify("outtradeno",outTradeNo);
     }
 
     /**
@@ -179,19 +179,19 @@ public class PayTrade extends EntityMP implements Serializable {
     }
 
     /**
-     * 设置 [支付类型]
+     * 设置 [支付平台]
      */
-    public void setTradeType(String tradeType){
-        this.tradeType = tradeType ;
-        this.modify("tradetype",tradeType);
+    public void setAccessName(String accessName){
+        this.accessName = accessName ;
+        this.modify("accessname",accessName);
     }
 
     /**
-     * 设置 [支付状态]
+     * 设置 [支付平台接入标识]
      */
-    public void setTradeStatus(String tradeStatus){
-        this.tradeStatus = tradeStatus ;
-        this.modify("tradestatus",tradeStatus);
+    public void setAccessId(String accessId){
+        this.accessId = accessId ;
+        this.modify("accessid",accessId);
     }
 
 

ibzpay-core/src/main/java/cn/ibizlab/core/pay/filter/PayTradeSearchContext.java

@@ -34,11 +34,11 @@ public class PayTradeSearchContext extends QueryWrapperContext<PayTrade> {
             this.getSearchCond().like("tradename", n_tradename_like);
         }
     }
-	private String n_accessid_eq;//[支付平台接入标识]
-	public void setN_accessid_eq(String n_accessid_eq) {
-        this.n_accessid_eq = n_accessid_eq;
-        if(!ObjectUtils.isEmpty(this.n_accessid_eq)){
-            this.getSearchCond().eq("accessid", n_accessid_eq);
+	private String n_tradestatus_eq;//[支付状态]
+	public void setN_tradestatus_eq(String n_tradestatus_eq) {
+        this.n_tradestatus_eq = n_tradestatus_eq;
+        if(!ObjectUtils.isEmpty(this.n_tradestatus_eq)){
+            this.getSearchCond().eq("tradestatus", n_tradestatus_eq);
         }
     }
 	private String n_accessname_eq;//[支付平台]
@@ -55,11 +55,11 @@ public class PayTradeSearchContext extends QueryWrapperContext<PayTrade> {
             this.getSearchCond().like("accessname", n_accessname_like);
         }
     }
-	private String n_tradestatus_eq;//[支付状态]
-	public void setN_tradestatus_eq(String n_tradestatus_eq) {
-        this.n_tradestatus_eq = n_tradestatus_eq;
-        if(!ObjectUtils.isEmpty(this.n_tradestatus_eq)){
-            this.getSearchCond().eq("tradestatus", n_tradestatus_eq);
+	private String n_accessid_eq;//[支付平台接入标识]
+	public void setN_accessid_eq(String n_accessid_eq) {
+        this.n_accessid_eq = n_accessid_eq;
+        if(!ObjectUtils.isEmpty(this.n_accessid_eq)){
+            this.getSearchCond().eq("accessid", n_accessid_eq);
         }
     }
 

ibzpay-core/src/main/java/cn/ibizlab/core/pay/service/impl/PayTradeServiceImpl.java

@@ -186,8 +186,8 @@ public class PayTradeServiceImpl extends ServiceImpl<PayTradeMapper, PayTrade> i
                 et.setOpenaccess(majorEntity);
                 openaccess=majorEntity;
             }
-            et.setAccessName(openaccess.getName());
             et.setAppId(openaccess.getAccessKey());
+            et.setAccessName(openaccess.getName());
         }
     }
 

ibzpay-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">
-
-
-
-    <!--输出实体[PAY_OPEN_ACCESS]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-pay_open_access-71-1">
-        <createTable tableName="IBZOPENACCESS">
-                <column name="ACCESSID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_PAY_OPEN_ACCESS_ACCESSID"/>
-                </column>
-                <column name="ACCESSNAME" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="OPEN_TYPE" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="ACCESS_KEY" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="SECRET_KEY" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="REGION_ID" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="ACCESS_TOKEN" remarks="" type="VARCHAR(1000)">
-                </column>
-                <column name="EXPIRES_TIME" remarks="" type="DATETIME">
-                </column>
-                <column name="DISABLED" remarks="" type="INT">
-                </column>
-                <column name="REDIRECT_URI" remarks="" type="VARCHAR(500)">
-                </column>
-        </createTable>
-    </changeSet>
-
-
-    <!--输出实体[PAY_TRADE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-pay_trade-147-2">
-        <createTable tableName="IBZPAYTRADE">
-                <column name="TRADEID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_PAY_TRADE_TRADEID"/>
-                </column>
-                <column name="TRADENAME" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="SUBJECT" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="OUTTRADENO" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="TOTALAMOUNT" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="ACCESSID" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="ACCESSNAME" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="APPID" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="TRADETYPE" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="TRADESTATUS" remarks="" type="VARCHAR(60)">
-                </column>
-        </createTable>
-    </changeSet>
-
-        <!--输出实体[PAY_OPEN_ACCESS]外键关系 -->
-        <!--输出实体[PAY_TRADE]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-pay_trade-147-3">
-       <addForeignKeyConstraint baseColumnNames="ACCESSID" baseTableName="IBZPAYTRADE" constraintName="DER1N_PAY_TRADE_PAY_OPEN_ACCES" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ACCESSID" referencedTableName="IBZOPENACCESS" 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_en_US" at line 28, column 24]
+----
\ No newline at end of file

ibzpay-core/src/main/resources/permission/systemResource.json

@@ -4,16 +4,16 @@
     ],
     "entities":[
     {
-    "dename":"PayOpenAccess",
-    "delogicname":"支付平台",
+    "dename":"PayTrade",
+    "delogicname":"支付交易",
     "sysmoudle":{"id":"PAY","name":"pay"},
     "dedataset":[{"id":"Default" , "name":"数据集"}],
     "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
     "datascope":[{"id":"all","name":"全部数据"}]
      }
     ,    {
-    "dename":"PayTrade",
-    "delogicname":"支付交易",
+    "dename":"PayOpenAccess",
+    "delogicname":"支付平台",
     "sysmoudle":{"id":"PAY","name":"pay"},
     "dedataset":[{"id":"Default" , "name":"数据集"}],
     "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],

ibzpay-dependencies/pom.xml

@@ -86,7 +86,6 @@
         <!-- 阿里seata分布式事务 -->
         <alibaba-seata.version>1.3.0</alibaba-seata.version>
 
-        <oracle.version>11.2.0.3</oracle.version>
 
     </properties>
 
@@ -331,12 +330,6 @@
             <version>${eureka-client.version}</version>
         </dependency>
 
-        <!--  Oracle驱动包 -->
-        <dependency>
-            <groupId>com.oracle</groupId>
-            <artifactId>ojdbc6</artifactId>
-            <version>${oracle.version}</version>
-        </dependency>
         <!--  MySQL驱动包 -->
         <dependency>
             <groupId>mysql</groupId>

ibzpay-provider/ibzpay-provider-api/src/main/java/cn/ibizlab/api/dto/PayTradeDTO.java

@@ -25,12 +25,20 @@ public class PayTradeDTO extends DTOBase implements Serializable {
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 属性 [TRADEID]
+     * 属性 [SUBJECT]
      *
      */
-    @JSONField(name = "trade_id")
-    @JsonProperty("trade_id")
-    private String tradeId;
+    @JSONField(name = "subject")
+    @JsonProperty("subject")
+    private String subject;
+
+    /**
+     * 属性 [TOTALAMOUNT]
+     *
+     */
+    @JSONField(name = "total_amount")
+    @JsonProperty("total_amount")
+    private String totalAmount;
 
     /**
      * 属性 [TRADENAME]
@@ -41,12 +49,20 @@ public class PayTradeDTO extends DTOBase implements Serializable {
     private String tradeName;
 
     /**
-     * 属性 [SUBJECT]
+     * 属性 [TRADETYPE]
      *
      */
-    @JSONField(name = "subject")
-    @JsonProperty("subject")
-    private String subject;
+    @JSONField(name = "trade_type")
+    @JsonProperty("trade_type")
+    private String tradeType;
+
+    /**
+     * 属性 [TRADESTATUS]
+     *
+     */
+    @JSONField(name = "trade_status")
+    @JsonProperty("trade_status")
+    private String tradeStatus;
 
     /**
      * 属性 [OUTTRADENO]
@@ -57,20 +73,20 @@ public class PayTradeDTO extends DTOBase implements Serializable {
     private String outTradeNo;
 
     /**
-     * 属性 [TOTALAMOUNT]
+     * 属性 [TRADEID]
      *
      */
-    @JSONField(name = "total_amount")
-    @JsonProperty("total_amount")
-    private String totalAmount;
+    @JSONField(name = "trade_id")
+    @JsonProperty("trade_id")
+    private String tradeId;
 
     /**
-     * 属性 [ACCESSID]
+     * 属性 [APPID]
      *
      */
-    @JSONField(name = "access_id")
-    @JsonProperty("access_id")
-    private String accessId;
+    @JSONField(name = "app_id")
+    @JsonProperty("app_id")
+    private String appId;
 
     /**
      * 属性 [ACCESSNAME]
@@ -81,29 +97,29 @@ public class PayTradeDTO extends DTOBase implements Serializable {
     private String accessName;
 
     /**
-     * 属性 [APPID]
+     * 属性 [ACCESSID]
      *
      */
-    @JSONField(name = "app_id")
-    @JsonProperty("app_id")
-    private String appId;
+    @JSONField(name = "access_id")
+    @JsonProperty("access_id")
+    private String accessId;
+
 
     /**
-     * 属性 [TRADETYPE]
-     *
+     * 设置 [SUBJECT]
      */
-    @JSONField(name = "trade_type")
-    @JsonProperty("trade_type")
-    private String tradeType;
+    public void setSubject(String  subject){
+        this.subject = subject ;
+        this.modify("subject",subject);
+    }
 
     /**
-     * 属性 [TRADESTATUS]
-     *
+     * 设置 [TOTALAMOUNT]
      */
-    @JSONField(name = "trade_status")
-    @JsonProperty("trade_status")
-    private String tradeStatus;
-
+    public void setTotalAmount(String  totalAmount){
+        this.totalAmount = totalAmount ;
+        this.modify("totalamount",totalAmount);
+    }
 
     /**
      * 设置 [TRADENAME]
@@ -114,43 +130,27 @@ public class PayTradeDTO extends DTOBase implements Serializable {
     }
 
     /**
-     * 设置 [SUBJECT]
-     */
-    public void setSubject(String  subject){
-        this.subject = subject ;
-        this.modify("subject",subject);
-    }
-
-    /**
-     * 设置 [OUTTRADENO]
-     */
-    public void setOutTradeNo(String  outTradeNo){
-        this.outTradeNo = outTradeNo ;
-        this.modify("outtradeno",outTradeNo);
-    }
-
-    /**
-     * 设置 [TOTALAMOUNT]
+     * 设置 [TRADETYPE]
      */
-    public void setTotalAmount(String  totalAmount){
-        this.totalAmount = totalAmount ;
-        this.modify("totalamount",totalAmount);
+    public void setTradeType(String  tradeType){
+        this.tradeType = tradeType ;
+        this.modify("tradetype",tradeType);
     }
 
     /**
-     * 设置 [ACCESSID]
+     * 设置 [TRADESTATUS]
      */
-    public void setAccessId(String  accessId){
-        this.accessId = accessId ;
-        this.modify("accessid",accessId);
+    public void setTradeStatus(String  tradeStatus){
+        this.tradeStatus = tradeStatus ;
+        this.modify("tradestatus",tradeStatus);
     }
 
     /**
-     * 设置 [ACCESSNAME]
+     * 设置 [OUTTRADENO]
      */
-    public void setAccessName(String  accessName){
-        this.accessName = accessName ;
-        this.modify("accessname",accessName);
+    public void setOutTradeNo(String  outTradeNo){
+        this.outTradeNo = outTradeNo ;
+        this.modify("outtradeno",outTradeNo);
     }
 
     /**
@@ -162,19 +162,19 @@ public class PayTradeDTO extends DTOBase implements Serializable {
     }
 
     /**
-     * 设置 [TRADETYPE]
+     * 设置 [ACCESSNAME]
      */
-    public void setTradeType(String  tradeType){
-        this.tradeType = tradeType ;
-        this.modify("tradetype",tradeType);
+    public void setAccessName(String  accessName){
+        this.accessName = accessName ;
+        this.modify("accessname",accessName);
     }
 
     /**
-     * 设置 [TRADESTATUS]
+     * 设置 [ACCESSID]
      */
-    public void setTradeStatus(String  tradeStatus){
-        this.tradeStatus = tradeStatus ;
-        this.modify("tradestatus",tradeStatus);
+    public void setAccessId(String  accessId){
+        this.accessId = accessId ;
+        this.modify("accessid",accessId);
     }
 
 

ibzpay-util/src/main/resources/application-sys.yml

@@ -22,9 +22,9 @@ spring:
       max-file-size: 100MB
       max-request-size: 100MB
   datasource:
-    username: a_A_5d9d78509
-    password: '@6dEfb3@'
-    url: jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+    username: root
+    password: 'root'
+    url: jdbc:mysql://127.0.0.1:3306/ibzpay?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
     driver-class-name: com.mysql.jdbc.Driver
     filters: stat,wall,log4j2
     #配置初始化大小/最小/最大
@@ -45,7 +45,7 @@ spring:
     pool-prepared-statements: false
     max-pool-prepared-statement-per-connection-size: 20
     isSyncDBSchema: false
-    defaultSchema: a_A_5d9d78509
+    defaultSchema: root
     conf: classpath:liquibase/master.xml
 
 #Mybatis-plus配置