Skip to content

I
ibzpay
提交 6f9addd7 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 发布系统代码

上级 dff7116a
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 1358 行增加 和 1432 行删除
app_web/public/assets/json/view-config.json
浏览文件 @ 6f9addd7
...@@ -5,15 +5,23 @@ ...@@ -5,15 +5,23 @@
"viewtype": "DEEDITVIEW", "viewtype": "DEEDITVIEW",
"viewmodule": "pay", "viewmodule": "pay",
"viewname": "PayTradeEditView", "viewname": "PayTradeEditView",
"viewtag": "1ebd898d7c9c1d6c0f9f6c2944e92148" "viewtag": "089cc88e549cef536c3380ccb1ce465f"
}, },
"payopenaccesspickupgridview": { "paytradegridview": {
"title": "支付平台选择表格视图", "title": "支付交易表格视图",
"caption": "支付交易",
"viewtype": "DEGRIDVIEW",
"viewmodule": "pay",
"viewname": "PayTradeGridView",
"viewtag": "1f1889a2c3e7f49d9221021499a0f78a"
},
"payopenaccessgridview": {
"title": "支付平台表格视图",
"caption": "支付平台", "caption": "支付平台",
"viewtype": "DEPICKUPGRIDVIEW", "viewtype": "DEGRIDVIEW",
"viewmodule": "pay", "viewmodule": "pay",
"viewname": "PayOpenAccessPickupGridView", "viewname": "PayOpenAccessGridView",
"viewtag": "32bd7f047dffe91d62357bff08f6e5d1" "viewtag": "60fe0b9b8535b02baf1a02d5f56c5a9c"
}, },
"payindexview": { "payindexview": {
"title": "pay", "title": "pay",
...@@ -21,23 +29,15 @@ ...@@ -21,23 +29,15 @@
"viewtype": "APPINDEXVIEW", "viewtype": "APPINDEXVIEW",
"viewmodule": "pay", "viewmodule": "pay",
"viewname": "PayIndexView", "viewname": "PayIndexView",
"viewtag": "48CC4447-52C4-4B23-810E-1C0E2465A0D7" "viewtag": "9bc4c8beaa1b07a28cb977318653a0bd"
},
"paytradegridview": {
"title": "支付交易表格视图",
"caption": "支付交易",
"viewtype": "DEGRIDVIEW",
"viewmodule": "pay",
"viewname": "PayTradeGridView",
"viewtag": "6e9610d7cd8dc92a1305216e416207c0"
}, },
"payopenaccesseditview": { "payopenaccesspickupgridview": {
"title": "支付平台编辑视图", "title": "支付平台选择表格视图",
"caption": "支付平台", "caption": "支付平台",
"viewtype": "DEEDITVIEW", "viewtype": "DEPICKUPGRIDVIEW",
"viewmodule": "pay", "viewmodule": "pay",
"viewname": "PayOpenAccessEditView", "viewname": "PayOpenAccessPickupGridView",
"viewtag": "8bbba1ab4ef6cfce89b59175e1efecd0" "viewtag": "b1fe00a9dfb2160b1589b4e1e2b1d2fc"
}, },
"payopenaccesspickupview": { "payopenaccesspickupview": {
"title": "支付平台数据选择视图", "title": "支付平台数据选择视图",
...@@ -45,14 +45,14 @@ ...@@ -45,14 +45,14 @@
"viewtype": "DEPICKUPVIEW", "viewtype": "DEPICKUPVIEW",
"viewmodule": "pay", "viewmodule": "pay",
"viewname": "PayOpenAccessPickupView", "viewname": "PayOpenAccessPickupView",
"viewtag": "94f275381f7b5d6c18c715afdba9b484" "viewtag": "f3bb55ce97b7b94c99782d0cea879eaa"
}, },
"payopenaccessgridview": { "payopenaccesseditview": {
"title": "支付平台表格视图", "title": "支付平台编辑视图",
"caption": "支付平台", "caption": "支付平台",
"viewtype": "DEGRIDVIEW", "viewtype": "DEEDITVIEW",
"viewmodule": "pay", "viewmodule": "pay",
"viewname": "PayOpenAccessGridView", "viewname": "PayOpenAccessEditView",
"viewtag": "c6788e489ffbe107540ffa19650faf5a" "viewtag": "f5f50734bb86ba01097a7cb19b63d36c"
} }
} }
app_web/src/app-register.ts
浏览文件 @ 6f9addd7
...@@ -86,9 +86,6 @@ import AppLockScren from './components/app-lock-scren/app-lock-scren.vue' ...@@ -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 ActionTimeline from './components/action-timeline/action-timeline.vue'
import CronEditor from './components/cron-editor/cron-editor.vue' import CronEditor from './components/cron-editor/cron-editor.vue'
import AppMessagePopover from './components/app-message-popover/app-message-popover.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实体服务注册中心 // 全局挂载UI实体服务注册中心
window['uiServiceRegister'] = uiServiceRegister; window['uiServiceRegister'] = uiServiceRegister;
...@@ -114,8 +111,6 @@ export const AppComponents = { ...@@ -114,8 +111,6 @@ export const AppComponents = {
v.prototype.$verify = Verify; v.prototype.$verify = Verify;
v.prototype.$viewTool = ViewTool; v.prototype.$viewTool = ViewTool;
v.prototype.$uiActionTool = UIActionTool; 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-full-scren',AppFullScren);
v.component('app-lock-scren',AppLockScren); v.component('app-lock-scren',AppLockScren);
v.component('input-box', InputBox); v.component('input-box', InputBox);
......
app_web/src/authservice/auth-service-register.ts
浏览文件 @ 6f9addd7
...@@ -39,8 +39,8 @@ export class AuthServiceRegister { ...@@ -39,8 +39,8 @@ export class AuthServiceRegister {
* @memberof AuthServiceRegister * @memberof AuthServiceRegister
*/ */
protected init(): void { 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
浏览文件 @ 6f9addd7
...@@ -112,9 +112,6 @@ export default class AuthService { ...@@ -112,9 +112,6 @@ export default class AuthService {
* @memberof AuthService * @memberof AuthService
*/ */
public getMenusPermission(item: any): boolean { public getMenusPermission(item: any): boolean {
if(!this.$store.getters['authresource/getEnablePermissionValid']) {
return true;
}
return this.$store.getters['authresource/getAuthMenu'](item); return this.$store.getters['authresource/getAuthMenu'](item);
} }
...@@ -126,9 +123,6 @@ export default class AuthService { ...@@ -126,9 +123,6 @@ export default class AuthService {
* @memberof AuthService * @memberof AuthService
*/ */
public getResourcePermission(tag: any): boolean { public getResourcePermission(tag: any): boolean {
if(!this.$store.getters['authresource/getEnablePermissionValid']) {
return true;
}
return this.$store.getters['authresource/getResourceData'](tag); return this.$store.getters['authresource/getResourceData'](tag);
} }
......
app_web/src/components/app-actionbar/app-actionbar.vue
浏览文件 @ 6f9addd7
...@@ -100,6 +100,7 @@ export default class AppActionBar extends Vue { ...@@ -100,6 +100,7 @@ export default class AppActionBar extends Vue {
* @memberof AppActionBar * @memberof AppActionBar
*/ */
public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){ public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){
if(Environment.enablePermissionValid){
for (const key in ActionModel) { for (const key in ActionModel) {
if (!ActionModel.hasOwnProperty(key)) { if (!ActionModel.hasOwnProperty(key)) {
return; return;
...@@ -133,6 +134,7 @@ export default class AppActionBar extends Vue { ...@@ -133,6 +134,7 @@ export default class AppActionBar extends Vue {
} }
} }
} }
}
/** /**
* 组件销毁 * 组件销毁
......
app_web/src/components/app-data-upload/app-data-upload.less
浏览文件 @ 6f9addd7
...@@ -18,7 +18,4 @@ ...@@ -18,7 +18,4 @@
font-family: '微软雅黑','黑体','宋体'; font-family: '微软雅黑','黑体','宋体';
font-size: 16px; font-size: 16px;
} }
.progress {
margin-top: -15px;
}
} }
\ No newline at end of file
app_web/src/components/app-data-upload/app-data-upload.vue
浏览文件 @ 6f9addd7
<template> <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-row style="margin-top:24px" :gutter="20">
<el-col :span="4"> <el-col :span="4">
<el-button type="primary" @click="handleUpLoad">{{$t('components.appDataUploadView.selectfile')}}</el-button> <el-button type="primary" @click="handleUpLoad">{{$t('components.appDataUploadView.selectfile')}}</el-button>
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
</el-col> </el-col>
</el-row> </el-row>
<el-divider></el-divider> <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;"> <el-row style="height:480px;padding: 0px 12px;">
<div class="data-info-content" > <div class="data-info-content" >
<template v-if="importDataArray.length >0 && isUploading === false"> <template v-if="importDataArray.length >0 && isUploading === false">
...@@ -51,7 +50,6 @@ import XLSX from 'xlsx'; ...@@ -51,7 +50,6 @@ import XLSX from 'xlsx';
import CodeListService from "@service/app/codelist-service"; import CodeListService from "@service/app/codelist-service";
import EntityService from '@/service/entity-service'; import EntityService from '@/service/entity-service';
import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator'; import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
import { Environment } from '@/environments/environment';
@Component({ @Component({
}) })
...@@ -194,22 +192,6 @@ export default class AppDataUploadView extends Vue { ...@@ -194,22 +192,6 @@ export default class AppDataUploadView extends Vue {
*/ */
public allFieldMap:Map<string,any> = new Map(); 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 { ...@@ -300,29 +282,10 @@ export default class AppDataUploadView extends Vue {
this.transformData(this.importDataArray,tempDataArray); this.transformData(this.importDataArray,tempDataArray);
this.hasImported = true; this.hasImported = true;
this.isUploading = true; this.isUploading = true;
this.uploadProgress = 0;
this.importDataArray = []; 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{ try{
this.entityService.getService(this.viewparams.serviceName).then((service:any) =>{ 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; const result:any = res.data;
if(result && result.rst !== 0){ if(result && result.rst !== 0){
this.promptInfo = (this.$t('components.appDataUploadView.importfailed') as string); this.promptInfo = (this.$t('components.appDataUploadView.importfailed') as string);
...@@ -331,8 +294,7 @@ export default class AppDataUploadView extends Vue { ...@@ -331,8 +294,7 @@ export default class AppDataUploadView extends Vue {
} }
this.importSuccessData = result.data; this.importSuccessData = result.data;
this.promptInfo = (this.$t('components.appDataUploadView.completed') as string); this.promptInfo = (this.$t('components.appDataUploadView.completed') as string);
this.uploadProgress = Number((cnt / dataArray.length * 100).toFixed(2)); this.isUploading = false;
this.sliceUploadService(dataArray, cnt + this.sliceUploadCnt);
}).catch((error:any) =>{ }).catch((error:any) =>{
this.isUploading = false; this.isUploading = false;
this.promptInfo = (this.$t('components.appDataUploadView.importfailed') as string); this.promptInfo = (this.$t('components.appDataUploadView.importfailed') as string);
...@@ -349,6 +311,7 @@ export default class AppDataUploadView extends Vue { ...@@ -349,6 +311,7 @@ export default class AppDataUploadView extends Vue {
console.error(error); console.error(error);
}; };
} }
/** /**
* 导出excel * 导出excel
* *
......
app_web/src/components/app-form-group/app-form-group.vue
浏览文件 @ 6f9addd7
...@@ -158,6 +158,7 @@ export default class AppFormGroup extends Vue { ...@@ -158,6 +158,7 @@ export default class AppFormGroup extends Vue {
* @memberof AppFormGroup * @memberof AppFormGroup
*/ */
public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){ public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){
if(Environment.enablePermissionValid){
for (const key in ActionModel) { for (const key in ActionModel) {
if (!ActionModel.hasOwnProperty(key)) { if (!ActionModel.hasOwnProperty(key)) {
return; return;
...@@ -191,6 +192,7 @@ export default class AppFormGroup extends Vue { ...@@ -191,6 +192,7 @@ export default class AppFormGroup extends Vue {
} }
} }
} }
}
/** /**
* 是否为管理容器 * 是否为管理容器
......
app_web/src/components/app-header-menus/app-header-menus.vue
浏览文件 @ 6f9addd7
...@@ -41,7 +41,7 @@ export default class AppHeaderMenus extends Vue { ...@@ -41,7 +41,7 @@ export default class AppHeaderMenus extends Vue {
{ {
name: "ibizstudio", name: "ibizstudio",
title: "components.appHeaderMenus.ibizstudio.title", 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', iconcls: 'fa fa-wrench',
}, },
{ {
......
app_web/src/components/app-message-popover/app-message-popover.vue
浏览文件 @ 6f9addd7
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
this.getMyMsgs(); this.getMyMsgs();
} }
}).catch((error: any) => { }).catch((error: any) => {
console.warn("加载数据错误"); this.$Notice.error({title: '错误', desc: error});
}) })
} }
......
app_web/src/components/app-span/app-span.vue
浏览文件 @ 6f9addd7
...@@ -214,8 +214,7 @@ export default class AppSpan extends Vue { ...@@ -214,8 +214,7 @@ export default class AppSpan extends Vue {
this.text = Number(number.toFixed(this.precision)).toLocaleString('en-US')+ ' '+ this.unitName; this.text = Number(number.toFixed(this.precision)).toLocaleString('en-US')+ ' '+ this.unitName;
}else if(Object.is(this.dataType,"FLOAT") || Object.is(this.dataType,"DECIMAL")){ }else if(Object.is(this.dataType,"FLOAT") || Object.is(this.dataType,"DECIMAL")){
let number:any = Number(this.value); 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.toFixed(this.precision);
this.text = (Number(this.precision) === 0 && decimalCnt !== 0) ? number.toFixed(decimalCnt) : number.toFixed(this.precision);
}else { }else {
this.text = this.value; this.text = this.value;
} }
......
app_web/src/components/context-menu-drag/context-menu-drag.vue
浏览文件 @ 6f9addd7
...@@ -293,13 +293,12 @@ export default class ContextMenuDrag extends Vue { ...@@ -293,13 +293,12 @@ export default class ContextMenuDrag extends Vue {
mounted() { mounted() {
let that: any = this; let that: any = this;
const get: Promise<any> = this.entityService.getAllApp(null,{}); const get: Promise<any> = this.entityService.getAllApp(null,{});
get.then((response: any) => { get
.then((response: any) => {
if (response) { if (response) {
that.list = response.data.model; that.list = response.data.model;
that.listFilter(); that.listFilter();
} }
}).catch((error:any) =>{
console.warn("加载数据错误")
}); });
} }
} }
......
app_web/src/components/context-menu/context-menu.tsx
浏览文件 @ 6f9addd7
...@@ -92,14 +92,6 @@ export default class ContextMenu extends Vue { ...@@ -92,14 +92,6 @@ export default class ContextMenu extends Vue {
*/ */
@Prop() @Prop()
public menus?: any[] public menus?: any[]
/**
* 是否阻止默认绘制上下文菜单
*
* @type {any}
* @memberof ContextMenu
*/
@Prop({default:false})
public isBlocked?:any;
/** /**
* 显示右键菜单 * 显示右键菜单
...@@ -203,10 +195,7 @@ export default class ContextMenu extends Vue { ...@@ -203,10 +195,7 @@ export default class ContextMenu extends Vue {
if (contextRef) { if (contextRef) {
contextRef.oncontextmenu = (event: MouseEvent) => { contextRef.oncontextmenu = (event: MouseEvent) => {
event.preventDefault(); event.preventDefault();
if(!this.isBlocked){
this.showContextMenu(event.clientX, event.clientY); this.showContextMenu(event.clientX, event.clientY);
}
this.$emit("showContext",event);
}; };
} }
} }
......
app_web/src/engine/view/view-engine.ts
浏览文件 @ 6f9addd7
...@@ -186,6 +186,7 @@ export default class ViewEngine { ...@@ -186,6 +186,7 @@ export default class ViewEngine {
* @memberof ViewEngine * @memberof ViewEngine
*/ */
public calcToolbarItemAuthState(data:any){ public calcToolbarItemAuthState(data:any){
if(Environment.enablePermissionValid){
const _this: any = this; const _this: any = this;
for (const key in _this.view.toolBarModels) { for (const key in _this.view.toolBarModels) {
if (!_this.view.toolBarModels.hasOwnProperty(key)) { if (!_this.view.toolBarModels.hasOwnProperty(key)) {
...@@ -220,5 +221,6 @@ export default class ViewEngine { ...@@ -220,5 +221,6 @@ export default class ViewEngine {
} }
} }
} }
}
} }
\ No newline at end of file
app_web/src/environments/environment.ts
浏览文件 @ 6f9addd7
...@@ -15,8 +15,6 @@ export const Environment = { ...@@ -15,8 +15,6 @@ export const Environment = {
ExportFile: '/ibizutil/download', ExportFile: '/ibizutil/download',
// 文件上传 // 文件上传
UploadFile: '/ibizutil/upload', UploadFile: '/ibizutil/upload',
// 数据导入单次上传最大数量
sliceUploadCnt: 100,
// 是否为pc端应用 // 是否为pc端应用
isAppMode:true, isAppMode:true,
//统一地址 //统一地址
...@@ -38,7 +36,7 @@ export const Environment = { ...@@ -38,7 +36,7 @@ export const Environment = {
// 前端应用标识 // 前端应用标识
AppId: "6e0b7357169ef4eba84e1347ed94bd84", 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开放平台地址 // ibiz开放平台地址
ibizlabtUrl: 'https://www.ibizlab.cn', ibizlabtUrl: 'https://www.ibizlab.cn',
// ibiz论坛地址 // ibiz论坛地址
......
app_web/src/locale/lang/en-US.ts
浏览文件 @ 6f9addd7
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 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 components_en_US from '@locale/lanres/components/components_en_US';
import codelist_en_US from '@locale/lanres/codelist/codelist_en_US'; import codelist_en_US from '@locale/lanres/codelist/codelist_en_US';
import userCustom_en_US from '@locale/lanres/userCustom/userCustom_en_US'; import userCustom_en_US from '@locale/lanres/userCustom/userCustom_en_US';
...@@ -216,8 +216,8 @@ export default { ...@@ -216,8 +216,8 @@ export default {
}, },
}, },
entities: { entities: {
payopenaccess: payopenaccess_en_US,
paytrade: paytrade_en_US, paytrade: paytrade_en_US,
payopenaccess: payopenaccess_en_US,
}, },
components: components_en_US, components: components_en_US,
codelist: codelist_en_US, codelist: codelist_en_US,
......
app_web/src/locale/lang/zh-CN.ts
浏览文件 @ 6f9addd7
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 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 components_zh_CN from '@locale/lanres/components/components_zh_CN';
import codelist_zh_CN from '@locale/lanres/codelist/codelist_zh_CN'; import codelist_zh_CN from '@locale/lanres/codelist/codelist_zh_CN';
import userCustom_zh_CN from '@locale/lanres/userCustom/userCustom_zh_CN'; import userCustom_zh_CN from '@locale/lanres/userCustom/userCustom_zh_CN';
...@@ -215,8 +215,8 @@ export default { ...@@ -215,8 +215,8 @@ export default {
}, },
}, },
entities: { entities: {
payopenaccess: payopenaccess_zh_CN,
paytrade: paytrade_zh_CN, paytrade: paytrade_zh_CN,
payopenaccess: payopenaccess_zh_CN,
}, },
components: components_zh_CN, components: components_zh_CN,
codelist: codelist_zh_CN, codelist: codelist_zh_CN,
......
app_web/src/locale/lanres/entities/pay-open-access/pay-open-access_en_US.ts
浏览文件 @ 6f9addd7
...@@ -13,21 +13,21 @@ export default { ...@@ -13,21 +13,21 @@ export default {
redirect_uri: "RedirectURI", redirect_uri: "RedirectURI",
}, },
views: { views: {
pickupgridview: { gridview: {
caption: "支付平台", caption: "支付平台",
title: "支付平台选择表格视图", title: "支付平台表格视图",
}, },
editview: { pickupgridview: {
caption: "支付平台", caption: "支付平台",
title: "支付平台编辑视图", title: "支付平台选择表格视图",
}, },
pickupview: { pickupview: {
caption: "支付平台", caption: "支付平台",
title: "支付平台数据选择视图", title: "支付平台数据选择视图",
}, },
gridview: { editview: {
caption: "支付平台", caption: "支付平台",
title: "支付平台表格视图", title: "支付平台编辑视图",
}, },
}, },
main_form: { main_form: {
......
app_web/src/locale/lanres/entities/pay-open-access/pay-open-access_zh_CN.ts
浏览文件 @ 6f9addd7
...@@ -12,21 +12,21 @@ export default { ...@@ -12,21 +12,21 @@ export default {
redirect_uri: "RedirectURI", redirect_uri: "RedirectURI",
}, },
views: { views: {
pickupgridview: { gridview: {
caption: "支付平台", caption: "支付平台",
title: "支付平台选择表格视图", title: "支付平台表格视图",
}, },
editview: { pickupgridview: {
caption: "支付平台", caption: "支付平台",
title: "支付平台编辑视图", title: "支付平台选择表格视图",
}, },
pickupview: { pickupview: {
caption: "支付平台", caption: "支付平台",
title: "支付平台数据选择视图", title: "支付平台数据选择视图",
}, },
gridview: { editview: {
caption: "支付平台", caption: "支付平台",
title: "支付平台表格视图", title: "支付平台编辑视图",
}, },
}, },
main_form: { main_form: {
......
app_web/src/locale/lanres/entities/pay-trade/pay-trade_en_US.ts
浏览文件 @ 6f9addd7
export default { export default {
fields: { fields: {
trade_id: "交易标识",
trade_name: "交易名称",
subject: "订单标题", subject: "订单标题",
out_trade_no: "订单号",
total_amount: "订单金额", total_amount: "订单金额",
access_id: "支付平台接入标识", trade_name: "交易名称",
access_name: "支付平台",
app_id: "AccessKey(AppId)",
trade_type: "支付类型", trade_type: "支付类型",
trade_status: "支付状态", trade_status: "支付状态",
out_trade_no: "订单号",
trade_id: "交易标识",
app_id: "AccessKey(AppId)",
access_name: "支付平台",
access_id: "支付平台接入标识",
}, },
views: { views: {
editview: { editview: {
......
app_web/src/locale/lanres/entities/pay-trade/pay-trade_zh_CN.ts
浏览文件 @ 6f9addd7
export default { export default {
fields: { fields: {
trade_id: "交易标识",
trade_name: "交易名称",
subject: "订单标题", subject: "订单标题",
out_trade_no: "订单号",
total_amount: "订单金额", total_amount: "订单金额",
access_id: "支付平台接入标识", trade_name: "交易名称",
access_name: "支付平台",
app_id: "AccessKey(AppId)",
trade_type: "支付类型", trade_type: "支付类型",
trade_status: "支付状态", trade_status: "支付状态",
out_trade_no: "订单号",
trade_id: "交易标识",
app_id: "AccessKey(AppId)",
access_name: "支付平台",
access_id: "支付平台接入标识",
}, },
views: { views: {
editview: { editview: {
......
app_web/src/mock/app/pay-index-view-appmenu/pay-index-view-appmenu.ts
浏览文件 @ 6f9addd7
...@@ -11,7 +11,7 @@ mock.onGet('v7/pay-index-viewappmenu').reply((config: any) => { ...@@ -11,7 +11,7 @@ mock.onGet('v7/pay-index-viewappmenu').reply((config: any) => {
name: 'appmenu', name: 'appmenu',
items: [ items: [
{ {
id: '29375D3A-9707-4A76-A914-177A8DDDF566', id: '62d37d214c3103bf6ed1e946106ec677',
name: 'menuitem1', name: 'menuitem1',
text: '支付平台', text: '支付平台',
type: 'MENUITEM', type: 'MENUITEM',
...@@ -29,7 +29,7 @@ mock.onGet('v7/pay-index-viewappmenu').reply((config: any) => { ...@@ -29,7 +29,7 @@ mock.onGet('v7/pay-index-viewappmenu').reply((config: any) => {
resourcetag: '', resourcetag: '',
}, },
{ {
id: '3045EF5E-281B-4D8B-AF05-759C4845FB77', id: '1e7394867e71eec256933bda6257bcc2',
name: 'menuitem2', name: 'menuitem2',
text: '交易记录', text: '交易记录',
type: 'MENUITEM', type: 'MENUITEM',
......
app_web/src/mock/appdata/appdata.ts
浏览文件 @ 6f9addd7
...@@ -33,7 +33,6 @@ mock.onGet('/appdata').reply((config: any) => { ...@@ -33,7 +33,6 @@ mock.onGet('/appdata').reply((config: any) => {
// 当前用户条线代码 // 当前用户条线代码
srfsectorbc:"" srfsectorbc:""
}, },
enablepermissionvalid:false,
unires:["RESOURCE1","RESOURCE2"], unires:["RESOURCE1","RESOURCE2"],
//当前用户所有组织部门标识 //当前用户所有组织部门标识
srforgsections:[{"srforgsectorid":"5bd1ecf4d3c31e31cb66373df56b852f","srforgsectorname":"项目一部"},{"srforgsectorid":"2ad1ecf4d3c31e31cb66373df56b852f","srforgsectorname":"项目二部"}] srforgsections:[{"srforgsectorid":"5bd1ecf4d3c31e31cb66373df56b852f","srforgsectorname":"项目一部"},{"srforgsectorid":"2ad1ecf4d3c31e31cb66373df56b852f","srforgsectorname":"项目二部"}]
......
app_web/src/mock/index.ts
浏览文件 @ 6f9addd7
...@@ -7,5 +7,5 @@ import './login/login'; ...@@ -7,5 +7,5 @@ import './login/login';
import './upload/upload'; import './upload/upload';
// 实体级接口对象 // 实体级接口对象
import './entity/pay-open-accesss/pay-open-accesss';
import './entity/pay-trades/pay-trades'; import './entity/pay-trades/pay-trades';
import './entity/pay-open-accesss/pay-open-accesss';
app_web/src/mock/viewconfig/viewconfig.ts
浏览文件 @ 6f9addd7
...@@ -13,15 +13,23 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -13,15 +13,23 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtype": "DEEDITVIEW", "viewtype": "DEEDITVIEW",
"viewmodule": "pay", "viewmodule": "pay",
"viewname": "PayTradeEditView", "viewname": "PayTradeEditView",
"viewtag": "1ebd898d7c9c1d6c0f9f6c2944e92148" "viewtag": "089cc88e549cef536c3380ccb1ce465f"
}, },
"payopenaccesspickupgridview": { "paytradegridview": {
"title": "支付平台选择表格视图", "title": "支付交易表格视图",
"caption": "支付交易",
"viewtype": "DEGRIDVIEW",
"viewmodule": "pay",
"viewname": "PayTradeGridView",
"viewtag": "1f1889a2c3e7f49d9221021499a0f78a"
},
"payopenaccessgridview": {
"title": "支付平台表格视图",
"caption": "支付平台", "caption": "支付平台",
"viewtype": "DEPICKUPGRIDVIEW", "viewtype": "DEGRIDVIEW",
"viewmodule": "pay", "viewmodule": "pay",
"viewname": "PayOpenAccessPickupGridView", "viewname": "PayOpenAccessGridView",
"viewtag": "32bd7f047dffe91d62357bff08f6e5d1" "viewtag": "60fe0b9b8535b02baf1a02d5f56c5a9c"
}, },
"payindexview": { "payindexview": {
"title": "pay", "title": "pay",
...@@ -29,23 +37,15 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -29,23 +37,15 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtype": "APPINDEXVIEW", "viewtype": "APPINDEXVIEW",
"viewmodule": "pay", "viewmodule": "pay",
"viewname": "PayIndexView", "viewname": "PayIndexView",
"viewtag": "48CC4447-52C4-4B23-810E-1C0E2465A0D7" "viewtag": "9bc4c8beaa1b07a28cb977318653a0bd"
},
"paytradegridview": {
"title": "支付交易表格视图",
"caption": "支付交易",
"viewtype": "DEGRIDVIEW",
"viewmodule": "pay",
"viewname": "PayTradeGridView",
"viewtag": "6e9610d7cd8dc92a1305216e416207c0"
}, },
"payopenaccesseditview": { "payopenaccesspickupgridview": {
"title": "支付平台编辑视图", "title": "支付平台选择表格视图",
"caption": "支付平台", "caption": "支付平台",
"viewtype": "DEEDITVIEW", "viewtype": "DEPICKUPGRIDVIEW",
"viewmodule": "pay", "viewmodule": "pay",
"viewname": "PayOpenAccessEditView", "viewname": "PayOpenAccessPickupGridView",
"viewtag": "8bbba1ab4ef6cfce89b59175e1efecd0" "viewtag": "b1fe00a9dfb2160b1589b4e1e2b1d2fc"
}, },
"payopenaccesspickupview": { "payopenaccesspickupview": {
"title": "支付平台数据选择视图", "title": "支付平台数据选择视图",
...@@ -53,15 +53,15 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -53,15 +53,15 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtype": "DEPICKUPVIEW", "viewtype": "DEPICKUPVIEW",
"viewmodule": "pay", "viewmodule": "pay",
"viewname": "PayOpenAccessPickupView", "viewname": "PayOpenAccessPickupView",
"viewtag": "94f275381f7b5d6c18c715afdba9b484" "viewtag": "f3bb55ce97b7b94c99782d0cea879eaa"
}, },
"payopenaccessgridview": { "payopenaccesseditview": {
"title": "支付平台表格视图", "title": "支付平台编辑视图",
"caption": "支付平台", "caption": "支付平台",
"viewtype": "DEGRIDVIEW", "viewtype": "DEEDITVIEW",
"viewmodule": "pay", "viewmodule": "pay",
"viewname": "PayOpenAccessGridView", "viewname": "PayOpenAccessEditView",
"viewtag": "c6788e489ffbe107540ffa19650faf5a" "viewtag": "f5f50734bb86ba01097a7cb19b63d36c"
} }
}]; }];
}); });
\ No newline at end of file
app_web/src/pages/pay/pay-index-view/page-register.ts
浏览文件 @ 6f9addd7
export const PageComponents = { export const PageComponents = {
install(Vue: any, opt: any) { install(Vue: any, opt: any) {
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-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-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-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-open-access-pickup-grid-view', () => import('@pages/pay/pay-open-access-pickup-grid-view/pay-open-access-pickup-grid-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'));
} }
}; };
\ No newline at end of file
app_web/src/pages/pay/pay-index-view/pay-index-view-base.vue
浏览文件 @ 6f9addd7
...@@ -130,7 +130,7 @@ export default class PayIndexViewBase extends Vue { ...@@ -130,7 +130,7 @@ export default class PayIndexViewBase extends Vue {
* @type {string} * @type {string}
* @memberof PayIndexViewBase * @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-base.vue
浏览文件 @ 6f9addd7
...@@ -213,7 +213,7 @@ export default class PayOpenAccessEditViewBase extends Vue { ...@@ -213,7 +213,7 @@ export default class PayOpenAccessEditViewBase extends Vue {
* @type {string} * @type {string}
* @memberof PayOpenAccessEditViewBase * @memberof PayOpenAccessEditViewBase
*/ */
public viewtag: string = '8bbba1ab4ef6cfce89b59175e1efecd0'; public viewtag: string = 'f5f50734bb86ba01097a7cb19b63d36c';
/** /**
* 自定义视图导航上下文集合 * 自定义视图导航上下文集合
......
app_web/src/pages/pay/pay-open-access-grid-view/pay-open-access-grid-view-base.vue
浏览文件 @ 6f9addd7
...@@ -243,7 +243,7 @@ export default class PayOpenAccessGridViewBase extends Vue { ...@@ -243,7 +243,7 @@ export default class PayOpenAccessGridViewBase extends Vue {
* @type {string} * @type {string}
* @memberof PayOpenAccessGridViewBase * @memberof PayOpenAccessGridViewBase
*/ */
public viewtag: string = 'c6788e489ffbe107540ffa19650faf5a'; public viewtag: string = '60fe0b9b8535b02baf1a02d5f56c5a9c';
/** /**
* 自定义视图导航上下文集合 * 自定义视图导航上下文集合
......
app_web/src/pages/pay/pay-open-access-pickup-grid-view/pay-open-access-pickup-grid-view-base.vue
浏览文件 @ 6f9addd7
...@@ -140,7 +140,7 @@ export default class PayOpenAccessPickupGridViewBase extends Vue { ...@@ -140,7 +140,7 @@ export default class PayOpenAccessPickupGridViewBase extends Vue {
* @type {string} * @type {string}
* @memberof PayOpenAccessPickupGridViewBase * @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
浏览文件 @ 6f9addd7
...@@ -125,7 +125,7 @@ export default class PayOpenAccessPickupViewBase extends Vue { ...@@ -125,7 +125,7 @@ export default class PayOpenAccessPickupViewBase extends Vue {
* @type {string} * @type {string}
* @memberof PayOpenAccessPickupViewBase * @memberof PayOpenAccessPickupViewBase
*/ */
public viewtag: string = '94f275381f7b5d6c18c715afdba9b484'; public viewtag: string = 'f3bb55ce97b7b94c99782d0cea879eaa';
/** /**
* 自定义视图导航上下文集合 * 自定义视图导航上下文集合
......
app_web/src/pages/pay/pay-trade-edit-view/pay-trade-edit-view-base.vue
浏览文件 @ 6f9addd7
...@@ -213,7 +213,7 @@ export default class PayTradeEditViewBase extends Vue { ...@@ -213,7 +213,7 @@ export default class PayTradeEditViewBase extends Vue {
* @type {string} * @type {string}
* @memberof PayTradeEditViewBase * @memberof PayTradeEditViewBase
*/ */
public viewtag: string = '1ebd898d7c9c1d6c0f9f6c2944e92148'; public viewtag: string = '089cc88e549cef536c3380ccb1ce465f';
/** /**
* 自定义视图导航上下文集合 * 自定义视图导航上下文集合
......
app_web/src/pages/pay/pay-trade-grid-view/pay-trade-grid-view-base.vue
浏览文件 @ 6f9addd7
...@@ -243,7 +243,7 @@ export default class PayTradeGridViewBase extends Vue { ...@@ -243,7 +243,7 @@ export default class PayTradeGridViewBase extends Vue {
* @type {string} * @type {string}
* @memberof PayTradeGridViewBase * @memberof PayTradeGridViewBase
*/ */
public viewtag: string = '6e9610d7cd8dc92a1305216e416207c0'; public viewtag: string = '1f1889a2c3e7f49d9221021499a0f78a';
/** /**
* 自定义视图导航上下文集合 * 自定义视图导航上下文集合
......
app_web/src/service/entity-service-register.ts
浏览文件 @ 6f9addd7
...@@ -39,8 +39,8 @@ export class EntityServiceRegister { ...@@ -39,8 +39,8 @@ export class EntityServiceRegister {
* @memberof EntityServiceRegister * @memberof EntityServiceRegister
*/ */
protected init(): void { 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
浏览文件 @ 6f9addd7
...@@ -4,72 +4,72 @@ ...@@ -4,72 +4,72 @@
export const viewstate: any = { export const viewstate: any = {
appviews: [ appviews: [
{ {
viewtag: '1ebd898d7c9c1d6c0f9f6c2944e92148', viewtag: '089cc88e549cef536c3380ccb1ce465f',
viewmodule: 'pay', viewmodule: 'pay',
viewname: 'PayTradeEditView', viewname: 'PayTradeEditView',
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
'94f275381f7b5d6c18c715afdba9b484', 'f3bb55ce97b7b94c99782d0cea879eaa',
], ],
}, },
{ {
viewtag: '32bd7f047dffe91d62357bff08f6e5d1', viewtag: '1f1889a2c3e7f49d9221021499a0f78a',
viewmodule: 'pay', viewmodule: 'pay',
viewname: 'PayOpenAccessPickupGridView', viewname: 'PayTradeGridView',
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
'089cc88e549cef536c3380ccb1ce465f',
], ],
}, },
{ {
viewtag: '48CC4447-52C4-4B23-810E-1C0E2465A0D7', viewtag: '60fe0b9b8535b02baf1a02d5f56c5a9c',
viewmodule: 'pay', viewmodule: 'pay',
viewname: 'PayIndexView', viewname: 'PayOpenAccessGridView',
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
'6e9610d7cd8dc92a1305216e416207c0', 'f5f50734bb86ba01097a7cb19b63d36c',
'c6788e489ffbe107540ffa19650faf5a',
], ],
}, },
{ {
viewtag: '6e9610d7cd8dc92a1305216e416207c0', viewtag: '9bc4c8beaa1b07a28cb977318653a0bd',
viewmodule: 'pay', viewmodule: 'pay',
viewname: 'PayTradeGridView', viewname: 'PayIndexView',
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
'1ebd898d7c9c1d6c0f9f6c2944e92148', '60fe0b9b8535b02baf1a02d5f56c5a9c',
'1f1889a2c3e7f49d9221021499a0f78a',
], ],
}, },
{ {
viewtag: '8bbba1ab4ef6cfce89b59175e1efecd0', viewtag: 'b1fe00a9dfb2160b1589b4e1e2b1d2fc',
viewmodule: 'pay', viewmodule: 'pay',
viewname: 'PayOpenAccessEditView', viewname: 'PayOpenAccessPickupGridView',
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
], ],
}, },
{ {
viewtag: '94f275381f7b5d6c18c715afdba9b484', viewtag: 'f3bb55ce97b7b94c99782d0cea879eaa',
viewmodule: 'pay', viewmodule: 'pay',
viewname: 'PayOpenAccessPickupView', viewname: 'PayOpenAccessPickupView',
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
'32bd7f047dffe91d62357bff08f6e5d1', 'b1fe00a9dfb2160b1589b4e1e2b1d2fc',
], ],
}, },
{ {
viewtag: 'c6788e489ffbe107540ffa19650faf5a', viewtag: 'f5f50734bb86ba01097a7cb19b63d36c',
viewmodule: 'pay', viewmodule: 'pay',
viewname: 'PayOpenAccessGridView', viewname: 'PayOpenAccessEditView',
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
'8bbba1ab4ef6cfce89b59175e1efecd0',
], ],
}, },
], ],
......
app_web/src/uiservice/pay-open-access/pay-open-access-ui-service-base.ts
浏览文件 @ 6f9addd7
...@@ -89,10 +89,10 @@ export default class PayOpenAccessUIServiceBase extends UIService { ...@@ -89,10 +89,10 @@ export default class PayOpenAccessUIServiceBase extends UIService {
* @memberof PayOpenAccessUIServiceBase * @memberof PayOpenAccessUIServiceBase
*/ */
public initViewMap(){ public initViewMap(){
this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'payopenaccesses'});
this.allViewMap.set(':',{viewname:'pickupgridview',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('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
浏览文件 @ 6f9addd7
...@@ -39,8 +39,8 @@ export class UIServiceRegister { ...@@ -39,8 +39,8 @@ export class UIServiceRegister {
* @memberof UIServiceRegister * @memberof UIServiceRegister
*/ */
protected init(): void { 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
浏览文件 @ 6f9addd7
...@@ -580,7 +580,7 @@ export default class PayIndexViewBase extends Vue implements ControlInterface { ...@@ -580,7 +580,7 @@ export default class PayIndexViewBase extends Vue implements ControlInterface {
* @memberof PayIndexViewBase * @memberof PayIndexViewBase
*/ */
public handleMenusResource(inputMenus:Array<any>){ public handleMenusResource(inputMenus:Array<any>){
if(this.$store.getters['authresource/getEnablePermissionValid']){ if(Environment.enablePermissionValid){
this.computedEffectiveMenus(inputMenus); this.computedEffectiveMenus(inputMenus);
this.computeParentMenus(inputMenus); this.computeParentMenus(inputMenus);
} }
......
app_web/src/widgets/app/pay-index-view-appmenu/pay-index-view-appmenu-model.ts
浏览文件 @ 6f9addd7
...@@ -15,7 +15,7 @@ export default class PayIndexViewModel { ...@@ -15,7 +15,7 @@ export default class PayIndexViewModel {
*/ */
public items: any[] = [ public items: any[] = [
{ {
id: '29375D3A-9707-4A76-A914-177A8DDDF566', id: '62d37d214c3103bf6ed1e946106ec677',
name: 'menuitem1', name: 'menuitem1',
text: '支付平台', text: '支付平台',
type: 'MENUITEM', type: 'MENUITEM',
...@@ -34,7 +34,7 @@ export default class PayIndexViewModel { ...@@ -34,7 +34,7 @@ export default class PayIndexViewModel {
authtag:'web-PayIndexView-menuitem1', authtag:'web-PayIndexView-menuitem1',
}, },
{ {
id: '3045EF5E-281B-4D8B-AF05-759C4845FB77', id: '1e7394867e71eec256933bda6257bcc2',
name: 'menuitem2', name: 'menuitem2',
text: '交易记录', text: '交易记录',
type: 'MENUITEM', type: 'MENUITEM',
......
app_web/src/widgets/pay-open-access/default-searchform/default-searchform-base.vue
浏览文件 @ 6f9addd7
...@@ -589,7 +589,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -589,7 +589,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/ */
public load(opt: any = {}): void { public load(opt: any = {}): void {
if(!this.loadAction){ 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; return;
} }
const arg: any = { ...opt }; const arg: any = { ...opt };
...@@ -625,7 +625,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -625,7 +625,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/ */
public loadDraft(opt: any = {},mode?:string): void { public loadDraft(opt: any = {},mode?:string): void {
if(!this.loaddraftAction){ 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; return;
} }
const arg: any = { ...opt } ; const arg: any = { ...opt } ;
......
app_web/src/widgets/pay-open-access/main-form/main-form-base.vue
浏览文件 @ 6f9addd7
...@@ -1215,6 +1215,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1215,6 +1215,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase * @memberof MainBase
*/ */
public computeButtonState(data:any){ public computeButtonState(data:any){
if(Environment.enablePermissionValid){
let targetData:any = this.transformData(data); let targetData:any = this.transformData(data);
if(this.detailsModel && Object.keys(this.detailsModel).length >0){ if(this.detailsModel && Object.keys(this.detailsModel).length >0){
Object.keys(this.detailsModel).forEach((name:any) =>{ Object.keys(this.detailsModel).forEach((name:any) =>{
...@@ -1229,6 +1230,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1229,6 +1230,7 @@ export default class MainBase extends Vue implements ControlInterface {
}) })
} }
} }
}
......
app_web/src/widgets/pay-open-access/main-grid/main-grid-base.vue
浏览文件 @ 6f9addd7
...@@ -309,20 +309,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -309,20 +309,6 @@ export default class MainBase extends Vue implements ControlInterface {
return this.selections[0]; return this.selections[0];
} }
/**
* 打开新建数据视图
*
* @type {any}
* @memberof MainBase
*/
@Prop() public newdata: any;
/**
* 打开编辑数据视图
*
* @type {any}
* @memberof MainBase
*/
@Prop() public opendata: any;
/** /**
* 是否嵌入关系界面 * 是否嵌入关系界面
...@@ -661,8 +647,10 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -661,8 +647,10 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
public getActionState(data:any){ public getActionState(data:any){
let tempActionModel:any = JSON.parse(JSON.stringify(this.ActionModel)); let tempActionModel:any = JSON.parse(JSON.stringify(this.ActionModel));
if(Environment.enablePermissionValid){
let targetData:any = this.transformData(data); let targetData:any = this.transformData(data);
ViewTool.calcActionItemAuthState(targetData,tempActionModel,this.appUIService); ViewTool.calcActionItemAuthState(targetData,tempActionModel,this.appUIService);
}
return tempActionModel; return tempActionModel;
} }
...@@ -752,7 +740,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -752,7 +740,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
public load(opt: any = {}, pageReset: boolean = false): void { public load(opt: any = {}, pageReset: boolean = false): void {
if(!this.fetchAction){ if(!this.fetchAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'PayOpenAccessGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'PayOpenAccessPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
return; return;
} }
if(pageReset){ if(pageReset){
...@@ -832,7 +820,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -832,7 +820,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
public async remove(datas: any[]): Promise<any> { public async remove(datas: any[]): Promise<any> {
if(!this.removeAction){ if(!this.removeAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'PayOpenAccessGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'PayOpenAccessPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
return; return;
} }
let _datas:any[] = []; let _datas:any[] = [];
...@@ -938,7 +926,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -938,7 +926,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
public addBatch(arg: any = {}): void { public addBatch(arg: any = {}): void {
if(!this.fetchAction){ if(!this.fetchAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'PayOpenAccessGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'PayOpenAccessPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
return; return;
} }
if(!arg){ if(!arg){
...@@ -1508,7 +1496,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1508,7 +1496,7 @@ export default class MainBase extends Vue implements ControlInterface {
try { try {
if(Object.is(item.rowDataState, 'create')){ if(Object.is(item.rowDataState, 'create')){
if(!this.createAction){ if(!this.createAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'PayOpenAccessGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'PayOpenAccessPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
}else{ }else{
Object.assign(item,{viewparams:this.viewparams}); Object.assign(item,{viewparams:this.viewparams});
let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator); let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
...@@ -1516,7 +1504,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1516,7 +1504,7 @@ export default class MainBase extends Vue implements ControlInterface {
} }
}else if(Object.is(item.rowDataState, 'update')){ }else if(Object.is(item.rowDataState, 'update')){
if(!this.updateAction){ if(!this.updateAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'PayOpenAccessGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'PayOpenAccessPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
}else{ }else{
Object.assign(item,{viewparams:this.viewparams}); Object.assign(item,{viewparams:this.viewparams});
if(item.payopenaccess){ if(item.payopenaccess){
...@@ -1553,7 +1541,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1553,7 +1541,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
public newRow(args: any[], params?: any, $event?: any, xData?: any): void { public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
if(!this.loaddraftAction){ if(!this.loaddraftAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'PayOpenAccessGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'PayOpenAccessPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
return; return;
} }
let _this = this; let _this = this;
......
app_web/src/widgets/pay-trade/main-form/main-form-base.vue
浏览文件 @ 6f9addd7
...@@ -1143,6 +1143,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1143,6 +1143,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase * @memberof MainBase
*/ */
public computeButtonState(data:any){ public computeButtonState(data:any){
if(Environment.enablePermissionValid){
let targetData:any = this.transformData(data); let targetData:any = this.transformData(data);
if(this.detailsModel && Object.keys(this.detailsModel).length >0){ if(this.detailsModel && Object.keys(this.detailsModel).length >0){
Object.keys(this.detailsModel).forEach((name:any) =>{ Object.keys(this.detailsModel).forEach((name:any) =>{
...@@ -1157,6 +1158,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1157,6 +1158,7 @@ export default class MainBase extends Vue implements ControlInterface {
}) })
} }
} }
}
......
app_web/src/widgets/pay-trade/main-grid/main-grid-base.vue
浏览文件 @ 6f9addd7
...@@ -679,8 +679,10 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -679,8 +679,10 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
public getActionState(data:any){ public getActionState(data:any){
let tempActionModel:any = JSON.parse(JSON.stringify(this.ActionModel)); let tempActionModel:any = JSON.parse(JSON.stringify(this.ActionModel));
if(Environment.enablePermissionValid){
let targetData:any = this.transformData(data); let targetData:any = this.transformData(data);
ViewTool.calcActionItemAuthState(targetData,tempActionModel,this.appUIService); ViewTool.calcActionItemAuthState(targetData,tempActionModel,this.appUIService);
}
return tempActionModel; return tempActionModel;
} }
......
config.xml 0 → 100644
浏览文件 @ 6f9addd7
<?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
浏览文件 @ 6f9addd7
...@@ -7,14 +7,14 @@ logging: ...@@ -7,14 +7,14 @@ logging:
#zuul网关路由设置 #zuul网关路由设置
zuul: zuul:
routes: routes:
pay_open_access:
path: /payopenaccesses/**
serviceId: ${ibiz.ref.service.ibzpay-api:ibzpay-api}
stripPrefix: false
pay_trade: pay_trade:
path: /paytrades/** path: /paytrades/**
serviceId: ${ibiz.ref.service.ibzpay-api:ibzpay-api} serviceId: ${ibiz.ref.service.ibzpay-api:ibzpay-api}
stripPrefix: false stripPrefix: false
pay_open_access:
path: /payopenaccesses/**
serviceId: ${ibiz.ref.service.ibzpay-api:ibzpay-api}
stripPrefix: false
loginv7: loginv7:
path: /v7/login path: /v7/login
serviceId: ${ibiz.ref.service.uaa:ibzuaa-api} serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
......
ibzpay-core/src/main/java/cn/ibizlab/core/pay/domain/PayTrade.java
浏览文件 @ 6f9addd7
...@@ -41,13 +41,19 @@ public class PayTrade extends EntityMP implements Serializable { ...@@ -41,13 +41,19 @@ public class PayTrade extends EntityMP implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 交易标识 * 订单标题
*/ */
@DEField(isKeyField=true) @TableField(value = "subject")
@TableId(value= "tradeid",type=IdType.ASSIGN_UUID) @JSONField(name = "subject")
@JSONField(name = "trade_id") @JsonProperty("subject")
@JsonProperty("trade_id") private String subject;
private String tradeId; /**
* 订单金额
*/
@TableField(value = "totalamount")
@JSONField(name = "total_amount")
@JsonProperty("total_amount")
private String totalAmount;
/** /**
* 交易名称 * 交易名称
*/ */
...@@ -56,12 +62,19 @@ public class PayTrade extends EntityMP implements Serializable { ...@@ -56,12 +62,19 @@ public class PayTrade extends EntityMP implements Serializable {
@JsonProperty("trade_name") @JsonProperty("trade_name")
private String tradeName; private String tradeName;
/** /**
* 订单标题 * 支付类型
*/ */
@TableField(value = "subject") @TableField(value = "tradetype")
@JSONField(name = "subject") @JSONField(name = "trade_type")
@JsonProperty("subject") @JsonProperty("trade_type")
private String subject; 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 { ...@@ -70,26 +83,13 @@ public class PayTrade extends EntityMP implements Serializable {
@JsonProperty("out_trade_no") @JsonProperty("out_trade_no")
private String outTradeNo; 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") @DEField(isKeyField=true)
@JSONField(name = "access_name") @TableId(value= "tradeid",type=IdType.ASSIGN_UUID)
@JsonProperty("access_name") @JSONField(name = "trade_id")
private String accessName; @JsonProperty("trade_id")
private String tradeId;
/** /**
* AccessKey(AppId) * AccessKey(AppId)
*/ */
...@@ -98,19 +98,19 @@ public class PayTrade extends EntityMP implements Serializable { ...@@ -98,19 +98,19 @@ public class PayTrade extends EntityMP implements Serializable {
@JsonProperty("app_id") @JsonProperty("app_id")
private String appId; private String appId;
/** /**
* 支付类型 * 支付平台
*/ */
@TableField(value = "tradetype") @TableField(value = "accessname")
@JSONField(name = "trade_type") @JSONField(name = "access_name")
@JsonProperty("trade_type") @JsonProperty("access_name")
private String tradeType; private String accessName;
/** /**
* 支付状态 * 支付平台接入标识
*/ */
@TableField(value = "tradestatus") @TableField(value = "accessid")
@JSONField(name = "trade_status") @JSONField(name = "access_id")
@JsonProperty("trade_status") @JsonProperty("access_id")
private String tradeStatus; private String accessId;
/** /**
* 接入平台 * 接入平台
...@@ -122,14 +122,6 @@ public class PayTrade extends EntityMP implements Serializable { ...@@ -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 { ...@@ -138,14 +130,6 @@ public class PayTrade extends EntityMP implements Serializable {
this.modify("subject",subject); 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 { ...@@ -155,19 +139,35 @@ public class PayTrade extends EntityMP implements Serializable {
} }
/** /**
* 设置 [支付平台接入标识] * 设置 [交易名称]
*/ */
public void setAccessId(String accessId){ public void setTradeName(String tradeName){
this.accessId = accessId ; this.tradeName = tradeName ;
this.modify("accessid",accessId); this.modify("tradename",tradeName);
} }
/** /**
* 设置 [支付平台] * 设置 [支付类型]
*/ */
public void setAccessName(String accessName){ public void setTradeType(String tradeType){
this.accessName = accessName ; this.tradeType = tradeType ;
this.modify("accessname",accessName); 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 { ...@@ -179,19 +179,19 @@ public class PayTrade extends EntityMP implements Serializable {
} }
/** /**
* 设置 [支付类型] * 设置 [支付平台]
*/ */
public void setTradeType(String tradeType){ public void setAccessName(String accessName){
this.tradeType = tradeType ; this.accessName = accessName ;
this.modify("tradetype",tradeType); this.modify("accessname",accessName);
} }
/** /**
* 设置 [支付状态] * 设置 [支付平台接入标识]
*/ */
public void setTradeStatus(String tradeStatus){ public void setAccessId(String accessId){
this.tradeStatus = tradeStatus ; this.accessId = accessId ;
this.modify("tradestatus",tradeStatus); this.modify("accessid",accessId);
} }
......
ibzpay-core/src/main/java/cn/ibizlab/core/pay/filter/PayTradeSearchContext.java
浏览文件 @ 6f9addd7
...@@ -34,11 +34,11 @@ public class PayTradeSearchContext extends QueryWrapperContext<PayTrade> { ...@@ -34,11 +34,11 @@ public class PayTradeSearchContext extends QueryWrapperContext<PayTrade> {
this.getSearchCond().like("tradename", n_tradename_like); this.getSearchCond().like("tradename", n_tradename_like);
} }
} }
private String n_accessid_eq;//[支付平台接入标识] private String n_tradestatus_eq;//[支付状态]
public void setN_accessid_eq(String n_accessid_eq) { public void setN_tradestatus_eq(String n_tradestatus_eq) {
this.n_accessid_eq = n_accessid_eq; this.n_tradestatus_eq = n_tradestatus_eq;
if(!ObjectUtils.isEmpty(this.n_accessid_eq)){ if(!ObjectUtils.isEmpty(this.n_tradestatus_eq)){
this.getSearchCond().eq("accessid", n_accessid_eq); this.getSearchCond().eq("tradestatus", n_tradestatus_eq);
} }
} }
private String n_accessname_eq;//[支付平台] private String n_accessname_eq;//[支付平台]
...@@ -55,11 +55,11 @@ public class PayTradeSearchContext extends QueryWrapperContext<PayTrade> { ...@@ -55,11 +55,11 @@ public class PayTradeSearchContext extends QueryWrapperContext<PayTrade> {
this.getSearchCond().like("accessname", n_accessname_like); this.getSearchCond().like("accessname", n_accessname_like);
} }
} }
private String n_tradestatus_eq;//[支付状态] private String n_accessid_eq;//[支付平台接入标识]
public void setN_tradestatus_eq(String n_tradestatus_eq) { public void setN_accessid_eq(String n_accessid_eq) {
this.n_tradestatus_eq = n_tradestatus_eq; this.n_accessid_eq = n_accessid_eq;
if(!ObjectUtils.isEmpty(this.n_tradestatus_eq)){ if(!ObjectUtils.isEmpty(this.n_accessid_eq)){
this.getSearchCond().eq("tradestatus", n_tradestatus_eq); this.getSearchCond().eq("accessid", n_accessid_eq);
} }
} }
......
ibzpay-core/src/main/java/cn/ibizlab/core/pay/service/impl/PayTradeServiceImpl.java
浏览文件 @ 6f9addd7
...@@ -186,8 +186,8 @@ public class PayTradeServiceImpl extends ServiceImpl<PayTradeMapper, PayTrade> i ...@@ -186,8 +186,8 @@ public class PayTradeServiceImpl extends ServiceImpl<PayTradeMapper, PayTrade> i
et.setOpenaccess(majorEntity); et.setOpenaccess(majorEntity);
openaccess=majorEntity; openaccess=majorEntity;
} }
et.setAccessName(openaccess.getName());
et.setAppId(openaccess.getAccessKey()); et.setAppId(openaccess.getAccessKey());
et.setAccessName(openaccess.getName());
} }
} }
......
ibzpay-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 6f9addd7
<?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"> 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)??
----
----
<!--输出实体[PAY_OPEN_ACCESS]数据结构 --> FTL stack trace ("~" means nesting-related):
<changeSet author="a_A_5d9d78509" id="tab-pay_open_access-71-1"> - Failed at: ${dbinst.getUserName()} [in template "CODETEMPL_en_US" at line 28, column 24]
<createTable tableName="IBZOPENACCESS"> ----
<column name="ACCESSID" remarks="" type="VARCHAR(100)"> \ No newline at end of file
<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>
ibzpay-core/src/main/resources/permission/systemResource.json
浏览文件 @ 6f9addd7
...@@ -4,16 +4,16 @@ ...@@ -4,16 +4,16 @@
], ],
"entities":[ "entities":[
{ {
"dename":"PayOpenAccess", "dename":"PayTrade",
"delogicname":"支付平台", "delogicname":"支付交易",
"sysmoudle":{"id":"PAY","name":"pay"}, "sysmoudle":{"id":"PAY","name":"pay"},
"dedataset":[{"id":"Default" , "name":"数据集"}], "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" }], "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":"全部数据"}] "datascope":[{"id":"all","name":"全部数据"}]
} }
, { , {
"dename":"PayTrade", "dename":"PayOpenAccess",
"delogicname":"支付交易", "delogicname":"支付平台",
"sysmoudle":{"id":"PAY","name":"pay"}, "sysmoudle":{"id":"PAY","name":"pay"},
"dedataset":[{"id":"Default" , "name":"数据集"}], "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" }], "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
浏览文件 @ 6f9addd7
...@@ -86,7 +86,6 @@ ...@@ -86,7 +86,6 @@
<!-- 阿里seata分布式事务 --> <!-- 阿里seata分布式事务 -->
<alibaba-seata.version>1.3.0</alibaba-seata.version> <alibaba-seata.version>1.3.0</alibaba-seata.version>
<oracle.version>11.2.0.3</oracle.version>
</properties> </properties>
...@@ -331,12 +330,6 @@ ...@@ -331,12 +330,6 @@
<version>${eureka-client.version}</version> <version>${eureka-client.version}</version>
</dependency> </dependency>
<!-- Oracle驱动包 -->
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc6</artifactId>
<version>${oracle.version}</version>
</dependency>
<!-- MySQL驱动包 --> <!-- MySQL驱动包 -->
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
......
ibzpay-provider/ibzpay-provider-api/src/main/java/cn/ibizlab/api/dto/PayTradeDTO.java
浏览文件 @ 6f9addd7
...@@ -25,12 +25,20 @@ public class PayTradeDTO extends DTOBase implements Serializable { ...@@ -25,12 +25,20 @@ public class PayTradeDTO extends DTOBase implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 属性 [TRADEID] * 属性 [SUBJECT]
* *
*/ */
@JSONField(name = "trade_id") @JSONField(name = "subject")
@JsonProperty("trade_id") @JsonProperty("subject")
private String tradeId; private String subject;
/**
* 属性 [TOTALAMOUNT]
*
*/
@JSONField(name = "total_amount")
@JsonProperty("total_amount")
private String totalAmount;
/** /**
* 属性 [TRADENAME] * 属性 [TRADENAME]
...@@ -41,12 +49,20 @@ public class PayTradeDTO extends DTOBase implements Serializable { ...@@ -41,12 +49,20 @@ public class PayTradeDTO extends DTOBase implements Serializable {
private String tradeName; private String tradeName;
/** /**
* 属性 [SUBJECT] * 属性 [TRADETYPE]
* *
*/ */
@JSONField(name = "subject") @JSONField(name = "trade_type")
@JsonProperty("subject") @JsonProperty("trade_type")
private String subject; private String tradeType;
/**
* 属性 [TRADESTATUS]
*
*/
@JSONField(name = "trade_status")
@JsonProperty("trade_status")
private String tradeStatus;
/** /**
* 属性 [OUTTRADENO] * 属性 [OUTTRADENO]
...@@ -57,20 +73,20 @@ public class PayTradeDTO extends DTOBase implements Serializable { ...@@ -57,20 +73,20 @@ public class PayTradeDTO extends DTOBase implements Serializable {
private String outTradeNo; private String outTradeNo;
/** /**
* 属性 [TOTALAMOUNT] * 属性 [TRADEID]
* *
*/ */
@JSONField(name = "total_amount") @JSONField(name = "trade_id")
@JsonProperty("total_amount") @JsonProperty("trade_id")
private String totalAmount; private String tradeId;
/** /**
* 属性 [ACCESSID] * 属性 [APPID]
* *
*/ */
@JSONField(name = "access_id") @JSONField(name = "app_id")
@JsonProperty("access_id") @JsonProperty("app_id")
private String accessId; private String appId;
/** /**
* 属性 [ACCESSNAME] * 属性 [ACCESSNAME]
...@@ -81,29 +97,29 @@ public class PayTradeDTO extends DTOBase implements Serializable { ...@@ -81,29 +97,29 @@ public class PayTradeDTO extends DTOBase implements Serializable {
private String accessName; private String accessName;
/** /**
* 属性 [APPID] * 属性 [ACCESSID]
* *
*/ */
@JSONField(name = "app_id") @JSONField(name = "access_id")
@JsonProperty("app_id") @JsonProperty("access_id")
private String appId; private String accessId;
/** /**
* 属性 [TRADETYPE] * 设置 [SUBJECT]
*
*/ */
@JSONField(name = "trade_type") public void setSubject(String subject){
@JsonProperty("trade_type") this.subject = subject ;
private String tradeType; this.modify("subject",subject);
}
/** /**
* 属性 [TRADESTATUS] * 设置 [TOTALAMOUNT]
*
*/ */
@JSONField(name = "trade_status") public void setTotalAmount(String totalAmount){
@JsonProperty("trade_status") this.totalAmount = totalAmount ;
private String tradeStatus; this.modify("totalamount",totalAmount);
}
/** /**
* 设置 [TRADENAME] * 设置 [TRADENAME]
...@@ -114,43 +130,27 @@ public class PayTradeDTO extends DTOBase implements Serializable { ...@@ -114,43 +130,27 @@ public class PayTradeDTO extends DTOBase implements Serializable {
} }
/** /**
* 设置 [SUBJECT] * 设置 [TRADETYPE]
*/
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]
*/ */
public void setTotalAmount(String totalAmount){ public void setTradeType(String tradeType){
this.totalAmount = totalAmount ; this.tradeType = tradeType ;
this.modify("totalamount",totalAmount); this.modify("tradetype",tradeType);
} }
/** /**
* 设置 [ACCESSID] * 设置 [TRADESTATUS]
*/ */
public void setAccessId(String accessId){ public void setTradeStatus(String tradeStatus){
this.accessId = accessId ; this.tradeStatus = tradeStatus ;
this.modify("accessid",accessId); this.modify("tradestatus",tradeStatus);
} }
/** /**
* 设置 [ACCESSNAME] * 设置 [OUTTRADENO]
*/ */
public void setAccessName(String accessName){ public void setOutTradeNo(String outTradeNo){
this.accessName = accessName ; this.outTradeNo = outTradeNo ;
this.modify("accessname",accessName); this.modify("outtradeno",outTradeNo);
} }
/** /**
...@@ -162,19 +162,19 @@ public class PayTradeDTO extends DTOBase implements Serializable { ...@@ -162,19 +162,19 @@ public class PayTradeDTO extends DTOBase implements Serializable {
} }
/** /**
* 设置 [TRADETYPE] * 设置 [ACCESSNAME]
*/ */
public void setTradeType(String tradeType){ public void setAccessName(String accessName){
this.tradeType = tradeType ; this.accessName = accessName ;
this.modify("tradetype",tradeType); this.modify("accessname",accessName);
} }
/** /**
* 设置 [TRADESTATUS] * 设置 [ACCESSID]
*/ */
public void setTradeStatus(String tradeStatus){ public void setAccessId(String accessId){
this.tradeStatus = tradeStatus ; this.accessId = accessId ;
this.modify("tradestatus",tradeStatus); this.modify("accessid",accessId);
} }
......
ibzpay-util/src/main/resources/application-sys.yml
浏览文件 @ 6f9addd7
...@@ -22,9 +22,9 @@ spring: ...@@ -22,9 +22,9 @@ spring:
max-file-size: 100MB max-file-size: 100MB
max-request-size: 100MB max-request-size: 100MB
datasource: datasource:
username: a_A_5d9d78509 username: root
password: '@6dEfb3@' password: 'root'
url: jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true 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 driver-class-name: com.mysql.jdbc.Driver
filters: stat,wall,log4j2 filters: stat,wall,log4j2
#配置初始化大小/最小/最大 #配置初始化大小/最小/最大
...@@ -45,7 +45,7 @@ spring: ...@@ -45,7 +45,7 @@ spring:
pool-prepared-statements: false pool-prepared-statements: false
max-pool-prepared-statement-per-connection-size: 20 max-pool-prepared-statement-per-connection-size: 20
isSyncDBSchema: false isSyncDBSchema: false
defaultSchema: a_A_5d9d78509 defaultSchema: root
conf: classpath:liquibase/master.xml conf: classpath:liquibase/master.xml
#Mybatis-plus配置 #Mybatis-plus配置
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或