启动类bug修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -379,8 +379,6 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     @Value("${equipment.pressurepump.start}")
     private String pressurePumpStart;
 
-    @Value("${auth-key-auth-enabled:}")
-    private String authKey;
 
     private StockBill buildStockBills(EquipmentSpecific equipmentSpecific, ReginParams reginParams, AgencyUserModel agencyUserModel) {
         StockBill stockBill = new StockBill();

amos-boot-system-ccs/src/main/java/com/yeejoin/amos/AmoCCSApplication.java

@@ -49,9 +49,8 @@ public class AmoCCSApplication {
         environment.getPropertySources().addFirst(new MapPropertySource("securityRandomSource",
                 Collections.singletonMap("security-random-int", randomClientId)));
         application.setEnvironment(environment);
-        ConfigurableApplicationContext context = SpringApplication.run(AmoCCSApplication.class, args);
-        Environment env = context.getEnvironment();
-        String appName = env.getProperty("spring.application.name");
+        application.run();
+        String appName = environment.getProperty("spring.application.name");
         logger.info(
                 "\n----------------------------------------------------------\n\t"
                         + "Application {} is running!\n"

amos-boot-system-equip/src/main/java/com/yeejoin/AmostEquipApplication.java

@@ -40,16 +40,16 @@ import java.util.Collections;
 @EnableConfigurationProperties
 @EnableDiscoveryClient
 @MapperScan({ "org.typroject.tyboot.demo.face.orm.dao*", "org.typroject.tyboot.face.*.orm.dao*",
-	"org.typroject.tyboot.core.auth.face.orm.dao*", "org.typroject.tyboot.component.*.face.orm.dao*",
-	"com.yeejoin.amos.boot.module.*.api.mapper", "com.yeejoin.amos.boot.biz.common.dao.mapper",
-	"com.yeejoin.equipmanage.mapper"})
+		"org.typroject.tyboot.core.auth.face.orm.dao*", "org.typroject.tyboot.component.*.face.orm.dao*",
+		"com.yeejoin.amos.boot.module.*.api.mapper", "com.yeejoin.amos.boot.biz.common.dao.mapper",
+		"com.yeejoin.equipmanage.mapper"})
 @ComponentScan(value = {"org.typroject", "com.yeejoin.amos", "com.yeejoin.equipmanage"}, excludeFilters = {
-        @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler.class})})
+		@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler.class})})
 @EnableFeignClients
 @EnableAsync(proxyTargetClass = true)
 public class AmostEquipApplication {
 
-    private static final Logger logger = LoggerFactory.getLogger(AmostEquipApplication.class);
+	private static final Logger logger = LoggerFactory.getLogger(AmostEquipApplication.class);
 	//是否走江西电建的车辆监听器，默认不走，如果在配置文件中添加了该配置且配置的值不为false
 	@Value("${jxiop.carIotNewListener.enable:false}")
 	private String jxiop;
@@ -63,17 +63,16 @@ public class AmostEquipApplication {
 	@Autowired
 	private CarIotNewListener carIotNewListener;
 
-    public static void main(String[] args) throws UnknownHostException {
+	public static void main(String[] args) throws UnknownHostException {
 		SpringApplication application = new SpringApplication(AmostEquipApplication.class);
 		ConfigurableEnvironment environment = new StandardEnvironment();
 		int randomClientId = new SecureRandom().nextInt(65536 - 1024) + 1024;
 		environment.getPropertySources().addFirst(new MapPropertySource("securityRandomSource",
 				Collections.singletonMap("security-random-int", randomClientId)));
 		application.setEnvironment(environment);
-		ConfigurableApplicationContext context = SpringApplication.run(AmostEquipApplication.class, args);
+		application.run();
+		String appName = environment.getProperty("spring.application.name");
 		GlobalExceptionHandler.setAlwaysOk(true);
-		Environment env = context.getEnvironment();
-		String appName = env.getProperty("spring.application.name");
 		logger.info(
 				"\n----------------------------------------------------------\n\t"
 						+ "Application {} is running!\n"

amos-boot-system-fas/src/main/java/com/yeejoin/amos/FireAutoSysApplication.java

@@ -79,10 +79,9 @@ public class FireAutoSysApplication implements ApplicationContextAware {
 				Collections.singletonMap("security-random-int", randomClientId)));
 		application.setEnvironment(environment);
 		    logger.info("start Service..........");
-			ConfigurableApplicationContext context = SpringApplication.run(FireAutoSysApplication.class, args);
-	        GlobalExceptionHandler.setAlwaysOk(true);
-		Environment env = context.getEnvironment();
-		String appName = env.getProperty("spring.application.name");
+		application.run();
+		String appName = environment.getProperty("spring.application.name");
+		GlobalExceptionHandler.setAlwaysOk(true);
 		logger.info(
 				"\n----------------------------------------------------------\n\t"
 						+ "Application {} is running!\n"

amos-boot-system-jcs/src/main/java/com/yeejoin/amos/AmosJcsApplication.java

@@ -58,10 +58,10 @@ public class AmosJcsApplication {
 		environment.getPropertySources().addFirst(new MapPropertySource("securityRandomSource",
 				Collections.singletonMap("security-random-int", randomClientId)));
 		application.setEnvironment(environment);
-		ConfigurableApplicationContext context = SpringApplication.run(AmosJcsApplication.class, args);
-		Environment env = context.getEnvironment();
-		delKey(env, context);// 添加全部清空redis缓存的方法 2021-09-09
-		String appName = env.getProperty("spring.application.name");
+		ConfigurableApplicationContext run = application.run();
+		String appName = environment.getProperty("spring.application.name");
+
+		delKey(environment, run);// 添加全部清空redis缓存的方法 2021-09-09
 		logger.info(
 				"\n----------------------------------------------------------\n\t"
 						+ "Application {} is running!\n"

amos-boot-system-knowledgebase/src/main/java/com/yeejoin/amos/KnowledgebaseApplication.java

@@ -48,10 +48,11 @@ public class KnowledgebaseApplication {
         environment.getPropertySources().addFirst(new MapPropertySource("securityRandomSource",
                 Collections.singletonMap("security-random-int", randomClientId)));
         application.setEnvironment(environment);
-    	ConfigurableApplicationContext context = new SpringApplicationBuilder(KnowledgebaseApplication.class).web(WebApplicationType.SERVLET).run(args);
+        ConfigurableApplicationContext run = application.run();
+        String appName = environment.getProperty("spring.application.name");
+
+//        ConfigurableApplicationContext context = new SpringApplicationBuilder(KnowledgebaseApplication.class).web(WebApplicationType.SERVLET).run(args);
         GlobalExceptionHandler.setAlwaysOk(true);
-        Environment env = context.getEnvironment();
-        String appName = env.getProperty("spring.application.name");
         logger.info(
                 "\n----------------------------------------------------------\n\t"
                         + "Application {} is running!\n"

amos-boot-system-latentdanger/src/main/java/com/yeejoin/amos/LatentDangerApplication.java

@@ -79,9 +79,8 @@ public class LatentDangerApplication {
         environment.getPropertySources().addFirst(new MapPropertySource("securityRandomSource",
                 Collections.singletonMap("security-random-int", randomClientId)));
         application.setEnvironment(environment);
-        ConfigurableApplicationContext context = SpringApplication.run(LatentDangerApplication.class, args);
-        Environment env = context.getEnvironment();
-        String appName = env.getProperty("spring.application.name");
+        application.run();
+        String appName = environment.getProperty("spring.application.name");
         logger.info(
                 "\n----------------------------------------------------------\n\t"
                         + "Application {} is running!\n"

amos-boot-system-maintenance/src/main/java/com/yeejoin/amos/MaintenanceApplication.java

@@ -77,10 +77,9 @@ public class MaintenanceApplication {
         environment.getPropertySources().addFirst(new MapPropertySource("securityRandomSource",
                 Collections.singletonMap("security-random-int", randomClientId)));
         application.setEnvironment(environment);
-        ConfigurableApplicationContext context = SpringApplication.run(MaintenanceApplication.class, args);
+        application.run();
         GlobalExceptionHandler.setAlwaysOk(true);
-        Environment env = context.getEnvironment();
-        String appName = env.getProperty("spring.application.name");
+        String appName = environment.getProperty("spring.application.name");
         logger.info(
                 "\n----------------------------------------------------------\n\t"
                         + "Application {} is running!\n"

amos-boot-system-patrol/src/main/java/com/yeejoin/amos/PatrolApplication.java

@@ -93,10 +93,9 @@ public class PatrolApplication {
         environment.getPropertySources().addFirst(new MapPropertySource("securityRandomSource",
                 Collections.singletonMap("security-random-int", randomClientId)));
         application.setEnvironment(environment);
-        ConfigurableApplicationContext context = SpringApplication.run(PatrolApplication.class, args);
+        application.run();
+        String appName = environment.getProperty("spring.application.name");
         GlobalExceptionHandler.setAlwaysOk(true);
-        Environment env = context.getEnvironment();
-        String appName = env.getProperty("spring.application.name");
         logger.info(
                 "\n----------------------------------------------------------\n\t"
                         + "Application {} is running!\n"

amos-boot-system-precontrol/src/main/java/com/yeejoin/amos/StartPrecontrolService.java

@@ -77,7 +77,7 @@ public class StartPrecontrolService {
 		environment.getPropertySources().addFirst(new MapPropertySource("securityRandomSource",
 				Collections.singletonMap("security-random-int", randomClientId)));
 		application.setEnvironment(environment);
-		SpringApplication.run(StartPrecontrolService.class, args).getEnvironment();
+		application.run();
 		log.info("swagger:--->http://localhost:8060/precontrol/swagger-ui.html");
 	}
 

amos-boot-system-supervision/src/main/java/com/yeejoin/amos/SupervisionApplication.java

@@ -83,10 +83,9 @@ public class SupervisionApplication {
         environment.getPropertySources().addFirst(new MapPropertySource("securityRandomSource",
                 Collections.singletonMap("security-random-int", randomClientId)));
         application.setEnvironment(environment);
-        ConfigurableApplicationContext context = SpringApplication.run(SupervisionApplication.class, args);
         GlobalExceptionHandler.setAlwaysOk(true);
-        Environment env = context.getEnvironment();
-        String appName = env.getProperty("spring.application.name");
+        application.run();
+        String appName = environment.getProperty("spring.application.name");
         logger.info(
                 "\n----------------------------------------------------------\n\t"
                         + "Application {} is running!\n"

amos-boot-utils/amos-boot-utils-message/src/main/java/com/yeejoin/amos/AmosBootUtilsMessageApplication.java

@@ -49,10 +49,8 @@ public class AmosBootUtilsMessageApplication {
         environment.getPropertySources().addFirst(new MapPropertySource("securityRandomSource",
                 Collections.singletonMap("security-random-int", randomClientId)));
         application.setEnvironment(environment);
-        ConfigurableApplicationContext context = SpringApplication.run(AmosBootUtilsMessageApplication.class, args);
-
-        Environment env = context.getEnvironment();
-        String appName = env.getProperty("spring.application.name");
+        application.run();
+        String appName = environment.getProperty("spring.application.name");
         logger.info(
                 "\n----------------------------------------------------------\n\t"
                         + "Application {} is running!\n"