增加公有数据字典类扫描

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyPlanServiceImpl.java

@@ -65,8 +65,8 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
     @Qualifier("contingencyAction")
     @Autowired
     private CustomerAction customerAction;
-    @Value("${now.gateway.address}")
-    private String gateWayAddress;
+//    @Value("${now.gateway.address}")
+//    private String gateWayAddress;
 //    @Value("${number.plan.projectName}")
 //    private String projectName;
     private final PlanOperationRecordMapper planOperationRecordMapper;
@@ -542,13 +542,13 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
         if (ValidationUtil.isEmpty(planList)) {
             return;
         }
-        planList.forEach(x->{
-            String picture = x.getPicture();
-            if (StringUtils.isNotEmpty(picture)) {
-                x.setPicture(gateWayAddress+picture);
-            }
-
-        });
+//        planList.forEach(x->{
+//            String picture = x.getPicture();
+//            if (StringUtils.isNotEmpty(picture)) {
+//                x.setPicture(gateWayAddress+picture);
+//            }
+//
+//        });
         List<Long> idList = new ArrayList<>();
         planList.forEach(e -> idList.add(e.getId()));
         Map<Object, List<PlanDoc>> docMapList = null;

amos-boot-system-fas/pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>amos-boot-system-fas</artifactId>
-
+    <version>3.0.1.3</version>
 
 	<dependencies>
 

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

@@ -54,7 +54,7 @@ import com.yeejoin.amos.fas.context.IotContext;
 @EnableAsync
 @EnableEurekaClient
 @ComponentScan({ "org.typroject", "com.yeejoin.amos" })
-@MapperScan(basePackages = { "com.yeejoin.amos.fas.business.dao.mapper","org.typroject.tyboot.*.*.face.orm.dao","com.yeejoin.amos.api.*.face.orm.dao" })
+@MapperScan(basePackages = { "com.yeejoin.amos.fas.business.dao.mapper","org.typroject.tyboot.*.*.face.orm.dao","com.yeejoin.amos.api.*.face.orm.dao","com.yeejoin.amos.boot.biz.common.dao.mapper" })
 public class YeeAmosFireAutoSysStart implements ApplicationContextAware {
 
 	private static final Logger logger = LoggerFactory.getLogger(YeeAmosFireAutoSysStart.class);

amos-boot-system-fas/src/main/resources/application-dev.properties

 #DB properties:
-spring.datasource.url=jdbc:mysql://172.16.11.20:3306/autosys_business_v3.0.0.2?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.datasource.url=jdbc:mysql://172.16.10.66:3306/safety-business-3.0.1?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.datasource.username=root
 spring.datasource.password=root_123
 spring.datasource.driver-class-name = com.mysql.cj.jdbc.Driver
@@ -30,10 +30,10 @@ eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}
 
 
 #redis
-spring.redis.database=1
-spring.redis.host=172.16.11.20
+spring.redis.database=0
+spring.redis.host=172.16.10.85
 spring.redis.port=6379
-spring.redis.password=1234560
+spring.redis.password=amos2019Redis
 spring.redis.jedis.pool.max-active=200
 spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.max-idle=10
@@ -51,9 +51,9 @@ params.isPush=false
 ## emqx
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://172.16.11.33:1883
-emqx.user-name=admin
-emqx.password=public
+emqx.broker=tcp://172.16.10.85:1883
+emqx.user-name=super
+emqx.password=a123456
 #文件服务器地址
-file.downLoad.url=http://39.98.246.31:8888/
+file.downLoad.url=http://39.98.45.134:9000/
 

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

-spring.application.name = AMOS-AUTOSYS-lcl
+spring.application.name = AMOS-AUTOSYS
 server.servlet.context-path=/fireAutoSys
 server.port = 8085
 #environment
@@ -97,9 +97,10 @@ data.type.hydrant=3105
 outSystem.fegin.name=unKnow
 outSystem.user.password=a1234560
 privilege.fegin.name=AMOS-API-PRIVILEGE
-
+## redis失效时间
+redis.cache.failure.time=10800
 #当前gateway的IP地址
-now.gateway.address=http://172.16.10.72:10005/
+#now.gateway.address=http://172.16.10.72:10005/
 
 
 

amos-boot-system-knowledgebase/pom.xml

@@ -7,6 +7,8 @@
     <version>1.0.0</version>
   </parent>
   <artifactId>amos-boot-system-knowledgebase</artifactId>
+  <version>1.0.1.9</version>
+  
   <dependencies>
         <dependency>
 			<groupId>com.amosframework.boot</groupId>

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

