From 00046fbc9a1cfaefb69832fd4045672956c0e7e5 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Wed, 17 Sep 2025 16:57:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 105 ++++++++++-------- .../src/main/resources/static/js/publicJs.js | 7 +- .../basic/conf/ResourcesConfig.java | 54 ++++----- .../conf/ResourcesConfig.java | 68 ++++++------ .../oiPlan/src/main/resources/bootstrap.yml | 4 +- 5 files changed, 125 insertions(+), 113 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e6ebaf6..083d189 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,21 +4,13 @@ - + @@ -343,7 +349,8 @@ - diff --git a/modules/bmw/src/main/resources/static/js/publicJs.js b/modules/bmw/src/main/resources/static/js/publicJs.js index 5ba234b..becd081 100644 --- a/modules/bmw/src/main/resources/static/js/publicJs.js +++ b/modules/bmw/src/main/resources/static/js/publicJs.js @@ -1,9 +1,14 @@ //测试路径 - let IP_URL="http://192.168.0.14:9101/ynRealName" +let host=window.location.host; +let IP_URL="http://"+host+"/ynRealName"; +//let IP_URL="http://192.168.0.7:9101/ynRealName" //本地ip //let IP_URL="http://127.0.0.1:9101/ynRealName" var ctxPath = IP_URL+"/bmw"; var currentHostname = window.location.hostname; +var currentHostname2 = window.location.host; + +console.log(currentHostname+":"+currentHostname2) // //测试 // var loginPath = "http://" + currentHostname + ":9200"; diff --git a/modules/lineProtector/src/main/java/com/bonus/lineProtector/basic/conf/ResourcesConfig.java b/modules/lineProtector/src/main/java/com/bonus/lineProtector/basic/conf/ResourcesConfig.java index c292365..851c367 100644 --- a/modules/lineProtector/src/main/java/com/bonus/lineProtector/basic/conf/ResourcesConfig.java +++ b/modules/lineProtector/src/main/java/com/bonus/lineProtector/basic/conf/ResourcesConfig.java @@ -1,27 +1,27 @@ -package com.bonus.lineProtector.basic.conf; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.cors.CorsConfiguration; -import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -import org.springframework.web.filter.CorsFilter; - -/** - * 通用映射配置 - * - * @author ruoyi - */ - -@Configuration -public class ResourcesConfig { - @Bean - public CorsFilter corsFilter() { - UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); - CorsConfiguration config = new CorsConfiguration(); - config.addAllowedOrigin("*"); - config.addAllowedHeader("*"); - config.addAllowedMethod("*"); - source.registerCorsConfiguration("/**", config); - return new CorsFilter(source); - } -} +//package com.bonus.lineProtector.basic.conf; +// +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +//import org.springframework.web.cors.CorsConfiguration; +//import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +//import org.springframework.web.filter.CorsFilter; +// +///** +// * 通用映射配置 +// * +// * @author ruoyi +// */ +// +//@Configuration +//public class ResourcesConfig { +// @Bean +// public CorsFilter corsFilter() { +// UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); +// CorsConfiguration config = new CorsConfiguration(); +// config.addAllowedOrigin("*"); +// config.addAllowedHeader("*"); +// config.addAllowedMethod("*"); +// source.registerCorsConfiguration("/**", config); +// return new CorsFilter(source); +// } +//} diff --git a/modules/oiPlan/src/main/java/com/bonus/oiplan/basicDataManageMent/conf/ResourcesConfig.java b/modules/oiPlan/src/main/java/com/bonus/oiplan/basicDataManageMent/conf/ResourcesConfig.java index f8ec279..d8a42a4 100644 --- a/modules/oiPlan/src/main/java/com/bonus/oiplan/basicDataManageMent/conf/ResourcesConfig.java +++ b/modules/oiPlan/src/main/java/com/bonus/oiplan/basicDataManageMent/conf/ResourcesConfig.java @@ -1,34 +1,34 @@ -package com.bonus.oiplan.basicDataManageMent.conf; - -import java.io.File; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.cors.CorsConfiguration; -import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -import org.springframework.web.filter.CorsFilter; -import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -/** - * 通用映射配置 - * - * @author ruoyi - */ - -@Configuration -public class ResourcesConfig { - @Bean - public CorsFilter corsFilter() { - UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); - CorsConfiguration config = new CorsConfiguration(); - config.addAllowedOrigin("http://localhost:1911"); - config.addAllowedOrigin("http://localhost:1914"); - config.addAllowedHeader("*"); - config.addAllowedMethod("*"); - source.registerCorsConfiguration("/**", config); - return new CorsFilter(source); - } -} \ No newline at end of file +//package com.bonus.oiplan.basicDataManageMent.conf; +// +//import java.io.File; +// +//import org.springframework.beans.factory.annotation.Value; +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +//import org.springframework.web.cors.CorsConfiguration; +//import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +//import org.springframework.web.filter.CorsFilter; +//import org.springframework.web.servlet.config.annotation.CorsRegistry; +//import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +// +///** +// * 通用映射配置 +// * +// * @author ruoyi +// */ +// +//@Configuration +//public class ResourcesConfig { +// @Bean +// public CorsFilter corsFilter() { +// UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); +// CorsConfiguration config = new CorsConfiguration(); +// config.addAllowedOrigin("http://localhost:1911"); +// config.addAllowedOrigin("http://localhost:1914"); +// config.addAllowedHeader("*"); +// config.addAllowedMethod("*"); +// source.registerCorsConfiguration("/**", config); +// return new CorsFilter(source); +// } +//} \ No newline at end of file diff --git a/modules/oiPlan/src/main/resources/bootstrap.yml b/modules/oiPlan/src/main/resources/bootstrap.yml index 4cdb00c..9e3a70f 100644 --- a/modules/oiPlan/src/main/resources/bootstrap.yml +++ b/modules/oiPlan/src/main/resources/bootstrap.yml @@ -13,8 +13,8 @@ server: buffered: true requestAttributesEnabled: true port: 1914 - servlet: - context-path: /oiPlan +# servlet: +# context-path: /oiPlan # environment: @profiles.active@