springboot admin

amos-boot-module/amos-boot-module-biz/amos-boot-module-avic-biz/pom.xml

@@ -26,13 +26,13 @@
 		<dependency>
 			<groupId>com.yeejoin</groupId>
 			<artifactId>indicators-feign</artifactId>
-			<version>1.0.4-SNAPSHOT</version>
+			<version>1.0.11</version>
 		</dependency>
 		
 		<dependency>
 			<groupId>com.yeejoin</groupId>
 			<artifactId>amos-feign-systemctl</artifactId>
-			<version>1.7.3-SNAPSHOT</version>
+			<version>1.7.13-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/remote/RemoteSecurityService.java

@@ -9,7 +9,8 @@ import java.util.concurrent.TimeUnit;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.yeejoin.amos.component.authtoken.robot.AmosRequestContext;
+
+import com.yeejoin.amos.component.robot.AmosRequestContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/feign/RemoteSecurityService.java

@@ -9,7 +9,7 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import com.yeejoin.amos.component.authtoken.robot.AmosRequestContext;
+import com.yeejoin.amos.component.robot.AmosRequestContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/feign/RemoteSecurityService.java

@@ -10,7 +10,7 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import com.yeejoin.amos.component.authtoken.robot.AmosRequestContext;
+import com.yeejoin.amos.component.robot.AmosRequestContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/feign/RemoteSecurityService.java

@@ -11,7 +11,7 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import com.yeejoin.amos.component.authtoken.robot.AmosRequestContext;
+import com.yeejoin.amos.component.robot.AmosRequestContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/feign/RemoteSecurityService.java

@@ -11,7 +11,7 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import com.yeejoin.amos.component.authtoken.robot.AmosRequestContext;
+import com.yeejoin.amos.component.robot.AmosRequestContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/feign/RemoteSecurityService.java

@@ -11,7 +11,8 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import com.yeejoin.amos.component.authtoken.robot.AmosRequestContext;
+
+import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.systemctl.model.MessageModel;
 import com.yeejoin.amos.supervision.business.feign.JCSFeignClient;
 import com.yeejoin.amos.supervision.common.remote.IAMOSSecurityServer;

amos-boot-module/pom.xml

@@ -36,8 +36,9 @@
 
 		<!--平台用户登录-->
 		<dependency>
+
 			<groupId>com.yeejoin</groupId>
-			<artifactId>amos-component-authtoken</artifactId>
+			<artifactId>amos-component-security</artifactId>
 			<version>1.7.13-SNAPSHOT</version>
 		</dependency>
 

amos-boot-system-jcs/src/main/resources/application.properties

@@ -76,6 +76,9 @@ mqtt.topic.command.knowledgebase.alert.match=knowledgeAlertMatch
 #航空报警器警情通知
 mqtt.topic.command.alert.noticeAviation=aviationAlarm
 
+
+mqtt.topic.command.car.jw=carCoordinates
+
 #人员打卡同步数据
 mqtt.topic.person.sign=sign/data/syn
 
@@ -129,10 +132,12 @@ knife4j.basic.enable=true
 knife4j.basic.username= admin
 knife4j.basic.password= yeejoin@2020
 
-management.security.enabled=true
-endpoints.enabled=false
-endpoints.health.enabled=true
-management.endpoint.health.show-details=always
-management.endpoints.web.exposure.include=*
 spring.security.user.name=admin
-spring.security.user.password=a1234560
\ No newline at end of file
+spring.security.user.password=a1234560
+spring.boot.admin.client.enabled=true
+spring.boot.admin.client.instance.metadata.user.name=${spring.security.user.name}
+spring.boot.admin.client.instance.metadata.user.password=${spring.security.user.password}
+spring.boot.admin.client.username=admin
+spring.boot.admin.client.password=a1234560
+management.security.enabled=false
+management.endpoints.web.exposure.include=*
\ No newline at end of file

amos-boot-utils/pom.xml

@@ -13,10 +13,18 @@
     <packaging>pom</packaging>
 
     <dependencies>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-security</artifactId>-->
+<!--        </dependency>-->
+
+        <!--平台用户登录-->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
+            <groupId>com.yeejoin</groupId>
+            <artifactId>amos-component-security</artifactId>
+            <version>1.7.13-SNAPSHOT</version>
         </dependency>
+
     </dependencies>