diff --git a/bui/etc/cap/OCAPRPT2_CTL.XML b/bui/etc/cap/OCAPRPT2_CTL.XML
index b538028..69ccfbd 100644
--- a/bui/etc/cap/OCAPRPT2_CTL.XML
+++ b/bui/etc/cap/OCAPRPT2_CTL.XML
@@ -1,9 +1,7 @@
-
-
-
+
@@ -11,4 +9,6 @@
+
+
diff --git a/cap/applib/commons-lang3-3.0.jar b/cap/applib/commons-lang3-3.0.jar
new file mode 100644
index 0000000..7f2cfe1
Binary files /dev/null and b/cap/applib/commons-lang3-3.0.jar differ
diff --git a/cap/applib/ctg.jar b/cap/applib/ctg.jar
new file mode 100755
index 0000000..8a66e1f
Binary files /dev/null and b/cap/applib/ctg.jar differ
diff --git a/cap/applib/fastjson-1.2.75.jar b/cap/applib/fastjson-1.2.75.jar
new file mode 100644
index 0000000..5fc9553
Binary files /dev/null and b/cap/applib/fastjson-1.2.75.jar differ
diff --git a/cap/applib/httpclient-4.5.3.jar b/cap/applib/httpclient-4.5.3.jar
new file mode 100644
index 0000000..8af4561
Binary files /dev/null and b/cap/applib/httpclient-4.5.3.jar differ
diff --git a/cap/applib/httpcore-4.4.10.jar b/cap/applib/httpcore-4.4.10.jar
new file mode 100644
index 0000000..dc510f8
Binary files /dev/null and b/cap/applib/httpcore-4.4.10.jar differ
diff --git a/cap/applib/httpmime-4.5.3.jar b/cap/applib/httpmime-4.5.3.jar
new file mode 100644
index 0000000..fe2cf8e
Binary files /dev/null and b/cap/applib/httpmime-4.5.3.jar differ
diff --git a/cap/applib/rhro_sfk-1.0.jar b/cap/applib/rhro_sfk-1.0.jar
new file mode 100644
index 0000000..c95dcf5
Binary files /dev/null and b/cap/applib/rhro_sfk-1.0.jar differ
diff --git a/cap/conf/CTG.properties b/cap/conf/CTG.properties
new file mode 100644
index 0000000..c1b3ba2
--- /dev/null
+++ b/cap/conf/CTG.properties
@@ -0,0 +1,2 @@
+PACKAGE=com.murong.ctg.util
+CLASS=ZipUtils,FileUtils
diff --git a/cap/etc/OCAPRPT2/204071_CTL.XML b/cap/etc/OCAPRPT2/204071_CTL.XML
index eaab94f..ad9d9bc 100644
--- a/cap/etc/OCAPRPT2/204071_CTL.XML
+++ b/cap/etc/OCAPRPT2/204071_CTL.XML
@@ -1,60 +1,77 @@
-
-
-
- AC_DT=$GWA.AC_DT
+
+
+
+ AC_DT=GETDATE()
-
-
-
-
- END_DT=$END_DT
-
-
- END_DT=CALCDATE($AC_DT,-,d,1)
-
-
-
-
-
-
- STAT_DT=$STAT_DT
-
-
- STAT_DT=CALCDATE($END_DT,-,d,6)
-
-
+
+
+
+
+ END_DT=$END_DT
+
+
+ END_DT=CALCDATE($AC_DT,-,d,1)
+
- RPT_KND=RPT_D_001
- raqname=STRCAT($RPT_KND,-,$AC_DT,.xls)
- WORKDIR=GETENV(HWORKDIR)
- CR_RPT_FILE=STRCAT($WORKDIR,/app/cap/etc/OCAPRPT2/RPT_D_001.raq)
- RPTNAME=STRCAT($WORKDIR,/ejbs/capbui/rptdata/,$raqname)
+
+
+
+
+ STAT_DT=$STAT_DT
+
+
+ STAT_DT=CALCDATE($END_DT,-,d,6)
+
+
+
+ RPT_KND=RPT_D_001
+ raqname=STRCAT($RPT_KND,-,$AC_DT,.xls)
+ WORKDIR=GETENV(HWORKDIR)
+ CR_RPT_FILE=STRCAT($WORKDIR,/app/cap/etc/OCAPRPT2/RPT_D_001.raq)
+ RPTNAME=STRCAT(/tmp/data/,$raqname)
+
+ RPT_FIL_NM=STRCAT("交易成功率统计报表-",FMTDATE($AC_DT,0,5),.xls)
+
+
+
+
+
+
+
+
+
+ Rsp_Cd=20499
+ Rsp_Msg=失败
+
+
+
+ Rsp_Cd=00000
+ Rsp_Msg=成功
+
+
+
+
+
+
+
+ FILE_NAME=$RPTNAME
+
+
- RPT_FIL_NM=STRCAT("交易成功率统计报表-",FMTDATE($AC_DT,0,5),.xls)
+
+ RPT_FIL_URL=$OUT_DAT.FILE_URL
+
+
+
+
+
+
-
-
-
-
-
-
-
-
- Rsp_Cd=20499
- Rsp_Msg=失败
-
-
-
- Rsp_Cd=00000
- Rsp_Msg=成功
-
- RPT_TYP=D
-
-
-
-
-
+ RPT_TYP=D
+
+
+
-
+
diff --git a/cap/etc/OCAPRPT2/204072_CTL.XML b/cap/etc/OCAPRPT2/204072_CTL.XML
index e022df0..461b9a0 100644
--- a/cap/etc/OCAPRPT2/204072_CTL.XML
+++ b/cap/etc/OCAPRPT2/204072_CTL.XML
@@ -3,7 +3,7 @@
- AC_DT=$GWA.AC_DT
+ AC_DT=GETDATE()
@@ -39,7 +39,7 @@
raqname=STRCAT($RPT_KND,-,$AC_DT,.xls)
WORKDIR=GETENV(HWORKDIR)
CR_RPT_FILE=STRCAT($WORKDIR,/app/cap/etc/OCAPRPT2/RPT_D_002.raq)
- RPTNAME=STRCAT($WORKDIR,/ejbs/capbui/rptdata/,$raqname)
+ RPTNAME=STRCAT(/tmp/data/,$raqname)
RPT_FIL_NM=STRCAT("批量执行情况报表-",FMTDATE($AC_DT,0,5),.xls)
@@ -51,19 +51,36 @@
-
- Rsp_Cd=20499
- Rsp_Msg=失败
-
-
-
- Rsp_Cd=00000
- Rsp_Msg=成功
+
+ Rsp_Cd=20499
+ Rsp_Msg=失败
+
+
+
+ Rsp_Cd=00000
+ Rsp_Msg=成功
+
+
+
- RPT_TYP=D
-
-
+
+
+ FILE_NAME=$RPTNAME
+
+
+
+
+ RPT_FIL_URL=$OUT_DAT.FILE_URL
+
+
+
+
+
+
+
+ RPT_TYP=D
+
diff --git a/cap/etc/OCAPRPT2/204073_CTL.XML b/cap/etc/OCAPRPT2/204073_CTL.XML
index 49659ad..0f12d0e 100644
--- a/cap/etc/OCAPRPT2/204073_CTL.XML
+++ b/cap/etc/OCAPRPT2/204073_CTL.XML
@@ -1,60 +1,75 @@
-
-
-
- AC_DT=$GWA.AC_DT
+
+
+
+ AC_DT=GETDATE()
-
-
-
-
- END_DT=$END_DT
-
-
- END_DT=CALCDATE($AC_DT,-,d,1)
-
-
-
-
-
-
- STAT_DT=$STAT_DT
-
-
- STAT_DT=CALCDATE($END_DT,-,d,6)
-
-
+
+
+
+
+ END_DT=$END_DT
+
+
+ END_DT=CALCDATE($AC_DT,-,d,1)
+
- RPT_KND=RPT_D_003
- raqname=STRCAT($RPT_KND,-,$AC_DT,.xls)
- WORKDIR=GETENV(HWORKDIR)
- CR_RPT_FILE=STRCAT($WORKDIR,/app/cap/etc/OCAPRPT2/RPT_D_003.raq)
- RPTNAME=STRCAT($WORKDIR,/ejbs/capbui/rptdata/,$raqname)
-
- RPT_FIL_NM=STRCAT("交易失败原因统计-",FMTDATE($AC_DT,0,5),.xls)
+
+
+
+
+ STAT_DT=$STAT_DT
+
+
+ STAT_DT=CALCDATE($END_DT,-,d,6)
+
-
-
-
-
-
-
-
- Rsp_Cd=20499
- Rsp_Msg=失败
-
-
-
- Rsp_Cd=00000
- Rsp_Msg=成功
+ RPT_KND=RPT_D_003
+ raqname=STRCAT($RPT_KND,-,$AC_DT,.xls)
+ WORKDIR=GETENV(HWORKDIR)
+ CR_RPT_FILE=STRCAT($WORKDIR,/app/cap/etc/OCAPRPT2/RPT_D_003.raq)
+ RPTNAME=STRCAT($WORKDIR,/ejbs/capbui/rptdata/,$raqname)
- RPT_TYP=D
-
+ RPT_FIL_NM=STRCAT("交易失败原因统计-",FMTDATE($AC_DT,0,5),.xls)
-
-
-
+
+
+
+
+
+
+
+
+ Rsp_Cd=20499
+ Rsp_Msg=失败
+
+
+
+ Rsp_Cd=00000
+ Rsp_Msg=成功
+
+
+
+
+
+ FILE_NAME=$RPTNAME
+
+
+
+
+ RPT_FIL_URL=$OUT_DAT.FILE_URL
+
+
+
+
+
+
+
+ RPT_TYP=D
+
+
+
-
+
diff --git a/cap/etc/OCAPRPT2/RPT_D_001.raq b/cap/etc/OCAPRPT2/RPT_D_001.raq
index 9fc92c7..f1a3d17 100644
Binary files a/cap/etc/OCAPRPT2/RPT_D_001.raq and b/cap/etc/OCAPRPT2/RPT_D_001.raq differ
diff --git a/cap/etc/OCAPRPT2/RPT_D_002.raq b/cap/etc/OCAPRPT2/RPT_D_002.raq
index 28556f6..e3cf847 100644
Binary files a/cap/etc/OCAPRPT2/RPT_D_002.raq and b/cap/etc/OCAPRPT2/RPT_D_002.raq differ
diff --git a/cap/etc/OCAPRPT2/RPT_D_003.raq b/cap/etc/OCAPRPT2/RPT_D_003.raq
index 5c3c1c0..2414221 100644
Binary files a/cap/etc/OCAPRPT2/RPT_D_003.raq and b/cap/etc/OCAPRPT2/RPT_D_003.raq differ
diff --git a/cap/etc/OCAPRPT2/UPLOAD_FILE_PKG.XML b/cap/etc/OCAPRPT2/UPLOAD_FILE_PKG.XML
new file mode 100644
index 0000000..4b6c679
--- /dev/null
+++ b/cap/etc/OCAPRPT2/UPLOAD_FILE_PKG.XML
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+ select P_VALUES TOKEN FROM CAPPARAMTER where P_KEY = 'FIL_TOKEN'
+
+ |
+
+
+
+ select P_VALUES URL FROM CAPPARAMTER where P_KEY = 'FIL_TOKEN_URL'
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ FILE_URL=STRCAT($URL,/file/download/,$OUT_DAT.FILE_ID,?token=,$TOKEN)
+ OUT_DAT.FILE_URL=$FILE_URL
+
+
+
+
+
+
+
+
diff --git a/cap/etc/OCAPRPT2_CTL.XML b/cap/etc/OCAPRPT2_CTL.XML
index 30d99ac..916cea1 100644
--- a/cap/etc/OCAPRPT2_CTL.XML
+++ b/cap/etc/OCAPRPT2_CTL.XML
@@ -6,9 +6,9 @@
- INSERT INTO CMMTRPTREG (RPT_DAT,RPT_TYP,RPT_KND,RPT_FIL,RPT_FIL_NM) VALUES('%s','%s','%s','%s','%s')
+ INSERT INTO CMMTRPTREG (RPT_DAT,RPT_TYP,RPT_KND,RPT_FIL,RPT_FIL_NM,RPT_FIL_URL) VALUES('%s','%s','%s','%s','%s','%s')
- RPT_DAT|RPT_TYP|RPT_KND|RPT_FIL|RPT_FIL_NM|
+ RPT_DAT|RPT_TYP|RPT_KND|RPT_FIL|RPT_FIL_NM|RPT_FIL_URL|
@@ -19,7 +19,7 @@
- RPT_DAT=$GWA.AC_DT
+ RPT_DAT=GETDATE()
RPT_KND=$RPT_KND
RPT_FIL=$raqname
@@ -32,14 +32,14 @@
-
+
-
+
@@ -47,6 +47,14 @@
+
+
+
+
+
+
+
+
@@ -56,4 +64,5 @@
+