Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-equip/pom.xml

@@ -15,6 +15,10 @@
 			<artifactId>amos-boot-module-equip-biz</artifactId>
 			<version>${amos-biz-boot.version}</version>
 		</dependency>
+      <dependency>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter-security</artifactId>
+      </dependency>
   </dependencies>
    <build>
         <plugins>

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

@@ -86,6 +86,9 @@ dcs.client.secret=fire_system
 dcs.x.hw.id=NR_REST_APP
 dcs.x.hw.appKey=s+YkvQhwilx91TRJHhNDmw==
 
+
+management.endpoints.enabled-by-default=false
+
 # 权限标识-物联区域
 auth-key-area=area_info
 # 权限标识-消防系统

amos-boot-system-equip/src/main/resources/mapper/VideoMapper.xml

@@ -111,7 +111,7 @@
                     GROUP BY id
                     order by v.create_date
                 </when>
-                <when test="dto.buildingId == null || dto.buildingId ==''">
+                <when test='dto.buildingId == null || dto.buildingId ==""'>
                  <where>
                     <if test="dto.bizOrgCode!=null and dto.bizOrgCode!=''">
                         v.biz_org_code LIKE CONCAT(#{dto.bizOrgCode}, '%')

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

@@ -29,6 +29,9 @@ spring.datasource.hikari.max-lifetime=120000
 spring.datasource.hikari.connection-timeout=30000
 spring.datasource.hikari.connection-test-query=SELECT 1
 
+
+
+
 ##liquibase
 spring.liquibase.change-log = classpath:/db/changelog/changelog-master.xml
 spring.liquibase.enabled= true
@@ -117,6 +120,7 @@ mybatis.interceptor.enabled = false
 ## 消防救援保障部ID
 fire-rescue=1432549862557130753
 
+management.endpoints.enabled-by-default=false
 #阿里云实时语音识别参数
 speech-config.access-key-id=LTAI5t62oH95jgbjRiNXPsho
 speech-config.access-key-secret=shy9SpogYgcdDoyTB3bvP21VSRmz8n

amos-boot-system-knowledgebase/pom.xml

@@ -15,7 +15,6 @@
 			<artifactId>amos-boot-module-knowledgebase-biz</artifactId>
 			<version>${amos-biz-boot.version}</version>
 		</dependency>
-
   </dependencies>
 
     <build>

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

@@ -20,4 +20,6 @@ mybatis-plus.type-aliases-super-type=org.typroject.tyboot.core.rdbms.orm.entity.
 mybatis-plus.global-config.db-config.id-type=id_worker
 mybatis-plus.mapper-locations=classpath:mapper/*
 ## redis失效时间
-redis.cache.failure.time=10800
+redis.cache.failure.time=10800
\ No newline at end of file
+
+management.endpoints.enabled-by-default=false

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

@@ -61,4 +61,7 @@ feign.httpclient.connection-timeout=5000
 
 video.fegin.name=video
 latentDanger.feign.name=AMOS-LATENT-DANGER
-Knowledgebase.fegin.name=AMOS-API-KNOWLEDGEBASE
+Knowledgebase.fegin.name=AMOS-API-KNOWLEDGEBASE
\ No newline at end of file
+## 消防救援保障部ID
+fire-rescue=1432549862557130753
+management.endpoints.enabled-by-default=false

amos-boot-system-maintenance/pom.xml

@@ -13,6 +13,7 @@
 		<artifactId>amos-boot-module-maintenance-biz</artifactId>
 		<version>${amos-biz-boot.version}</version>
      </dependency>
+
   </dependencies>
  <build>
         <plugins>

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

@@ -67,3 +67,4 @@ eureka.instance.metadata-map.management.context-path=${server.servlet.context-pa
 eureka.instance.status-page-url-path=/actuator/info
 eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/swagger-ui.html
 
+management.endpoints.enabled-by-default=false
\ No newline at end of file

amos-boot-system-patrol/pom.xml

@@ -16,6 +16,7 @@
 		<artifactId>amos-boot-module-patrol-biz</artifactId>
 		<version>${amos-biz-boot.version}</version>
 	</dependency>
+
   </dependencies>
  <build>
         <plugins>

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

@@ -56,4 +56,6 @@ rule.definition.model-package=com.yeejoin.amos.patrol.business.entity.mybatis
 rule.definition.default-agency=STATE_GRID
 
 jcs.fegin.name=JCS
-emergency.command.section.id=1418223840361709569
+emergency.command.section.id=1418223840361709569
\ No newline at end of file
+
+management.endpoints.enabled-by-default=false

amos-boot-system-supervision/pom.xml

@@ -33,6 +33,7 @@
 			<groupId>cn.jpush.api</groupId>
 			<artifactId>jpush-client</artifactId>
 		</dependency>
+
 	</dependencies>
 	<build>
 		<plugins>

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

@@ -73,3 +73,4 @@ eureka.instance.metadata-map.management.context-path=${server.servlet.context-pa
 eureka.instance.status-page-url-path=/actuator/info
 eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/swagger-ui.html
 
+management.endpoints.enabled-by-default=false
\ No newline at end of file