bonus
/
YnRealNameWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' 

# Conflicts:
#	gateway/src/main/resources/bootstrap.yml
#	modules/bmw/src/main/resources/static/js/publicJs.js
This commit is contained in:
haozq 2025-12-29 11:20:24 +08:00
parent a564cd0f4c b44cca031a
commit a60ebe3cb4
4 changed files with 46 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
gateway/src/main/java/com/bonus/gateway/config/ContextPathConfig.java
View File

@ -1,42 +1,42 @@
package com.bonus.gateway.config;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.web.ServerProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order;
import org.springframework.http.HttpStatus;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.web.server.ResponseStatusException;
import org.springframework.web.server.WebFilter;
/**
* @author HeiZi
*/
@Configuration
public class ContextPathConfig {
@Bean
@ConditionalOnProperty("server.servlet.context-path")
@Order(Ordered.HIGHEST_PRECEDENCE)
public WebFilter contextPathWebFilter(ServerProperties serverProperties){
String contextPath = serverProperties.getServlet().getContextPath();
return (serverWebExchange, webFilterChain) ->{
ServerHttpRequest request = serverWebExchange.getRequest();
String requestPath = request.getURI().getPath();
if(requestPath.contains(contextPath)){
String newPath = requestPath.replaceFirst(contextPath+"/", "");
ServerHttpRequest newRequest = request.mutate()
.path(newPath).build();
return webFilterChain.filter(serverWebExchange.mutate()
.request(newRequest)
.build()
);
}else {
throw new ResponseStatusException(HttpStatus.NOT_FOUND);
}
};
}
}
//package com.bonus.gateway.config;
//
//import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
//import org.springframework.boot.autoconfigure.web.ServerProperties;
//import org.springframework.context.annotation.Bean;
//import org.springframework.context.annotation.Configuration;
//import org.springframework.core.Ordered;
//import org.springframework.core.annotation.Order;
//import org.springframework.http.HttpStatus;
//import org.springframework.http.server.reactive.ServerHttpRequest;
//import org.springframework.web.server.ResponseStatusException;
//import org.springframework.web.server.WebFilter;
//
///**
// * @author HeiZi
// */
//@Configuration
//public class ContextPathConfig {
//
// @Bean
// @ConditionalOnProperty("server.servlet.context-path")
// @Order(Ordered.HIGHEST_PRECEDENCE)
// public WebFilter contextPathWebFilter(ServerProperties serverProperties){
// String contextPath = serverProperties.getServlet().getContextPath();
// return (serverWebExchange, webFilterChain) ->{
// ServerHttpRequest request = serverWebExchange.getRequest();
// String requestPath = request.getURI().getPath();
//
// if(requestPath.contains(contextPath)){
// String newPath = requestPath.replaceFirst(contextPath+"/", "");
// ServerHttpRequest newRequest = request.mutate()
// .path(newPath).build();
// return webFilterChain.filter(serverWebExchange.mutate()
// .request(newRequest)
// .build()
// );
// }else {
// throw new ResponseStatusException(HttpStatus.NOT_FOUND);
// }
// };
// }
//}

1
modules/bmw/src/main/resources/bootstrap.yml
View File

@ -16,7 +16,6 @@ server:
# servlet:
# context-path: /bmw
environment: @profiles.active@
## Spring
spring:

2
modules/bmw/src/main/resources/static/js/work/Salary/SalaryBookExport.js
View File

@ -130,7 +130,7 @@ function photoView(idNumber) {
}
function exportList(id) {
location.href = ctxPath + '/salaryBookFill/exportExamList?id='+ id;
location.href = ctxPath + '/salaryBookFill/exportExamList?id='+ id + '&token='+ localStorage.getItem("smz-token");
}
// 编辑按钮

2
modules/bmw/src/main/resources/static/js/work/Salary/SalaryBookFill.js
View File

@ -245,7 +245,7 @@ function dataEdit(idNumber) {
function exportList(id) {
location.href = ctxPath + '/salaryBookFill/exportExamList?id='+ id;
location.href = ctxPath + '/salaryBookFill/exportExamList?id='+ id + '&token='+ localStorage.getItem("smz-token");
}
function submit(id) {