@@ -24,7 +24,8 @@ import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler;
 @MapperScan({"com.yeejoin.amos.knowledgebase.face.orm.dao*",
         "org.typroject.tyboot.face.*.orm.dao*",
         "org.typroject.tyboot.core.auth.face.orm.dao*",
-        "org.typroject.tyboot.component.*.face.orm.dao*"})
+        "org.typroject.tyboot.component.*.face.orm.dao*",
+        "com.yeejoin.amos.boot.biz.common.dao.mapper"})
 @SpringBootApplication(scanBasePackages = {"com.yeejoin.amos","org.typroject"})
 public class KnowledgebaseApplication {
 	private static final Logger logger = LoggerFactory.getLogger(KnowledgebaseApplication.class);

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

 ##开发环境配置文件
 # jdbc_config
-spring.datasource.url=jdbc:mysql://172.16.10.66:3306/knowledge_base?characterEncoding=utf8&serverTimezone=Asia/Shanghai
+spring.datasource.url=jdbc:mysql://localhost:3306/safety-knowledge-3.0.0?characterEncoding=utf8&serverTimezone=Asia/Shanghai
 spring.datasource.username=root
 spring.datasource.password=root_123
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
@@ -30,17 +30,16 @@ eureka.client.service-url.defaultZone =http://172.16.10.72:10001/eureka/
 eureka.instance.prefer-ip-address=true
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=*
-eureka.instance.health-check-url=http://172.16.3.75:${server.port}${server.servlet.context-path}/actuator/health
+eureka.instance.health-check-url-path=/actuator/health
 eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
-eureka.instance.status-page-url=http://172.16.3.75:${server.port}${server.servlet.context-path}/actuator/info
-eureka.instance.metadata-map.management.api-docs=http://172.16.3.75:${server.port}${server.servlet.context-path}/swagger-ui.html
+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
 
 
 #ES
 spring.data.elasticsearch.cluster-name=elasticsearch
-spring.data.elasticsearch.cluster-nodes=127.0.0.1:9300
-spring.elasticsearch.rest.uris=http://127.0.0.1:9200
-
+spring.data.elasticsearch.cluster-nodes=172.16.10.66:9300
+spring.elasticsearch.rest.uris=http://172.16.10.66:9200
 
 #emqx v4.0
 emqx.clean-session=true
@@ -51,9 +50,9 @@ emqx.password=a123456
 emqx.max-inflight=1000
 
 #DIY
-diy-config.report.record-data=false
+diy-config.report.record-data=true
 
 #pic server uri
-pic-server.uri=http://39.98.246.31:8888/
+pic-server.uri=http://39.98.45.134:9000/
 #pic router mark
 pic-server.router=/fileURI/
\ No newline at end of file

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

@@ -18,4 +18,6 @@ logging.config=classpath:logback-${spring.profiles.active}.xml
 # mybatis-plus
 mybatis-plus.type-aliases-super-type=org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity
 mybatis-plus.global-config.db-config.id-type=id_worker
-mybatis-plus.mapper-locations=classpath:mapper/*
\ No newline at end of file
+mybatis-plus.mapper-locations=classpath:mapper/*
+## redis失效时间
+redis.cache.failure.time=10800
\ No newline at end of file

amos-boot-system-patrol/pom.xml

@@ -8,7 +8,7 @@
   </parent>
 
   <artifactId>amos-boot-system-patrol</artifactId>
-
+  <version>3.0.6</version>
 
   <dependencies>
      <dependency>

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

@@ -45,11 +45,11 @@ import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler;
 @EnableAsync
 @EnableEurekaClient
 @ComponentScan({"org.typroject","com.yeejoin.amos"})
-@MapperScan(basePackages = { "com.yeejoin.amos.patrol.business.dao.mapper","org.typroject.tyboot.core.auth.face.orm.dao" })
-public class YeeAMOSPatrolStart/* implements ApplicationContextAware*/
+@MapperScan(basePackages = { "com.yeejoin.amos.patrol.business.dao.mapper","org.typroject.tyboot.core.auth.face.orm.dao","com.yeejoin.amos.boot.biz.common.dao.mapper" })
+public class PatrolApplication
 {
 
-	private static final Logger logger = LoggerFactory.getLogger(YeeAMOSPatrolStart.class);
+	private static final Logger logger = LoggerFactory.getLogger(PatrolApplication.class);
 
 
 
@@ -69,7 +69,7 @@ public class YeeAMOSPatrolStart/* implements ApplicationContextAware*/
 	public static void main(String[] args) throws UnknownHostException
 	{
 		    logger.info("start Service..........");
-			ConfigurableApplicationContext context = SpringApplication.run(YeeAMOSPatrolStart.class, args);
+			ConfigurableApplicationContext context = SpringApplication.run(PatrolApplication.class, args);
 	        GlobalExceptionHandler.setAlwaysOk(true);
 	        Environment env = context.getEnvironment();
 	        String ip = InetAddress.getLocalHost().getHostAddress();

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

 eureka.client.serviceUrl.defaultZone=http://172.16.10.72:10001/eureka/
-eureka.client.register-with-eureka = true
-eureka.client.fetch-registry = true
-eureka.client.healthcheck.enabled = true
-eureka.client.fetchRegistry = true
+eureka.client.registry-fetch-interval-seconds=5
 eureka.instance.prefer-ip-address=true
+management.endpoint.health.show-details=always
+management.endpoints.web.exposure.include=*
+eureka.instance.health-check-url-path=/actuator/health
+eureka.instance.lease-expiration-duration-in-seconds=10
+eureka.instance.lease-renewal-interval-in-seconds=5
+eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
+eureka.instance.status-page-url-path=/actuator/info
+
 ribbon.eureka.enabled = true
 ribbon.ConnectTimeout = 5000
 ribbon.ReadTimeout = 6000
@@ -22,8 +27,8 @@ spring.datasource.testWhileIdle = true
 spring.datasource.validationQuery = SELECT 1
 
 #Photo--图片服务器地址
-file.ip = 39.98.246.31
-file.port = 8888
+file.ip = 39.98.45.134
+file.port = 9000
 
 security.password=a1234560
 security.loginId=jc_wjk006
@@ -90,4 +95,4 @@ emqx.password=a123456
 emqx.max-inflight=1000
 
 upload.root.path=D:/nginx/upload/
-upload.server.address=http://39.100.241.164:9999/
\ No newline at end of file
+upload.server.address=http://39.98.45.134:9000/
\ No newline at end of file

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

@@ -46,3 +46,5 @@ amosRefresh.danger.topic =patrolDangerInsertOrUpdate
 amosRefresh.patrol.topic =patrolCheckInsert
 #停止通过WEB公开所有端点
 management.endpoints.web.exposure.exclude=*
+## redis失效时间
+redis.cache.failure.time=10800