diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml new file mode 100644 index 0000000..154a3d0 --- /dev/null +++ b/src/main/resources/application-test.yml @@ -0,0 +1,67 @@ +spring: + jpa: + show-sql: true + datasource: + primary: + username: cdairport + password: 123456 + url: jdbc:mysql://130.120.3.158:3306/cdairport?useSSL=false&useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&autoReconnect=true + max-active: 30 + test-on-borrow: true + validation-query: SELECT 1 + initialSize: 5 + min-idle: 1 + max-wait: 60000 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + test-while-idle: true + test-on-return: true + pool-prepared-statements: false + max-pool-prepared-statement-per-connection-size: 20 + secondary: + username: ommsxc + password: ommsxc + #url: jdbc:oracle:thin:@130.120.3.236:1521/xe + url: jdbc:oracle:thin:@130.120.3.31:1521/orcl + #url: jdbc:oracle:thin:@130.120.2.105:1521/orcl + driver: oracle.jdbc.driver.OracleDriver + max-active: 30 + test-on-borrow: true + validation-query: SELECT 1 FROM dual + initial-size: 10 + min-idle: 1 + max-wait: 60000 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + test-while-idle: true + test-on-return: true + pool-prepared-statements: false + max-pool-prepared-statement-per-connection-size: 20 +eureka: + client: + service-url: + defaultZone: http://130.120.3.232:94/eureka/ + instance: + prefer-ip-address: false + hostName: adminapi +sysApi: + host: 130.120.3.231 + port: 93 + schema: http + #baseUrl: ${sysApi.schema}://${sysApi.host}:${sysApi.port} + baseUrl: ${sysApi.schema}://SYSAPI + getOpLogSwitchByLevleAndNameUrl: ${sysApi.baseUrl}/oplog/getOpLogSwitch/{level}/{name} + +logstash: + host: 130.120.3.234:5000 +# Elasticsearch +# 9200端口是用来让HTTP REST API来访问ElasticSearch,而9300端口是传输层监听的默认端口 +elasticsearch: + ip: 130.120.3.234 + port: 9300 + pool: 5 + #注意cluster.name需要与config/elasticsearch.yml中的cluster.name一致 + cluster: + name: docker-cluster + nodes: 130.120.3.234:9300,130.120.3.236:9300,130.120.3.238:9300 + maxSize: 10000 \ No newline at end of file diff --git a/src/main/resources/db/migration/v0.0.2.20190327_adminapi_updatecolorsetting.sql b/src/main/resources/db/migration/v0.0.2.20190327_adminapi_updatecolorsetting.sql new file mode 100644 index 0000000..4f5ff07 --- /dev/null +++ b/src/main/resources/db/migration/v0.0.2.20190327_adminapi_updatecolorsetting.sql @@ -0,0 +1 @@ +UPDATE `cdairport`.`adminapi_uisettings_default` SET `setting_content`='[{\"COL_CODE\":\"SODT\", \"COL_CN\":\"计划到达/出发\", \"COL_BG_COLOR\":\"rgb(230,221,221,1)\",\"COL_COLOR\":\"rgb(0,70,255,1)\"},\n {\"COL_CODE\":\"ESTT\", \"COL_CN\":\"预计到达/出发\", \"COL_BG_COLOR\":\"rgb(255,207,157,1)\",\"COL_COLOR\":\"rgb(0,70,255,1)\"},\n {\"COL_CODE\":\"ACTT\", \"COL_CN\":\"实际到达/出发\", \"COL_BG_COLOR\":\"rgb(149,207,255,1)\",\"COL_COLOR\":\"rgb(0,70,255,1)\"},\n {\"COL_CODE\":\"RENO\", \"COL_CN\":\"飞机号变更\", \"COL_BG_COLOR\":\"rgb(46,255,135,1)\",\"COL_COLOR\":\"rgb(0,70,255,1)\"},\n {\"COL_CODE\":\"PSST\", \"COL_CN\":\"计划机位变更\", \"COL_BG_COLOR\":\"rgb(173,255,46,1)\",\"COL_COLOR\":\"rgb(0,70,255,1)\"},\n {\"COL_CODE\":\"PADT\", \"COL_CN\":\"前站起飞时间\", \"COL_BG_COLOR\":\"rgb(114,181,255,1)\",\"COL_COLOR\":\"rgb(0,70,255,1)\"},\n {\"COL_CODE\":\"COTM\", \"COL_CN\":\"值机开始\", \"COL_BG_COLOR\":\"rgb(228,157,157,1)\",\"COL_COLOR\":\"rgb(0,70,255,1)\"},\n {\"COL_CODE\":\"CCTM\", \"COL_CN\":\"值机结束\", \"COL_BG_COLOR\":\"rgb(159,140,140,1)\",\"COL_COLOR\":\"rgb(0,70,255,1)\"},\n {\"COL_CODE\":\"BOTM\", \"COL_CN\":\"登机开始\", \"COL_BG_COLOR\":\"rgb(247,124,124,1)\",\"COL_COLOR\":\"rgb(0,70,255,1)\"},\n {\"COL_CODE\":\"GCTM\", \"COL_CN\":\"登机结束\", \"COL_BG_COLOR\":\"rgb(239,229,55,1)\",\"COL_COLOR\":\"rgb(0,70,255,1)\"},\n {\"COL_CODE\":\"FSTA\", \"COL_CN\":\"服务开始时间\", \"COL_BG_COLOR\":\"rgb(171,169,88,1)\",\"COL_COLOR\":\"rgb(0,70,255,1)\"},\n {\"COL_CODE\":\"FEND\", \"COL_CN\":\"服务完成时间\", \"COL_BG_COLOR\":\"rgb(194,192,13,1)\",\"COL_COLOR\":\"rgb(0,70,255,1)\"},\n {\"COL_CODE\":\"FPEO\", \"COL_CN\":\"服务人员\", \"COL_BG_COLOR\":\"rgb(65,194,13,1)\",\"COL_COLOR\":\"rgb(0,70,255,1)\"},\n {\"COL_CODE\":\"FCAR\", \"COL_CN\":\"服务车辆\", \"COL_BG_COLOR\":\"rgb(191,237,173,1)\",\"COL_COLOR\":\"rgb(0,70,255,1)\"},\n {\"COL_CODE\":\"FNUM\", \"COL_CN\":\"服务数量\", \"COL_BG_COLOR\":\"rgb(173,237,226,1)\",\"COL_COLOR\":\"rgb(0,70,255,1)\"},\n {\"COL_CODE\":\"FCGE\", \"COL_CN\":\"机务交接时间\", \"COL_BG_COLOR\":\"rgb(30,179,153,1)\",\"COL_COLOR\":\"rgb(0,70,255,1)\"}\n]' WHERE `id`='52490af655624df6be0d3a8c92938468'; \ No newline at end of file