Skip to content

B
business-java
Commit 71dfc042 authored by steurwadkar's avatar steurwadkar
Browse files
Options

F17ABAS001 GST source code commit for new token 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@171393 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 31979a05
Expand all Show whitespace changes
Inline Side-by-side
Showing with 97 additions and 36 deletions
webitm-gst/ibase/webitm/ejb/gst/GSTDataSubmitWizEJB.java
View file @ 71dfc042
...@@ -80,10 +80,12 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -80,10 +80,12 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
private String clientSecret = ""; private String clientSecret = "";
private String fileDownloadDir = ""; private String fileDownloadDir = "";
private String saveFilePath = ""; private String saveFilePath = "";
private String gspTokenTimeStampFormat = "";
AESEncryption aesEncryption = null; AESEncryption aesEncryption = null;
PubKeyEncryption pubKeyEncryption = null; PubKeyEncryption pubKeyEncryption = null;
GSPSignature gspSignature; GSPSignature gspSignature;
PrivateKey aspPrivateKey = null; PrivateKey aspPrivateKey = null;
SimpleDateFormat gspTokenTimeFormatter = null;
GSTCommonUtil gstCommonUtil = new GSTCommonUtil(); GSTCommonUtil gstCommonUtil = new GSTCommonUtil();
E12GenericUtility e12GenericUtility = new E12GenericUtility(); E12GenericUtility e12GenericUtility = new E12GenericUtility();
...@@ -114,6 +116,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -114,6 +116,8 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
clientId = finCommon.getFinparams("999999", "GST_CLIENT_ID", conn); clientId = finCommon.getFinparams("999999", "GST_CLIENT_ID", conn);
clientSecret = finCommon.getFinparams("999999", "GST_CLIENT_SECRET", conn); clientSecret = finCommon.getFinparams("999999", "GST_CLIENT_SECRET", conn);
fileDownloadDir = finCommon.getFinparams("999999", "GST_DOWNLOAD_DIR", conn); fileDownloadDir = finCommon.getFinparams("999999", "GST_DOWNLOAD_DIR", conn);
gspTokenTimeStampFormat = finCommon.getFinparams("999999", "GSP_TKN_TIMSTMP_FRMT", conn);
gspTokenTimeFormatter = new SimpleDateFormat(gspTokenTimeStampFormat);
aesEncryption = new AESEncryption(); aesEncryption = new AESEncryption();
pubKeyEncryption = new PubKeyEncryption(pubKeyInpStream); pubKeyEncryption = new PubKeyEncryption(pubKeyInpStream);
ipAddress = sc.next(); ipAddress = sc.next();
...@@ -354,7 +358,6 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -354,7 +358,6 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
{ {
String otp = "", transactionId = "", authToken = "", sek = "", retXML = "", errorXML = "", errMsg = "", returnType = "", action = ""; String otp = "", transactionId = "", authToken = "", sek = "", retXML = "", errorXML = "", errMsg = "", returnType = "", action = "";
String gspAuthString = "", gspAuthSignature = ""; String gspAuthString = "", gspAuthSignature = "";
long timeStamp = new Timestamp().getDateTime();
byte[] authSEK = null; byte[] authSEK = null;
String loginCode = "", chgTerm = "", callStatus = "", responseId = "", responseJsonStr= "", recType = ""; String loginCode = "", chgTerm = "", callStatus = "", responseId = "", responseJsonStr= "", recType = "";
String signDataXML = "", summaryDataJsonStr = ""; String signDataXML = "", summaryDataJsonStr = "";
...@@ -449,7 +452,10 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -449,7 +452,10 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
transactionId = UUID.randomUUID().toString().replaceAll("-", ""); transactionId = UUID.randomUUID().toString().replaceAll("-", "");
gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstinNo; //Changed by Santosh on 03/10/2017 as per new GSP token format
//gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstinNo;
String timeStamp = gspTokenTimeFormatter.format(new Date());
gspAuthString = "v2.0::"+clientId + ":" + transactionId + ":" + timeStamp + ":" + gstinNo + ":" + "AUTHTOKEN";
gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey); gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey);
otp = checkNull(e12GenericUtility.getColumnValue("otp", dom1)); otp = checkNull(e12GenericUtility.getColumnValue("otp", dom1));
...@@ -1183,7 +1189,6 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1183,7 +1189,6 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
String userName = "", stateCode = "", gspAuthString = "", gspAuthSignature = "", gstinNo = "", periodCode = "", siteCode = "", recType = "", recordType = ""; String userName = "", stateCode = "", gspAuthString = "", gspAuthSignature = "", gstinNo = "", periodCode = "", siteCode = "", recType = "", recordType = "";
String responseId = "", responseJsonStr = "", callStatus = ""; String responseId = "", responseJsonStr = "", callStatus = "";
String transactionId = UUID.randomUUID().toString().replaceAll("-", ""); String transactionId = UUID.randomUUID().toString().replaceAll("-", "");
long timeStamp = new Timestamp().getDateTime();
if("NULLFOUND".equalsIgnoreCase(clientId) || "NULLFOUND".equalsIgnoreCase(clientSecret)) if("NULLFOUND".equalsIgnoreCase(clientId) || "NULLFOUND".equalsIgnoreCase(clientSecret))
{ {
...@@ -1580,7 +1585,10 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1580,7 +1585,10 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
if(!isDataError) if(!isDataError)
{ {
gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstinNo; //Changed by Santosh on 03/10/2017 as per new GSP token format
//gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstinNo;
String timeStamp = gspTokenTimeFormatter.format(new Date());
gspAuthString = "v2.0::"+clientId + ":" + transactionId + ":" + timeStamp + ":" + gstinNo + ":" + "OTPREQUEST";
gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey); gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey);
JSONObject otpRequest = new JSONObject(); JSONObject otpRequest = new JSONObject();
...@@ -1837,11 +1845,14 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -1837,11 +1845,14 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
{ {
if(byPassSectionList != null && !byPassSectionList.contains(action)) if(byPassSectionList != null && !byPassSectionList.contains(action))
{ {
long timeStamp = new Timestamp().getDateTime(); //long timeStamp = new Timestamp().getDateTime();
System.out.println("calling for ["+action+"]"); System.out.println("calling for ["+action+"]");
String transactionId = UUID.randomUUID().toString().replaceAll("-", ""); String transactionId = UUID.randomUUID().toString().replaceAll("-", "");
gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstinNo; //Changed by Santosh on 03/10/2017 as per new GSP token format
//gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstinNo;
String timeStamp = gspTokenTimeFormatter.format(new Date());
gspAuthString = "v2.0::"+clientId + ":" + transactionId + ":" + timeStamp + ":" + gstinNo + ":" + action;
gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey); gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey);
HttpRequest getDataReq = Unirest.get(String.format("%s%s", BASE_API_URL, GSTR1_URL)) HttpRequest getDataReq = Unirest.get(String.format("%s%s", BASE_API_URL, GSTR1_URL))
...@@ -2031,11 +2042,14 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -2031,11 +2042,14 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
{ {
if(byPassSectionList != null && !byPassSectionList.contains(action)) if(byPassSectionList != null && !byPassSectionList.contains(action))
{ {
long timeStamp = new Timestamp().getDateTime(); //long timeStamp = new Timestamp().getDateTime();
System.out.println("calling for ["+action+"]"); System.out.println("calling for ["+action+"]");
String transactionId = UUID.randomUUID().toString().replaceAll("-", ""); String transactionId = UUID.randomUUID().toString().replaceAll("-", "");
gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstinNo; //Changed by Santosh on 03/10/2017 as per new GSP token format
//gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstinNo;
String timeStamp = gspTokenTimeFormatter.format(new Date());
gspAuthString = "v2.0::"+clientId + ":" + transactionId + ":" + timeStamp + ":" + gstinNo + ":" + action;
gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey); gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey);
HttpRequest getDataReq = Unirest.get(String.format("%s%s", BASE_API_URL,GSTR2_URL)) HttpRequest getDataReq = Unirest.get(String.format("%s%s", BASE_API_URL,GSTR2_URL))
...@@ -2225,8 +2239,11 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -2225,8 +2239,11 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
loginCode = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"); loginCode = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
chgTerm = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "chgTerm"); chgTerm = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "chgTerm");
long timeStamp = new Timestamp().getDateTime(); //Changed by Santosh on 03/10/2017 as per new GSP token format
gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstin; //long timeStamp = new Timestamp().getDateTime();
//gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstin;
String timeStamp = gspTokenTimeFormatter.format(new Date());
gspAuthString = "v2.0::"+clientId + ":" + transactionId + ":" + timeStamp + ":" + gstin + ":" + "RETSUM";
gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey); gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey);
HttpRequest getGstr1SumryReq = Unirest.get(String.format("%s%s", BASE_API_URL, GSTR1_URL)) HttpRequest getGstr1SumryReq = Unirest.get(String.format("%s%s", BASE_API_URL, GSTR1_URL))
...@@ -2343,8 +2360,11 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -2343,8 +2360,11 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
loginCode = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"); loginCode = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
chgTerm = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "chgTerm"); chgTerm = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "chgTerm");
long timeStamp = new Timestamp().getDateTime(); //Changed by Santosh on 03/10/2017 as per new GSP token format
gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstin; //long timeStamp = new Timestamp().getDateTime();
//gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstin;
String timeStamp = gspTokenTimeFormatter.format(new Date());
gspAuthString = "v2.0::"+clientId + ":" + transactionId + ":" + timeStamp + ":" + gstin + ":" + "RETSUM";
gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey); gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey);
HttpRequest getGstr2SumryReq = Unirest.get(String.format("%s%s", BASE_API_URL, GSTR2_URL)) HttpRequest getGstr2SumryReq = Unirest.get(String.format("%s%s", BASE_API_URL, GSTR2_URL))
...@@ -2461,8 +2481,11 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -2461,8 +2481,11 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
loginCode = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"); loginCode = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
chgTerm = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "chgTerm"); chgTerm = e12GenericUtility.getValueFromXTRA_PARAMS(xtraParams, "chgTerm");
long timeStamp = new Timestamp().getDateTime(); //Changed by Santosh on 03/10/2017 as per new GSP token format
gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstin; //long timeStamp = new Timestamp().getDateTime();
//gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstin;
String timeStamp = gspTokenTimeFormatter.format(new Date());
gspAuthString = "v2.0::"+clientId + ":" + transactionId + ":" + timeStamp + ":" + gstin + ":" + "RETSUM";
gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey); gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey);
HttpRequest getGstr3bSumryReq = Unirest.get(String.format("%s%s", BASE_API_URL, GSTR3B_URL)) HttpRequest getGstr3bSumryReq = Unirest.get(String.format("%s%s", BASE_API_URL, GSTR3B_URL))
...@@ -3058,8 +3081,11 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi ...@@ -3058,8 +3081,11 @@ public class GSTDataSubmitWizEJB extends ValidatorEJB implements GSTDataSubmitWi
} }
transactionId = UUID.randomUUID().toString().replaceAll("-", ""); transactionId = UUID.randomUUID().toString().replaceAll("-", "");
long timeStamp = new Timestamp().getDateTime(); //Changed by Santosh on 03/10/2017 as per new GSP token format
gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstin; //long timeStamp = new Timestamp().getDateTime();
//gspAuthString = clientId + ":" + transactionId + ":" + timeStamp + ":" + gstin;
String timeStamp = gspTokenTimeFormatter.format(new Date());
gspAuthString = "v2.0::"+clientId + ":" + transactionId + ":" + timeStamp + ":" + gstin + ":" + "FILEDET";
gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey); gspAuthSignature = gspSignature.sign(gspAuthString, aspPrivateKey);
HttpRequest fileDetailsReq = Unirest.get(String.format("%s%s", BASE_API_URL, GSTR_RETSTAT_URL)) HttpRequest fileDetailsReq = Unirest.get(String.format("%s%s", BASE_API_URL, GSTR_RETSTAT_URL))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment