b2894lxlx/tms-erp-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'shucheng/mk'

Browse Source 
# Conflicts:
#	blade-service-api/blade-open-api/src/main/java/org/springblade/openapi/mk/api/IApi4MK.java
#	blade-service-api/pom.xml
#	blade-service/blade-file/src/main/java/org/springblade/file/FileApplication.java
#	blade-service/blade-file/src/main/resources/bootstrap.yml
#	blade-service/blade-openapi/src/main/java/org/springblade/openapi/OpenApiApplication.java
#	blade-service/blade-openapi/src/main/resources/bootstrap.yml
#	pom.xml
This commit is contained in:
b2894lxlx
2026-08-15 12:16:05 +08:00
parent 1ca36ae153 4de1d35c2c
commit 98cd7ba4cf
77 changed files with 5134 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blade-service/blade-file/src/main/java/org/springblade/file/FileApplication.java
+4 -1
View File
@@ -27,6 +27,7 @@ package org.springblade.file;
import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication;
import org.springblade.core.launch.constant.AppConstant;
import org.springframework.context.annotation.ComponentScan;
/**
@@ -39,7 +40,9 @@ import org.springframework.context.annotation.ComponentScan;
public class FileApplication {
public static void main(String[] args) {
BladeApplication.run("blade-file", FileApplication.class, args);
BladeApplication.disableNacosLaunchConfig();
BladeApplication.run(AppConstant.APPLICATION_FILE_NAME, FileApplication.class, args);
}
}