diff --git a/gateway/src/main/java/com/bonus/gateway/filter/AuthFilter.java b/gateway/src/main/java/com/bonus/gateway/filter/AuthFilter.java index 4669dbf..8dd0205 100644 --- a/gateway/src/main/java/com/bonus/gateway/filter/AuthFilter.java +++ b/gateway/src/main/java/com/bonus/gateway/filter/AuthFilter.java @@ -135,6 +135,9 @@ public class AuthFilter implements GlobalFilter, Ordered { token = token.replaceFirst(TokenConstants.PREFIX, StringUtils.EMPTY); } + if(token == null){ + token = request.getQueryParams().getFirst(TokenConstants.AUTHENTICATION); + } return token; } diff --git a/modules/bmw/src/main/resources/static/js/work/Person/certificateAdministration/certificateStatistics.js b/modules/bmw/src/main/resources/static/js/work/Person/certificateAdministration/certificateStatistics.js index 42849a1..912ee0a 100644 --- a/modules/bmw/src/main/resources/static/js/work/Person/certificateAdministration/certificateStatistics.js +++ b/modules/bmw/src/main/resources/static/js/work/Person/certificateAdministration/certificateStatistics.js @@ -387,7 +387,7 @@ function exportData() { var postId = $("#postType").val(); var certificatesState = $("#certificatesState").val(); var name = treeClickdData1; - window.location.href = ctxPath + "/certificateStat/exportOwnData?token=" + token + window.location.href = ctxPath + "/certificateStat/exportOwnData?Authorization=" + token + "&keyWord=" + keyWord + "&postId=" + postId + "&certificatesState=" + certificatesState + "&name=" + name; diff --git a/modules/bmw/src/main/resources/static/js/work/ProjectManage/projectGeneralManage.js b/modules/bmw/src/main/resources/static/js/work/ProjectManage/projectGeneralManage.js index 96fad66..c8223cf 100644 --- a/modules/bmw/src/main/resources/static/js/work/ProjectManage/projectGeneralManage.js +++ b/modules/bmw/src/main/resources/static/js/work/ProjectManage/projectGeneralManage.js @@ -281,7 +281,7 @@ function exportData() { var keyword = $("#keyword").val(); var level = $("#level").val(); var proStatusName = $("#proStatus").val(); - window.location.href = ctxPath + "/projectGeneral/exportData?token=" + token + window.location.href = ctxPath + "/projectGeneral/exportData?Authorization=" + token + "&keyword=" + keyword + "&level=" + level + "&proStatusName=" + proStatusName; diff --git a/modules/bmw/src/main/resources/static/js/work/SalaryStat/child/contractPerAttendanceDetial.js b/modules/bmw/src/main/resources/static/js/work/SalaryStat/child/contractPerAttendanceDetial.js index 69f5ac7..814fcea 100644 --- a/modules/bmw/src/main/resources/static/js/work/SalaryStat/child/contractPerAttendanceDetial.js +++ b/modules/bmw/src/main/resources/static/js/work/SalaryStat/child/contractPerAttendanceDetial.js @@ -175,7 +175,7 @@ function attendanceDetial() { } function exportData(){ - window.location.href = ctxPath + "/salaryStat/exportSubContractByWorkerAttData?token=" + token + window.location.href = ctxPath + "/salaryStat/exportSubContractByWorkerAttData?Authorization=" + token + "&subContractId=" + subContractId + "&payMonth=" + payMonth + "&idNumber=" + idNumber diff --git a/modules/bmw/src/main/resources/static/js/work/SalaryStat/child/contractPersonDetial.js b/modules/bmw/src/main/resources/static/js/work/SalaryStat/child/contractPersonDetial.js index de8ccbc..705d2f5 100644 --- a/modules/bmw/src/main/resources/static/js/work/SalaryStat/child/contractPersonDetial.js +++ b/modules/bmw/src/main/resources/static/js/work/SalaryStat/child/contractPersonDetial.js @@ -195,7 +195,7 @@ function salayView(salaryId) { } function exportData(){ - window.location.href = ctxPath + "/salaryStat/exportSubContractByWorkerData?token=" + token + window.location.href = ctxPath + "/salaryStat/exportSubContractByWorkerData?Authorization=" + token + "&subContractId=" + subContractId + "&payMonth=" + payMonth + "&NAME=" + $("#NAME").val() diff --git a/modules/bmw/src/main/resources/static/js/work/SalaryStat/child/perAttendanceDetial.js b/modules/bmw/src/main/resources/static/js/work/SalaryStat/child/perAttendanceDetial.js index 5da3cfa..0c23b6b 100644 --- a/modules/bmw/src/main/resources/static/js/work/SalaryStat/child/perAttendanceDetial.js +++ b/modules/bmw/src/main/resources/static/js/work/SalaryStat/child/perAttendanceDetial.js @@ -177,7 +177,7 @@ function attendanceDetial() { } function exportData() { - window.location.href = ctxPath + "/salaryStat/exportProData?token=" + token + window.location.href = ctxPath + "/salaryStat/exportProData?Authorization=" + token + "&type=2" + "&proId=" + proId + "&payMonth=" + payMonth diff --git a/modules/bmw/src/main/resources/static/js/work/SalaryStat/child/personDetial.js b/modules/bmw/src/main/resources/static/js/work/SalaryStat/child/personDetial.js index 5bbf062..c19cdc2 100644 --- a/modules/bmw/src/main/resources/static/js/work/SalaryStat/child/personDetial.js +++ b/modules/bmw/src/main/resources/static/js/work/SalaryStat/child/personDetial.js @@ -200,7 +200,7 @@ function salayView(salaryId) { function exportData() { let wages = $("#isGenerate").val(); - window.location.href = ctxPath + "/salaryStat/exportProData?token=" + token + window.location.href = ctxPath + "/salaryStat/exportProData?Authorization=" + token + "&type=1" + "&proId=" + proId + "&payMonth=" + payMonth diff --git a/modules/bmw/src/main/resources/static/js/work/SalaryStat/child/salaryRegister.js b/modules/bmw/src/main/resources/static/js/work/SalaryStat/child/salaryRegister.js index 5290b53..717f843 100644 --- a/modules/bmw/src/main/resources/static/js/work/SalaryStat/child/salaryRegister.js +++ b/modules/bmw/src/main/resources/static/js/work/SalaryStat/child/salaryRegister.js @@ -141,7 +141,7 @@ function salaryDetial(salaryId) { } function exportData(){ - window.location.href = ctxPath + "/salaryStat/exportSalaryListData?token=" + token + window.location.href = ctxPath + "/salaryStat/exportSalaryListData?Authorization=" + token + "&salaryId=" + salaryId + "&salaryName=" + $("#salaryName").val() + "&subName=" + $("#subName").val(); diff --git a/modules/bmw/src/main/resources/static/js/work/SalaryStat/salariedPersonnelStatistics.js b/modules/bmw/src/main/resources/static/js/work/SalaryStat/salariedPersonnelStatistics.js index 3c0d60f..0eef509 100644 --- a/modules/bmw/src/main/resources/static/js/work/SalaryStat/salariedPersonnelStatistics.js +++ b/modules/bmw/src/main/resources/static/js/work/SalaryStat/salariedPersonnelStatistics.js @@ -286,7 +286,7 @@ function exportData() { startMonth = time.split(" - ")[0]; endMonth = time.split(" - ")[1]; } - window.location.href = ctxPath + "/salaryStat/exportProData?token=" + token + window.location.href = ctxPath + "/salaryStat/exportProData?Authorization=" + token + "&type=0" + "&companyId=" + companyId + "&proName=" + proName @@ -295,7 +295,7 @@ function exportData() { } function exportData2(){ - window.location.href = ctxPath + "/salaryStat/exportSubContractData?token=" + token + window.location.href = ctxPath + "/salaryStat/exportSubContractData?Authorization=" + token + "&payMonth=" + $("#ID-laydate-more-value").val() + "&subName=" + $("#subName2").val() + "&proName=" + $("#proName2").val() diff --git a/modules/bmw/src/main/resources/static/js/work/SalaryStat/temporaryChild/perAttendanceDetial.js b/modules/bmw/src/main/resources/static/js/work/SalaryStat/temporaryChild/perAttendanceDetial.js index b58df58..159e87a 100644 --- a/modules/bmw/src/main/resources/static/js/work/SalaryStat/temporaryChild/perAttendanceDetial.js +++ b/modules/bmw/src/main/resources/static/js/work/SalaryStat/temporaryChild/perAttendanceDetial.js @@ -119,7 +119,7 @@ function init() { } function exportData() { - window.location.href = ctxPath + "/salaryStat/exportProData?token=" + token + window.location.href = ctxPath + "/salaryStat/exportProData?Authorization=" + token + "&type=2" + "&proId=" + proId + "&payMonth=" + payMonth diff --git a/modules/bmw/src/main/resources/static/js/work/SalaryStat/temporaryChild/personDetial.js b/modules/bmw/src/main/resources/static/js/work/SalaryStat/temporaryChild/personDetial.js index 87b788f..f5f201a 100644 --- a/modules/bmw/src/main/resources/static/js/work/SalaryStat/temporaryChild/personDetial.js +++ b/modules/bmw/src/main/resources/static/js/work/SalaryStat/temporaryChild/personDetial.js @@ -179,7 +179,7 @@ function salayView(salaryId) { } function exportData() { - window.location.href = ctxPath + "/salaryStat/exportTemporarySalaryPersonAttStatData?token=" + token + window.location.href = ctxPath + "/salaryStat/exportTemporarySalaryPersonAttStatData?Authorization=" + token + "&month=" + $("#month").val() + "&proId=" + $("#proId").val() + "&name=" + $("#name").val(); diff --git a/modules/bmw/src/main/resources/static/js/work/SalaryStat/temporaryChild/uploadFileDetial.js b/modules/bmw/src/main/resources/static/js/work/SalaryStat/temporaryChild/uploadFileDetial.js index 80be6f4..2fd2ce6 100644 --- a/modules/bmw/src/main/resources/static/js/work/SalaryStat/temporaryChild/uploadFileDetial.js +++ b/modules/bmw/src/main/resources/static/js/work/SalaryStat/temporaryChild/uploadFileDetial.js @@ -48,13 +48,13 @@ function exportData(type){ endMonth = time.split(" - ")[1]; } if(type === 1){ - window.location.href = ctxPath + "/salaryStat/exportTemporarySalaryByProData?token=" + token + window.location.href = ctxPath + "/salaryStat/exportTemporarySalaryByProData?Authorization=" + token + "&proId=" + $("#proId").val() + "&proName=" + $("#proName").val() + "&startMonth=" + startMonth + "&endMonth=" + endMonth; }else{ - window.location.href = ctxPath + "/salaryStat/exportTemporarySalaryVoucherFile?token=" + token + window.location.href = ctxPath + "/salaryStat/exportTemporarySalaryVoucherFile?Authorization=" + token + "&proId=" + $("#proId").val() + "&startMonth=" + startMonth + "&endMonth=" + endMonth;