1.新增pro生产环境配置。

2.新增CMINMSGS和COUTMSGS 脚本 3.去除启动自动获取最新动态的功能。 4.完善测试以上功能。修改Sender为OSH5
2018-12-29 17:30:43 +08:00
parent 440864110e
commit f799c64682
11 changed files with 443 additions and 264 deletions
@@ -0,0 +1,86 @@
+spring:
+  jpa:
+    hibernate:
+      ddl-auto: none
+      naming:
+        physical-strategy:  org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+  datasource:
+    username: root
+    password: gzzn09ap
+    url: jdbc:mysql://172.17.35.162:3306/cdairport?useSSL=false&useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&autoReconnect=true
+    tomcat:
+      max-active: 30
+      test-on-borrow: true
+      initial-size: 3
+  redis:
+    password: 
+    database: 1  
+    port: 6379  
+    pool:
+      max-idle: 10 
+      min-idle: 0  
+      max-active: 200  
+      max-wait: -1  
+    host: 172.17.35.165  
+    timeout: 1000 
+kafka:
+  producer:
+    retries: 0
+    servers: 172.17.35.161:32796,172.17.35.161:32797,172.17.35.161:32798
+    linger: 1
+    batch:
+      size: 4096
+    buffer:
+      memory: 10240000
+    max:
+      request:
+        size: 10240000
+  consumer:
+    auto:
+      offset:
+        reset: latest
+      commit:
+        interval: 100
+    servers:  172.17.35.161:32796,172.17.35.161:32797,172.17.35.161:32798
+    zookeeper:
+      connect: 172.17.35.161:2181
+    session:
+      timeout: 6000
+    enable:
+      auto:
+        commit: true
+    topic: test
+    concurrency: 10
+    group:
+      id: test
+msgExchange:
+  intervalSeconds: 5
+  waitDateLeftOffset: 600000
+logstash:
+  host: 172.17.35.160:5000
+scheduled:
+  #每日凌晨3:30分点采集历史数据 0 30 3 * * ?
+  flightInfoCron: 0 30 3 * * ? 
+  corePoolSize: 10
+  maxPoolSize: 50
+  queueCapacity: 10
+#计入历史航班数据的条件
+hstCondition:
+  #航班到达超过多久则成为历史航班数据（单位：秒）
+  ARRIVE_HST_TIME: 3600
+  #航班取消超过多久则成为历史航班数据（单位：秒）
+  CANCEL_HST_TIME: 3600
+  #备降超过多久则成为历史航班数据 FROM CTU 本应降落到成都备降到其他地方（单位：秒）
+  FDIV_HST_TIME: 59400
+  #计划时间超过多久则成为历史航班数据（单位：秒）
+  SODT_HST_TIME: 259200
+  
+# Elasticsearch
+# 9200端口是用来让HTTP REST API来访问ElasticSearch，而9300端口是传输层监听的默认端口
+elasticsearch:
+  ip: 172.17.35.160
+  port: 9300
+  pool: 5
+  #注意cluster.name需要与config/elasticsearch.yml中的cluster.name一致
+  cluster:
+    name: docker-cluster
@@ -1,3 +1,3 @@
 spring:
    profiles:
-        active: dev
+        active: pro
@@ -0,0 +1,13 @@
+CREATE TABLE CMINMSGS
+  (
+    CMINMSGS_ID              int(23) not null AUTO_INCREMENT PRIMARY KEY,
+  CMINMSGS_CLOB_MSG         LONGTEXT not null,
+  CMINMSGS_DATE_RECEIVED    datetime(0),
+  CMINMSGS_DATE_PROCESSED   datetime(0),
+  CMINMSGS_SUBSYSTEM_NAME   VARCHAR(4),
+  CMINMSGS_SUBSYSTEM_SEQUENCE   int(6),
+  CMINMSGS_SUBSYSTEM_DATE_SENT  datetime(0),
+  CMINMSGS_SUBSYSTEM_SUBTYPE    VARCHAR(4),
+  CMINMSGS_SUBSYSTEM_TYPE    VARCHAR(4),
+  CMINMSGS_STATUS               VARCHAR(20)
+  );
@@ -0,0 +1,18 @@
+CREATE TABLE COUTMSGS
+  (
+    COUTMSGS_ID               int(23) not null AUTO_INCREMENT PRIMARY KEY,
+  COUTMSGS_CLOB_MSG         LONGTEXT,
+  COUTMSGS_DATE_INSERTED    datetime(0) DEFAULT current_timestamp() not null,
+  COUTMSGS_DATE_SENT        datetime(0),
+  ROUTINGID                 VARCHAR(23) not null,
+  COUTMSGS_TRUEFALS_GROUP   int(1) default 0 not null,
+  COUTMSGS_NO_MESSAGES      int(2),
+  COUTMSGS_GROUP_ORDER      int(2),
+  COUTMSGS_GROUP_ID         int(6),
+  COUTMSGS_FINAL_GROUP_IND  int(1) default 0 not null,
+  COUTMSGS_ACK_REQD         int(1) default 0 not null,
+  COUTMSGS_ACK_RESEND_TIMES int(4) default 0 not null,
+  COUTMSGS_ACK_DATE_RECV    datetime(0),
+  COUTMSGS_ENCRYPT          int(1) default 0 not null,
+  COUTMSGS_ERROR            int(1) default 0 not null
+  );