diff --git a/frontend-new/src/api/remoteApi/remoteApi.js b/frontend-new/src/api/remoteApi/remoteApi.js index c727f550..1eea4396 100644 --- a/frontend-new/src/api/remoteApi/remoteApi.js +++ b/frontend-new/src/api/remoteApi/remoteApi.js @@ -16,7 +16,7 @@ */ const appConfig = { - apiBaseUrl: 'http://localhost:8082' + apiBaseUrl: '' }; let _redirectHandler = null; @@ -70,7 +70,7 @@ const remoteApi = { console.log(csrfToken) if (!csrfToken) { console.warn('CSRF Token not found'); - }else{ + } else { headers["X-XSRF-TOKEN"] = csrfToken; } console.log(csrfToken) @@ -90,7 +90,7 @@ const remoteApi = { return {__isRedirectHandled: true}; } - if(response.status == 403){ + if (response.status == 403) { window.localStorage.removeItem("csrfToken"); console.log(111) await remoteApi.getCsrfToken() @@ -823,9 +823,15 @@ const remoteApi = { queryBrokerHisData: async (date, callback) => { try { - const url = new URL(remoteApi.buildUrl('/dashboard/broker.query')); - url.searchParams.append('date', date); - const response = await remoteApi._fetch(url.toString(), {signal: AbortSignal.timeout(15000)}); // 15s timeout + let url = remoteApi.buildUrl('/dashboard/broker.query'); + // 添加查询参数 + if (url.includes('?')) { + url += '&date=' + date; + } else { + url += '?date=' + date; + } + + const response = await remoteApi._fetch(url, {signal: AbortSignal.timeout(15000)}); const data = await response.json(); callback(data); } catch (error) { @@ -839,11 +845,14 @@ const remoteApi = { } }, + queryTopicHisData: async (date, topicName, callback) => { try { - const url = new URL(remoteApi.buildUrl('/dashboard/topic.query')); - url.searchParams.append('date', date); - url.searchParams.append('topicName', topicName); + let url = remoteApi.buildUrl('/dashboard/topic.query'); + // 添加查询参数 + const separator = url.includes('?') ? '&' : '?'; + url += `${separator}date=${encodeURIComponent(date)}&topicName=${encodeURIComponent(topicName)}`; + const response = await remoteApi._fetch(url.toString(), {signal: AbortSignal.timeout(15000)}); // 15s timeout const data = await response.json(); callback(data); @@ -876,8 +885,11 @@ const remoteApi = { queryBrokerConfig: async (brokerAddr, callback) => { try { - const url = new URL(remoteApi.buildUrl('/cluster/brokerConfig.query')); - url.searchParams.append('brokerAddr', brokerAddr); + let url = remoteApi.buildUrl('/cluster/brokerConfig.query'); + // 添加查询参数 + const separator = url.includes('?') ? '&' : '?'; + url += `${separator}brokerAddr=${encodeURIComponent(brokerAddr)}`; + const response = await remoteApi._fetch(url.toString()); const data = await response.json(); callback(data); diff --git a/src/main/java/org/apache/rocketmq/dashboard/config/SecurityConfig.java b/src/main/java/org/apache/rocketmq/dashboard/config/SecurityConfig.java index f729f94f..c9f9b2ee 100644 --- a/src/main/java/org/apache/rocketmq/dashboard/config/SecurityConfig.java +++ b/src/main/java/org/apache/rocketmq/dashboard/config/SecurityConfig.java @@ -57,7 +57,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti @Bean public CorsConfigurationSource corsConfigurationSource() { CorsConfiguration configuration = new CorsConfiguration(); - configuration.setAllowedOrigins(Arrays.asList("http://localhost:3003")); + configuration.setAllowedOriginPatterns(Arrays.asList("*")); configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE", "OPTIONS")); configuration.setAllowedHeaders(Arrays.asList("content-type", "Authorization", "X-Requested-With", "Origin", "Accept", "X-XSRF-TOKEN")); configuration.setAllowCredentials(true); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 2e891d57..39c1d5b0 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -53,7 +53,7 @@ rocketmq: # if this value is empty,use env value rocketmq.config.namesrvAddr NAMESRV_ADDR | now, default localhost:9876 # configure multiple namesrv addresses to manage multiple different clusters namesrvAddrs: - - 127.0.0.1:9876 +# - 127.0.0.1:9876 # - 127.0.0.2:9876 # - 10.151.47.32:9876;10.151.47.33:9876;10.151.47.34:9876 # - 10.151.47.30:9876