Skip to content

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

zhouweidong@lab.ibiz5.com 发布系统代码

上级 f9aff901
隐藏空白字符变更
内嵌 并排
正在显示 包含 141 行增加 和 117 行删除
app_web/src/components/app-panel-field/app-panel-field.less
浏览文件 @ 9dda93ee
.app-panel-item {
.app-panel-field {
height: 100%;
width: 100%;
display: flex;
padding: 0 6px;
.editor{
flex-grow: 1;
height: 34px !important;
.editorstyle{
.ivu-input.ivu-input-default{
border-color: red;
}
}
.errorstyle{
color:red !important;
}
}
.app-panel-item-label {
.app-panel-field-label {
height: 34px !important;
line-height: 25px;
flex-shrink: 0;
......@@ -15,34 +22,29 @@
}
}
.app-panel-item.label-top {
.app-panel-field.label-top {
flex-flow: column;
}
.app-panel-item.label-bottom{
.app-panel-field.label-bottom{
flex-flow: column-reverse;
}
.app-panel-item.label-left {
.app-panel-item-label {
.app-panel-field.label-left {
.app-panel-field-label {
text-align: right;
}
}
.app-panel-item.label-right {
.app-panel-field.label-right {
flex-flow: row-reverse;
.app-panel-item-label {
.app-panel-field-label {
padding: 6px 0px 6px 10px;
}
}
.app-panel-item.label-none {
.app-panel-item-label {
.app-panel-field.label-none {
.app-panel-field-label {
display: none !important;
}
}
.editorStyle{
.ivu-input.ivu-input-default{
border-color: red;
}
}
\ No newline at end of file
app_web/src/components/app-panel-field/app-panel-field.vue
浏览文件 @ 9dda93ee
<template>
<div :class="classes">
<div v-if="Object.is(labelPos,'NONE') || !labelPos" class="editor">
<div :class="valueCheck == true ?'':'editorStyle'">
<div :class="valueCheck == true ?'':'editorstyle'">
<slot ></slot>
<span :class="error ? 'errorstyle':''">{{error}}</span>
</div>
</div>
<div v-if="!Object.is(labelPos,'NONE')" class="app-panel-item-label">
<div v-if="!Object.is(labelPos,'NONE')" class="app-panel-field-label">
<span v-if="required" style="color:red;">* </span>
{{isEmptyCaption ? '' : caption}}
</div>
<div v-if="Object.is(labelPos,'BOTTOM') || Object.is(labelPos,'TOP') || Object.is(labelPos,'LEFT') || Object.is(labelPos,'RIGHT')" class="editor">
<div :class="valueCheck == true ?'':'editorStyle'">
<div :class="valueCheck == true ?'':'editorstyle'">
<slot ></slot>
<span :class="error ? 'errorstyle':''">{{error}}</span>
</div>
</div>
</div>
......@@ -20,12 +22,12 @@
import { Vue, Component, Prop, Watch } from "vue-property-decorator";
@Component({})
export default class AppPanelItem extends Vue {
export default class AppPanelField extends Vue {
/**
* 名称
*
* @type {string}
* @memberof AppPanelItem
* @memberof AppPanelField
*/
@Prop() public caption!: string;
......@@ -33,7 +35,7 @@ export default class AppPanelItem extends Vue {
* 错误信息
*
* @type {string}
* @memberof AppPanelItem
* @memberof AppPanelField
*/
@Prop() public error?: string;
......@@ -41,7 +43,7 @@ export default class AppPanelItem extends Vue {
* 标签位置
*
* @type {(string | 'BOTTOM' | 'LEFT' | 'NONE' | 'RIGHT' | 'TOP')}
* @memberof AppPanelItem
* @memberof AppPanelField
*/
@Prop() public labelPos?:
| string
......@@ -55,7 +57,7 @@ export default class AppPanelItem extends Vue {
* 标签是否空白
*
* @type {boolean}
* @memberof AppPanelItem
* @memberof AppPanelField
*/
@Prop() public isEmptyCaption?: boolean;
......@@ -63,7 +65,7 @@ export default class AppPanelItem extends Vue {
* 列表项名称
*
* @type {string}
* @memberof AppPanelItem
* @memberof AppPanelField
*/
@Prop() public name!: string;
......@@ -71,7 +73,7 @@ export default class AppPanelItem extends Vue {
* 面板数据
*
* @type {any}
* @memberof AppPanelItem
* @memberof AppPanelField
*/
@Prop() public data!: any;
......@@ -79,7 +81,7 @@ export default class AppPanelItem extends Vue {
* 编辑器值
*
* @type {any}
* @memberof AppPanelItem
* @memberof AppPanelField
*/
@Prop() public value !: any;
......@@ -87,7 +89,7 @@ export default class AppPanelItem extends Vue {
* 值规则
*
* @type {string}
* @memberof AppPanelItem
* @memberof AppPanelField
*/
@Prop() public itemRules!: any;
......@@ -95,7 +97,7 @@ export default class AppPanelItem extends Vue {
* 是否必填
*
* @type {boolean}
* @memberof AppPanelItem
* @memberof AppPanelField
*/
public required: boolean = false;
......@@ -103,7 +105,7 @@ export default class AppPanelItem extends Vue {
* 值规则数组
*
* @type {any[]}
* @memberof AppPanelItem
* @memberof AppPanelField
*/
public rules: any[] = [];
......@@ -112,7 +114,7 @@ export default class AppPanelItem extends Vue {
*
* @param {*} newVal
* @param {*} oldVal
* @memberof AppPanelItem
* @memberof AppPanelField
*/
@Watch("itemRules", { deep: true })
onItemRulesChange(newVal: any, oldVal: any) {
......@@ -136,7 +138,7 @@ export default class AppPanelItem extends Vue {
* 编辑器样式
*
* @type {boolean}
* @memberof AppPanelItem
* @memberof AppPanelField
*/
public valueCheck: boolean = true;
......@@ -145,7 +147,7 @@ export default class AppPanelItem extends Vue {
*
* @param {*} newVal
* @param {*} oldVal
* @memberof AppPanelItem
* @memberof AppPanelField
*/
@Watch("value")
ItemValueRules(newVal: any, oldVal: any) {
......@@ -161,7 +163,7 @@ export default class AppPanelItem extends Vue {
*
* @readonly
* @type {string []}
* @memberof AppPanelItem
* @memberof AppPanelField
*/
get classes(): string[] {
let posClass = "";
......@@ -182,13 +184,13 @@ export default class AppPanelItem extends Vue {
posClass = "label-none";
break;
}
return [ "app-panel-item", posClass ];
return [ "app-panel-field", posClass ];
}
/**
* vue 生命周期
*
* @memberof AppPanelItem
* @memberof AppPanelField
*/
public mounted() {
if (this.itemRules) {
......
app_web/src/components/app-panel-item/app-panel-item.less 0 → 100644
浏览文件 @ 9dda93ee
.app-panel-item{
.app-panel-item-rawitem{
padding-right: 10px;
}
}
\ No newline at end of file
app_web/src/components/app-panel-item/app-panel-item.vue
浏览文件 @ 9dda93ee
<template>
<div>
<div class="app-panel-item">
<div v-if="Object.is(itemType,'BUTTON')" >
<Button type="primary" long @click="onClick">
<i v-if="icon" :class="icon"></i>
<span v-if="showCaption">{{caption ? caption : ''}}</span>
<span v-if="showCaption" :class="lableStyle">{{caption ? caption : ''}}</span>
</Button>
</div>
<div v-if="Object.is(itemType,'RAWITEM')">
<i v-if="icon" :class="icon"></i>
<span v-if="showCaption" style="padding-right: 10px;">{{caption ? caption : ''}}</span>
<span v-if="caption" class="app-panel-item-rawitem">{{caption}}</span>
<div :class="contentStyle">
<slot></slot>
</div>
</div>
</div>
</template>
......@@ -18,13 +20,13 @@
import { Vue, Component, Prop, Watch } from "vue-property-decorator";
@Component({})
export default class AppPanelButton extends Vue {
export default class AppPanelItem extends Vue {
/**
* 面板成员类型
*
* @type {string}
* @memberof AppPanelButton
* @memberof AppPanelItem
*/
@Prop() public itemType!: string;
......@@ -32,7 +34,7 @@ export default class AppPanelButton extends Vue {
* 图标
*
* @type {string}
* @memberof AppPanelButton
* @memberof AppPanelItem
*/
@Prop() public icon?: string;
......@@ -40,7 +42,7 @@ export default class AppPanelButton extends Vue {
* 标题
*
* @type {string}
* @memberof AppPanelButton
* @memberof AppPanelItem
*/
@Prop() public caption?: string;
......@@ -48,15 +50,39 @@ export default class AppPanelButton extends Vue {
* 显示标题
*
* @type {boolean}
* @memberof AppPanelButton
* @memberof AppPanelItem
*/
@Prop() public showCaption?: boolean;
/**
* 标题样式
*
* @type {boolean}
* @memberof AppPanelItem
*/
@Prop() public lableStyle?: string;
/**
* 内容样式
*
* @type {boolean}
* @memberof AppPanelItem
*/
@Prop() public contentStyle?: string;
/**
* 部件样式
*
* @type {boolean}
* @memberof AppPanelItem
*/
@Prop() public partsStyle?: string;
/**
* 点击按钮
*
* @param {*} $event
* @memberof AppPanelButton
* @memberof AppPanelItem
*/
public onClick($event: any){
this.$emit('onClick',$event);
......@@ -65,5 +91,5 @@ export default class AppPanelButton extends Vue {
}
</script>
<style lang='less'>
@import "./app-panel-item.less";
</style>
\ No newline at end of file
app_web/src/locale/lanres/entities/pay-trade/pay-trade_en_US.ts
浏览文件 @ 9dda93ee
......@@ -8,6 +8,7 @@ export default {
total_amount: "订单金额",
access_id: "支付平台接入标识",
access_name: "支付平台",
app_id: "AccessKey(AppId)",
},
views: {
editview: {
......
app_web/src/locale/lanres/entities/pay-trade/pay-trade_zh_CN.ts
浏览文件 @ 9dda93ee
......@@ -7,6 +7,7 @@ export default {
total_amount: "订单金额",
access_id: "支付平台接入标识",
access_name: "支付平台",
app_id: "AccessKey(AppId)",
},
views: {
editview: {
......
app_web/src/model/panel-detail/panel-detail.ts
浏览文件 @ 9dda93ee
......@@ -28,7 +28,7 @@ export class PanelDetailModel {
* @type {string}
* @memberof PanelDetailModel
*/
public detailType: string = '';
public itemType: string = '';
/**
* 面板对象
......@@ -80,7 +80,7 @@ export class PanelDetailModel {
*/
constructor(opts: any = {}) {
this.caption = !Object.is(opts.caption, '') ? opts.caption : '';
this.detailType = !Object.is(opts.detailType, '') ? opts.detailType : '';
this.itemType = !Object.is(opts.itemType, '') ? opts.itemType : '';
this.panel = opts.panel ? opts.panel : {};
this.name = !Object.is(opts.name, '') ? opts.name : '';
this.$visible = opts.visible ? true : false;
......
app_web/src/model/panel-detail/panel-tab-page.ts
浏览文件 @ 9dda93ee
......@@ -46,7 +46,7 @@ export class PanelTabPageModel extends PanelDetailModel {
if (!this.panel) {
return null;
}
const tabPanels: any[] = Object.values(this.panel.detailsModel).filter((model: any) => Object.is(model.detailType, 'TABPANEL'));
const tabPanels: any[] = Object.values(this.panel.detailsModel).filter((model: any) => Object.is(model.itemType, 'TABPANEL'));
let index = tabPanels.findIndex((tabPanel: any) => {
return tabPanel.tabPages.some((tabPag: any) => Object.is(tabPag.name, this.name));
});
......
ibzpay-app/ibzpay-app-web/src/main/resources/application-web-prod.yml
浏览文件 @ 9dda93ee
......@@ -39,6 +39,10 @@ zuul:
path: /dictionarys/**/Ibzou**
serviceId: ${ibiz.ref.service.ou:ibzou-api}
stripPrefix: false
ou:
path: /ibzdepartments/**
serviceId: ${ibiz.ref.service.ou:ibzou-api}
stripPrefix: false
uaadict:
path: /dictionarys/**/SysOperator
serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
......
ibzpay-boot/src/main/resources/application-dev.yml
浏览文件 @ 9dda93ee
......@@ -28,6 +28,10 @@ zuul:
path: /dictionarys/**/Ibzou**
serviceId: ${ibiz.ref.service.ou:ibzou-api}
stripPrefix: false
ou:
path: /ibzdepartments/**
serviceId: ${ibiz.ref.service.ou:ibzou-api}
stripPrefix: false
uaadict:
path: /dictionarys/**/SysOperator
serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
......
ibzpay-core/src/main/java/cn/ibizlab/core/pay/domain/PayTrade.java
浏览文件 @ 9dda93ee
......@@ -90,6 +90,13 @@ public class PayTrade extends EntityMP implements Serializable {
@JSONField(name = "access_name")
@JsonProperty("access_name")
private String accessName;
/**
* AccessKey(AppId)
*/
@TableField(value = "appid")
@JSONField(name = "app_id")
@JsonProperty("app_id")
private String appId;
/**
* 接入平台
......@@ -149,6 +156,14 @@ public class PayTrade extends EntityMP implements Serializable {
this.modify("accessname",accessName);
}
/**
* 设置 [AccessKey(AppId)]
*/
public void setAppId(String appId){
this.appId = appId ;
this.modify("appid",appId);
}
}
......
ibzpay-core/src/main/java/cn/ibizlab/core/pay/service/impl/PayTradeServiceImpl.java
浏览文件 @ 9dda93ee
......@@ -187,6 +187,7 @@ public class PayTradeServiceImpl extends ServiceImpl<PayTradeMapper, PayTrade> i
openaccess=majorEntity;
}
et.setAccessName(openaccess.getName());
et.setAppId(openaccess.getAccessKey());
}
}
......
ibzpay-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 9dda93ee
<?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-59-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-96-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>
</createTable>
</changeSet>
<!--输出实体[PAY_OPEN_ACCESS]外键关系 -->
<!--输出实体[PAY_TRADE]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-pay_trade-96-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_zh_CN" at line 28, column 24]
----
\ No newline at end of file
ibzpay-core/src/main/resources/mapper/pay/paytrade/PayTradeMapper.xml
浏览文件 @ 9dda93ee
......@@ -8,7 +8,7 @@
<![CDATA[select t1.* from (SELECT t1.`ACCESSID`, t1.`ACCESSNAME`, t1.`OUTTRADENO`, t1.`SUBJECT`, t1.`TOTALAMOUNT`, t1.`TRADEID`, t1.`TRADENAME` FROM `IBZPAYTRADE` t1 ) t1 where tradeid=#{id}]]>
</select>
<select id="selectById" resultMap="PayTradeResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t1.ACCESSID, t1.ACCESSNAME, t1.OUTTRADENO, t1.SUBJECT, t1.TOTALAMOUNT, t1.TRADEID, t1.TRADENAME FROM IBZPAYTRADE t1 ) t1 where tradeid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.ACCESSID, t1.ACCESSNAME, t1.APPID, t1.OUTTRADENO, t1.SUBJECT, t1.TOTALAMOUNT, t1.TRADEID, t1.TRADENAME FROM IBZPAYTRADE t1 ) t1 where tradeid=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
......@@ -45,7 +45,7 @@
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t1.ACCESSID, t1.ACCESSNAME, t1.OUTTRADENO, t1.SUBJECT, t1.TOTALAMOUNT, t1.TRADEID, t1.TRADENAME FROM IBZPAYTRADE t1
<![CDATA[ SELECT t1.ACCESSID, t1.ACCESSNAME, t1.APPID, t1.OUTTRADENO, t1.SUBJECT, t1.TOTALAMOUNT, t1.TRADEID, t1.TRADENAME FROM IBZPAYTRADE t1
]]>
</sql>
<!--数据查询[View]-->
......@@ -55,7 +55,7 @@
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="oracle">
<![CDATA[ SELECT t1.ACCESSID, t1.ACCESSNAME, t1.OUTTRADENO, t1.SUBJECT, t1.TOTALAMOUNT, t1.TRADEID, t1.TRADENAME FROM IBZPAYTRADE t1
<![CDATA[ SELECT t1.ACCESSID, t1.ACCESSNAME, t1.APPID, t1.OUTTRADENO, t1.SUBJECT, t1.TOTALAMOUNT, t1.TRADEID, t1.TRADENAME FROM IBZPAYTRADE t1
]]>
</sql>
</mapper>
......
ibzpay-provider/ibzpay-provider-api/src/main/java/cn/ibizlab/api/dto/PayTradeDTO.java
浏览文件 @ 9dda93ee
......@@ -80,6 +80,14 @@ public class PayTradeDTO extends DTOBase implements Serializable {
@JsonProperty("access_name")
private String accessName;
/**
* 属性 [APPID]
*
*/
@JSONField(name = "app_id")
@JsonProperty("app_id")
private String appId;
/**
* 设置 [TRADENAME]
......@@ -129,6 +137,14 @@ public class PayTradeDTO extends DTOBase implements Serializable {
this.modify("accessname",accessName);
}
/**
* 设置 [APPID]
*/
public void setAppId(String appId){
this.appId = appId ;
this.modify("appid",appId);
}
}
ibzpay-util/src/main/resources/application-sys.yml
浏览文件 @ 9dda93ee
......@@ -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配置
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或