修改内置运行容器

This commit is contained in:
haozq 2025-10-24 14:37:07 +08:00
parent 9ed655c16d
commit e851fb6399
4 changed files with 41 additions and 30 deletions

View File

@ -15,7 +15,16 @@
</description> </description>
<dependencies> <dependencies>
<!-- SpringCloud Alibaba Sentinel -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-datasource-nacos</artifactId>
</dependency>
<!-- SpringCloud Alibaba Nacos --> <!-- SpringCloud Alibaba Nacos -->
<dependency> <dependency>
<groupId>com.alibaba.cloud</groupId> <groupId>com.alibaba.cloud</groupId>
@ -31,6 +40,11 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- Common DataSource -->
<dependency>
<groupId>com.bonus</groupId>
<artifactId>common-datasource</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.cvicse.embedded</groupId> <groupId>com.cvicse.embedded</groupId>
@ -41,28 +55,21 @@
</dependency> </dependency>
<!-- 注册中心 --> <!-- 注册中心 -->
<!--排除nacos-->
<dependency> <dependency>
<groupId>com.alibaba.cloud</groupId> <groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId> <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
<!-- 排除 tomcat 依赖 -->
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!--排除nacos-->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
<!-- 排除 tomcat 依赖 -->
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- SpringCloud Alibaba Sentinel -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
</dependency>
<!-- SpringBoot Web --> <!-- SpringBoot Web -->
<dependency> <dependency>
@ -96,6 +103,9 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>2.6.2</version> <version>2.6.2</version>
<configuration>
<includeSystemScope>true</includeSystemScope>
</configuration>
<executions> <executions>
<execution> <execution>
<goals> <goals>

View File

@ -39,6 +39,12 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-gateway</artifactId> <artifactId>spring-cloud-starter-gateway</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- SpringCloud Alibaba Nacos --> <!-- SpringCloud Alibaba Nacos -->
@ -156,6 +162,9 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>2.6.2</version> <version>2.6.2</version>
<configuration>
<includeSystemScope>true</includeSystemScope>
</configuration>
<executions> <executions>
<execution> <execution>
<goals> <goals>

View File

@ -1,8 +1,11 @@
let DATA_URL="http://192.168.0.14:29110" let host=window.location.host;
var ctxPath = "http://192.168.0.14:29110/bmw" //数据ip地址
let DATA_URL=window.location.protocol+"//"+host;
var ctxPath = DATA_URL+"/bmw"
var currentHostname = window.location.hostname; var currentHostname = window.location.hostname;
// //测试 // //测试
// var loginPath = "http://" + currentHostname + ":9200"; // var loginPath = "http://" + currentHostname + ":9200";
// var systemPath = "http://" + currentHostname + ":1910"; // var systemPath = "http://" + currentHostname + ":1910";
@ -12,19 +15,10 @@ var fileUrl =DATA_URL+ "/file";
var planUrl = DATA_URL+ "/ynPlan"; var planUrl = DATA_URL+ "/ynPlan";
var oiPlanUrl = DATA_URL+ "/oiPlan"; var oiPlanUrl = DATA_URL+ "/oiPlan";
//112.29.103.165:1616
//正式环境
// var loginPath = "http://" + currentHostname + ":1616/auth";
// var systemPath = "http://" + currentHostname + ":1616/system";
// var filePath = "http://" + currentHostname + ":1616/file";
// var fileUrl = "http://" + currentHostname + ":1616/file";
// var planUrl = "http://" + currentHostname + ":1616/ynPlan";
// var oiPlanUrl = "http://" + currentHostname + ":1616/oiPlan";
//文件预览 //文件预览
// let filePreviewUrl = "http://192.168.0.14:8012/onlinePreview?url="; // let filePreviewUrl = "http://192.168.0.14:8012/onlinePreview?url=";
let filePreviewUrl = "http://" + currentHostname + ":8012/onlinePreview?url="; let filePreviewUrl = "http://" + currentHostname + ":8012/onlinePreview?url=";
function getContextPath() { function getContextPath() {
var pathName = document.location.pathname; var pathName = document.location.pathname;
var index = pathName.substr(1).indexOf("/"); var index = pathName.substr(1).indexOf("/");

View File

@ -109,8 +109,6 @@
contentType : "application/json; charset=utf-8", contentType : "application/json; charset=utf-8",
url : DATA_URL + '/auth/login', url : DATA_URL + '/auth/login',
data : JSON.stringify({ data : JSON.stringify({
// "username" : username,
// "password" : password,
"username" : encryptCBC(username), "username" : encryptCBC(username),
"password" : encryptCBC(password), "password" : encryptCBC(password),
"jwtToken" : jwtToken "jwtToken" : jwtToken