From 2eabbe6f0f2616de6ef0727e6e61b17660443ebb Mon Sep 17 00:00:00 2001 From: Tang Cheng Date: Mon, 24 Jun 2019 11:47:57 +0800 Subject: [PATCH] =?utf8?q?=E6=94=B9=E8=BF=9B=E4=BA=86=E6=95=B0=E6=8D=AE?= =?utf8?q?=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- build.gradle | 1 - .../supwisdom/dlpay/api/domain/TAccount.java | 2 +- .../dlpay/api/domain/TTransactionMain.java | 2 +- .../kotlin/com/supwisdom/dlpay/migration.kt | 32 ------------- .../db/migration/V1.0__init_data.sql | 37 --------------- .../db/migration/V1.1__init_paytype.sql | 7 --- .../db/migration/V1.3__init_data.sql | 1 - .../V1.2__init_data.sql => import.sql} | 47 ++++++++++++++++++- 8 files changed, 48 insertions(+), 81 deletions(-) delete mode 100644 src/main/kotlin/com/supwisdom/dlpay/migration.kt delete mode 100644 src/main/resources/db/migration/V1.0__init_data.sql delete mode 100644 src/main/resources/db/migration/V1.1__init_paytype.sql delete mode 100644 src/main/resources/db/migration/V1.3__init_data.sql rename src/main/resources/{db/migration/V1.2__init_data.sql => import.sql} (61%) diff --git a/build.gradle b/build.gradle index e318a0dc..0f9897be 100644 --- a/build.gradle +++ b/build.gradle @@ -54,7 +54,6 @@ dependencies { implementation group: 'javax.servlet', name: 'jstl', version: '1.2' implementation group: 'taglibs', name: 'standard', version: '1.1.2' implementation group: 'commons-codec', name: 'commons-codec', version: '1.6' - implementation 'org.flywaydb:flyway-core' implementation files('libs/ojdbc6.jar') diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TAccount.java b/src/main/java/com/supwisdom/dlpay/api/domain/TAccount.java index 25fc46c5..16ed73cb 100644 --- a/src/main/java/com/supwisdom/dlpay/api/domain/TAccount.java +++ b/src/main/java/com/supwisdom/dlpay/api/domain/TAccount.java @@ -12,7 +12,7 @@ import java.sql.Timestamp; @Entity @Table(name = "TB_ACCOUNT", indexes = {@Index(name = "acc_userid_idx", columnList = "userid"), - @Index(name = "acc_status_idx", columnList = "transStatus"), + @Index(name = "acc_status_idx", columnList = "TRANS_STATUS"), @Index(name = "acc_subjno_uk", unique = true, columnList = "subjno,userid")}) public class TAccount implements Serializable { @Id diff --git a/src/main/java/com/supwisdom/dlpay/api/domain/TTransactionMain.java b/src/main/java/com/supwisdom/dlpay/api/domain/TTransactionMain.java index e351fea4..9b145e07 100644 --- a/src/main/java/com/supwisdom/dlpay/api/domain/TTransactionMain.java +++ b/src/main/java/com/supwisdom/dlpay/api/domain/TTransactionMain.java @@ -69,7 +69,7 @@ public class TTransactionMain { @Column(name = "end_time") private Timestamp endTime; - @Column(name = "reverse_type", nullable = false) + @Column(name = "reverse_type", nullable = false, length = 10) private String reverseType = TradeDict.REVERSE_FLAG_NONE; // 流水标识， none - 正常交易流水， cancel - 撤销流水， refund - 退款流水 // 撤销、退款原流水参考号 diff --git a/src/main/kotlin/com/supwisdom/dlpay/migration.kt b/src/main/kotlin/com/supwisdom/dlpay/migration.kt deleted file mode 100644 index c9fe2982..00000000 --- a/src/main/kotlin/com/supwisdom/dlpay/migration.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.supwisdom.dlpay - -import org.springframework.boot.autoconfigure.flyway.FlywayMigrationInitializer -import org.flywaydb.core.Flyway -import org.springframework.context.annotation.Bean -import org.springframework.context.annotation.Configuration -import org.springframework.context.annotation.DependsOn - - -@Configuration -class MigrationConfiguration { - - /** - * Override default flyway initializer to do nothing - */ - @Bean - fun flywayInitializer(flyway: Flyway): FlywayMigrationInitializer { - return FlywayMigrationInitializer(flyway) { } - } - - - /** - * Create a second flyway initializer to run after jpa has created the schema - */ - @Bean - @DependsOn("entityManagerFactory") - fun delayedFlywayInitializer(flyway: Flyway): FlywayMigrationInitializer { - return FlywayMigrationInitializer(flyway, null) - } - - -} \ No newline at end of file diff --git a/src/main/resources/db/migration/V1.0__init_data.sql b/src/main/resources/db/migration/V1.0__init_data.sql deleted file mode 100644 index acc8d097..00000000 --- a/src/main/resources/db/migration/V1.0__init_data.sql +++ /dev/null @@ -1,37 +0,0 @@ -insert into tb_apiclient(appid, secret, transStatus, roles) -values ('100001', 'oUw2NmA09ficiVWD4TUQLDOkPyzQa3VzbjjsW0B2qTk=', 'normal', 'ROLE_THIRD_ADMIN'); -INSERT INTO tb_operator( - operid, closedate, opendate, opercode, opername, operpwd, opertype, transStatus) - VALUES ('LOR2IwRkbOjp+sVG9KR2BpHZbwGKepS4', '20500101', '20190101', 'system', '系统管理员', '$2a$10$Ex9xp11.vCaD8D0a7ahiUOKqDij1TcCUBwRAmrqXeDvAkmzLibn4.', 'oper', 'normal'); - -INSERT INTO tb_role( - roleid, createtime, editflag, lastsaved, rolecode, roledesc, rolename) - VALUES ('d1yctWs5+ks0iQN3m9bUvRHus6HbKbrs', '20190101000000', 0, '', 'ROLE_ADMIN', '超级管理员', '超级管理员'); - -INSERT INTO tb_oper_role( - id, operid, roleid) - VALUES ('1', 'LOR2IwRkbOjp+sVG9KR2BpHZbwGKepS4', 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs'); - --- 功能表 ---Insert into TB_FUNCTION (ID,PARENTID,NAME,ORDERNUM,MENUURL,MENUICON,ISLEAF) ---values ('1','-1','系统中心',1,'#','layui-icon-set',0); ---Insert into TB_FUNCTION (ID,PARENTID,NAME,ORDERNUM,MENUURL,MENUICON,ISLEAF) ---values ('2','1','管理员维护',1,'#','layui-icon-set',1); - ---Insert into TB_ROLE_FUNCTION (ID,FUNCTIONID,ROLEID) values ('1','1','d1yctWs5+ks0iQN3m9bUvRHus6HbKbrs'); ---Insert into TB_ROLE_FUNCTION (ID,FUNCTIONID,ROLEID) values ('2','2','d1yctWs5+ks0iQN3m9bUvRHus6HbKbrs'); - -Insert into TB_FUNCTION (ID,CREATETIME,ISLEAF,LASTSAVED,MENUICON,MENUURL,NAME,ORDERNUM,PARENTID) values ('1',null,0,null,'layui-icon-home','#','主页',1,'-1'); -Insert into TB_FUNCTION (ID,CREATETIME,ISLEAF,LASTSAVED,MENUICON,MENUURL,NAME,ORDERNUM,PARENTID) values ('2',null,1,null,'layui-icon-home','/home/console','控制台',1,'1'); -Insert into TB_FUNCTION (ID,CREATETIME,ISLEAF,LASTSAVED,MENUICON,MENUURL,NAME,ORDERNUM,PARENTID) values ('3',null,0,null,'layui-icon-set','#','系统中心',2,'-1'); -Insert into TB_FUNCTION (ID,CREATETIME,ISLEAF,LASTSAVED,MENUICON,MENUURL,NAME,ORDERNUM,PARENTID) values ('4',null,1,null,'layui-icon-set','/operator/index','管理员维护',1,'3'); -Insert into TB_FUNCTION (ID,CREATETIME,ISLEAF,LASTSAVED,MENUICON,MENUURL,NAME,ORDERNUM,PARENTID) values ('5',null,1,null,'layui-icon-set','/role/index','角色管理',2,'3'); - - -Insert into TB_ROLE_FUNCTION (ID,FUNCTIONID,ROLEID) values ('5','5','d1yctWs5+ks0iQN3m9bUvRHus6HbKbrs'); -Insert into TB_ROLE_FUNCTION (ID,FUNCTIONID,ROLEID) values ('1','1','d1yctWs5+ks0iQN3m9bUvRHus6HbKbrs'); -Insert into TB_ROLE_FUNCTION (ID,FUNCTIONID,ROLEID) values ('2','2','d1yctWs5+ks0iQN3m9bUvRHus6HbKbrs'); -Insert into TB_ROLE_FUNCTION (ID,FUNCTIONID,ROLEID) values ('3','3','d1yctWs5+ks0iQN3m9bUvRHus6HbKbrs'); -Insert into TB_ROLE_FUNCTION (ID,FUNCTIONID,ROLEID) values ('4','4','d1yctWs5+ks0iQN3m9bUvRHus6HbKbrs'); - -commit; diff --git a/src/main/resources/db/migration/V1.1__init_paytype.sql b/src/main/resources/db/migration/V1.1__init_paytype.sql deleted file mode 100644 index 0dfd06c1..00000000 --- a/src/main/resources/db/migration/V1.1__init_paytype.sql +++ /dev/null @@ -1,7 +0,0 @@ --- 支付方式 -Insert into TB_PAYTYPE (PAYTYPE,DPS_ENABLE,ENABLE,REVERSE_ENABLE) values ('yktpay','no','yes','yes'); - -Insert into TB_PAYTYPE_CONFIG (PAYTYPE,CONFIGID,CONFIG_NAME,CONFIG_VALUE) values ('yktpay','appid',null,'100005'); -Insert into TB_PAYTYPE_CONFIG (PAYTYPE,CONFIGID,CONFIG_NAME,CONFIG_VALUE) values ('yktpay','appkey',null,'adc4ac6822fd462780f878b86cb94688'); -Insert into TB_PAYTYPE_CONFIG (PAYTYPE,CONFIGID,CONFIG_NAME,CONFIG_VALUE) values ('yktpay','orderurl',null,'http://172.28.201.101:9116/epayapi/services/thirdparty/common/pay'); -Insert into TB_PAYTYPE_CONFIG (PAYTYPE,CONFIGID,CONFIG_NAME,CONFIG_VALUE) values ('yktpay','reverseurl',null,'http://172.28.201.101:9116/epayapi/services/thirdparty/common/payreverse'); diff --git a/src/main/resources/db/migration/V1.3__init_data.sql b/src/main/resources/db/migration/V1.3__init_data.sql deleted file mode 100644 index f2b0d7de..00000000 --- a/src/main/resources/db/migration/V1.3__init_data.sql +++ /dev/null @@ -1 +0,0 @@ -Insert into TB_SUBJECT (SUBJNO,SUBJNAME,SUBJTYPE,BALFLAG,FSUBJNO,SUBJLEVEL,ENDFLAG,OPENDATE,DISPLAYFLAG) values ('112234','市民卡支付款',1,1,'1122',2,1,null,'y'); \ No newline at end of file diff --git a/src/main/resources/db/migration/V1.2__init_data.sql b/src/main/resources/import.sql similarity index 61% rename from src/main/resources/db/migration/V1.2__init_data.sql rename to src/main/resources/import.sql index 37ee13ce..2e4595d8 100644 --- a/src/main/resources/db/migration/V1.2__init_data.sql +++ b/src/main/resources/import.sql @@ -1,3 +1,46 @@ +insert into tb_apiclient(appid, secret, transStatus, roles) +values ('100001', 'oUw2NmA09ficiVWD4TUQLDOkPyzQa3VzbjjsW0B2qTk=', 'normal', 'ROLE_THIRD_ADMIN'); +INSERT INTO tb_operator( + operid, closedate, opendate, opercode, opername, operpwd, opertype, transStatus) + VALUES ('LOR2IwRkbOjp+sVG9KR2BpHZbwGKepS4', '20500101', '20190101', 'system', '系统管理员', '$2a$10$Ex9xp11.vCaD8D0a7ahiUOKqDij1TcCUBwRAmrqXeDvAkmzLibn4.', 'oper', 'normal'); + +INSERT INTO tb_role( + roleid, createtime, editflag, lastsaved, rolecode, roledesc, rolename) + VALUES ('d1yctWs5+ks0iQN3m9bUvRHus6HbKbrs', '20190101000000', 0, '', 'ROLE_ADMIN', '超级管理员', '超级管理员'); + +INSERT INTO tb_oper_role( + id, operid, roleid) + VALUES ('1', 'LOR2IwRkbOjp+sVG9KR2BpHZbwGKepS4', 'd1yctWs5+ks0iQN3m9bUvRHus6HbKbrs'); + +-- 功能表 +--Insert into TB_FUNCTION (ID,PARENTID,NAME,ORDERNUM,MENUURL,MENUICON,ISLEAF) +--values ('1','-1','系统中心',1,'#','layui-icon-set',0); +--Insert into TB_FUNCTION (ID,PARENTID,NAME,ORDERNUM,MENUURL,MENUICON,ISLEAF) +--values ('2','1','管理员维护',1,'#','layui-icon-set',1); + +--Insert into TB_ROLE_FUNCTION (ID,FUNCTIONID,ROLEID) values ('1','1','d1yctWs5+ks0iQN3m9bUvRHus6HbKbrs'); +--Insert into TB_ROLE_FUNCTION (ID,FUNCTIONID,ROLEID) values ('2','2','d1yctWs5+ks0iQN3m9bUvRHus6HbKbrs'); + +Insert into TB_FUNCTION (ID,CREATETIME,ISLEAF,LASTSAVED,MENUICON,MENUURL,NAME,ORDERNUM,PARENTID) values ('1',null,0,null,'layui-icon-home','#','主页',1,'-1'); +Insert into TB_FUNCTION (ID,CREATETIME,ISLEAF,LASTSAVED,MENUICON,MENUURL,NAME,ORDERNUM,PARENTID) values ('2',null,1,null,'layui-icon-home','/home/console','控制台',1,'1'); +Insert into TB_FUNCTION (ID,CREATETIME,ISLEAF,LASTSAVED,MENUICON,MENUURL,NAME,ORDERNUM,PARENTID) values ('3',null,0,null,'layui-icon-set','#','系统中心',2,'-1'); +Insert into TB_FUNCTION (ID,CREATETIME,ISLEAF,LASTSAVED,MENUICON,MENUURL,NAME,ORDERNUM,PARENTID) values ('4',null,1,null,'layui-icon-set','/operator/index','管理员维护',1,'3'); +Insert into TB_FUNCTION (ID,CREATETIME,ISLEAF,LASTSAVED,MENUICON,MENUURL,NAME,ORDERNUM,PARENTID) values ('5',null,1,null,'layui-icon-set','/role/index','角色管理',2,'3'); + + +Insert into TB_ROLE_FUNCTION (ID,FUNCTIONID,ROLEID) values ('5','5','d1yctWs5+ks0iQN3m9bUvRHus6HbKbrs'); +Insert into TB_ROLE_FUNCTION (ID,FUNCTIONID,ROLEID) values ('1','1','d1yctWs5+ks0iQN3m9bUvRHus6HbKbrs'); +Insert into TB_ROLE_FUNCTION (ID,FUNCTIONID,ROLEID) values ('2','2','d1yctWs5+ks0iQN3m9bUvRHus6HbKbrs'); +Insert into TB_ROLE_FUNCTION (ID,FUNCTIONID,ROLEID) values ('3','3','d1yctWs5+ks0iQN3m9bUvRHus6HbKbrs'); +Insert into TB_ROLE_FUNCTION (ID,FUNCTIONID,ROLEID) values ('4','4','d1yctWs5+ks0iQN3m9bUvRHus6HbKbrs'); + +-- 支付方式 +Insert into TB_PAYTYPE (PAYTYPE,DPS_ENABLE,ENABLE,REVERSE_ENABLE) values ('yktpay','no','yes','yes'); + +Insert into TB_PAYTYPE_CONFIG (PAYTYPE,CONFIGID,CONFIG_NAME,CONFIG_VALUE) values ('yktpay','appid',null,'100005'); +Insert into TB_PAYTYPE_CONFIG (PAYTYPE,CONFIGID,CONFIG_NAME,CONFIG_VALUE) values ('yktpay','appkey',null,'adc4ac6822fd462780f878b86cb94688'); +Insert into TB_PAYTYPE_CONFIG (PAYTYPE,CONFIGID,CONFIG_NAME,CONFIG_VALUE) values ('yktpay','orderurl',null,'http://172.28.201.101:9116/epayapi/services/thirdparty/common/pay'); +Insert into TB_PAYTYPE_CONFIG (PAYTYPE,CONFIGID,CONFIG_NAME,CONFIG_VALUE) values ('yktpay','reverseurl',null,'http://172.28.201.101:9116/epayapi/services/thirdparty/common/payreverse'); -- 资产类 Insert into TB_SUBJECT (SUBJNO,SUBJNAME,SUBJTYPE,BALFLAG,FSUBJNO,SUBJLEVEL,ENDFLAG,OPENDATE,DISPLAYFLAG) values ('1001','库存现金',1,1,null,1,1,null,'y'); Insert into TB_SUBJECT (SUBJNO,SUBJNAME,SUBJTYPE,BALFLAG,FSUBJNO,SUBJLEVEL,ENDFLAG,OPENDATE,DISPLAYFLAG) values ('1002','银行存款',1,1,null,1,1,null,'y'); @@ -41,7 +84,6 @@ Insert into TB_SUBJECT (SUBJNO,SUBJNAME,SUBJTYPE,BALFLAG,FSUBJNO,SUBJLEVEL,ENDFL -- -- oracle -- -- update TB_SUBJECT set opendate = to_char(sysdate,'yyyyMMdd'); update TB_SUBJECT set opendate = to_number(to_char(CURRENT_TIMESTAMP,'yyyymmdd'),'99999999'); -commit; -- oracle -- @@ -61,4 +103,7 @@ values (1,to_number(to_char(CURRENT_TIMESTAMP,'yyyy'),'9999'),to_number(to_char( insert into TB_VOUCHERNOCTL(VOUCHERTYPE,PERIODMONTH,VOUCHERNO) values (1,to_number(to_char(CURRENT_TIMESTAMP,'MM'),'99'),0); +Insert into TB_SUBJECT (SUBJNO,SUBJNAME,SUBJTYPE,BALFLAG,FSUBJNO,SUBJLEVEL,ENDFLAG,OPENDATE,DISPLAYFLAG) values ('112234','市民卡支付款',1,1,'1122',2,1,null,'y'); + +--------- end of script commit; -- 2.17.1