Merge remote-tracking branch 'shucheng/mk'

# 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

blade-service/blade-system/src/main/java/org/springblade/system/SystemApplication.java

@@ -28,15 +28,18 @@ package org.springblade.system;
 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;
 
 /**
  * 系统模块启动器
  * @author Chill
  */
+@ComponentScan(basePackages = {"org.springblade.system", "org.springblade.process"})
 @BladeCloudApplication
 public class SystemApplication {
 
 	public static void main(String[] args) {
+		BladeApplication.disableNacosLaunchConfig();
 		BladeApplication.run(AppConstant.APPLICATION_SYSTEM_NAME, SystemApplication.class, args);
 	}