Merge branch 'master' of ssh://git@git.int.it2000.com.cn/airport-chengdu/admin-api.git
This commit is contained in:
fanghongchao
@@ -24,6 +24,7 @@
|
||||
<java.version>1.8</java.version>
|
||||
<org.mapstruct.version>1.2.0.Final</org.mapstruct.version>
|
||||
<m2e.apt.activation>jdt_apt</m2e.apt.activation>
|
||||
<spring-cloud.version>Edgware.SR5</spring-cloud.version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
@@ -136,6 +137,12 @@
|
||||
<artifactId>pagehelper-spring-boot-starter</artifactId>
|
||||
<version>1.1.0</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
<artifactId>spring-cloud-starter-eureka</artifactId>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
@@ -207,5 +214,16 @@
|
||||
</resources>
|
||||
</build>
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
<artifactId>spring-cloud-dependencies</artifactId>
|
||||
<version>${spring-cloud.version}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
</project>
|
||||
|
||||
@@ -2,8 +2,10 @@ package com.gzzn.omms.adminapi;
|
||||
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
|
||||
|
||||
@SpringBootApplication
|
||||
@EnableEurekaClient
|
||||
public class AdminApiApplication {
|
||||
|
||||
public static void main(String[] args) {
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.gzzn.omms.adminapi.config;
|
||||
|
||||
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.http.client.ClientHttpRequestFactory;
|
||||
@@ -9,6 +10,7 @@ import org.springframework.web.client.RestTemplate;
|
||||
@Configuration
|
||||
public class RestTemplateConfig {
|
||||
@Bean
|
||||
@LoadBalanced
|
||||
public RestTemplate restTemplate(ClientHttpRequestFactory factory){
|
||||
return new RestTemplate(factory);
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ spring:
|
||||
username: ommsxc
|
||||
password: ommsxc
|
||||
#url: jdbc:oracle:thin:@130.120.3.236:1521/xe
|
||||
url: jdbc:oracle:thin:@130.120.2.105:1521/orcl
|
||||
url: jdbc:oracle:thin:@130.120.3.31:1521/orcl
|
||||
driver: oracle.jdbc.driver.OracleDriver
|
||||
max-active: 30
|
||||
test-on-borrow: true
|
||||
@@ -36,19 +36,26 @@ spring:
|
||||
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.231:94/eureka/
|
||||
instance:
|
||||
prefer-ip-address: true
|
||||
sysApi:
|
||||
host: 130.120.3.231
|
||||
port: 93
|
||||
schema: http
|
||||
baseUrl: ${sysApi.schema}://${sysApi.host}:${sysApi.port}
|
||||
#baseUrl: ${sysApi.schema}://${sysApi.host}:${sysApi.port}
|
||||
baseUrl: ${sysApi.schema}://SYSAPI
|
||||
getOpLogSwitchByLevleAndNameUrl: ${sysApi.baseUrl}/oplog/getOpLogSwitch/{level}/{name}
|
||||
|
||||
logstash:
|
||||
host: 130.120.3.233:5000
|
||||
host: 130.120.3.234:5000
|
||||
# Elasticsearch
|
||||
# 9200端口是用来让HTTP REST API来访问ElasticSearch，而9300端口是传输层监听的默认端口
|
||||
elasticsearch:
|
||||
ip: 130.120.3.233
|
||||
ip: 130.120.3.234
|
||||
port: 9300
|
||||
pool: 5
|
||||
#注意cluster.name需要与config/elasticsearch.yml中的cluster.name一致
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
spring:
|
||||
jpa:
|
||||
show-sql: true
|
||||
datasource:
|
||||
primary:
|
||||
username: root
|
||||
password: gzzn09ap
|
||||
url: jdbc:mysql://172.17.35.162: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: omms
|
||||
password: omms
|
||||
#url: jdbc:oracle:thin:@130.120.3.236:1521/xe
|
||||
url: jdbc:oracle:thin:@172.17.35.43:1521/omms
|
||||
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.231:94/eureka/
|
||||
instance:
|
||||
prefer-ip-address: true
|
||||
sysApi:
|
||||
host: 172.17.35.163
|
||||
port: 93
|
||||
schema: http
|
||||
#baseUrl: ${sysApi.schema}://${sysApi.host}:${sysApi.port}
|
||||
baseUrl: ${sysApi.schema}://SYSAPI
|
||||
getOpLogSwitchByLevleAndNameUrl: ${sysApi.baseUrl}/oplog/getOpLogSwitch/{level}/{name}
|
||||
|
||||
logstash:
|
||||
host: 172.17.35.160:5000
|
||||
# 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
|
||||
eureka:
|
||||
client:
|
||||
service-url:
|
||||
defaultZone: http://172.17.35.163:94/eureka/
|
||||
instance:
|
||||
prefer-ip-address: true
|
||||
@@ -1,4 +1,6 @@
|
||||
spring:
|
||||
application:
|
||||
name: adminapi
|
||||
profiles:
|
||||
active: dev
|
||||
jpa:
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1,11 +0,0 @@
|
||||
INSERT INTO `adminapi_datadic_groups` (`group_code`,`group_name`) VALUES ('FLIGHT_TASK','航班任务');
|
||||
INSERT INTO `adminapi_datadic_groups` (`group_code`,`group_name`) VALUES ('FLIGHT_TYPE','航班类别');
|
||||
INSERT INTO `adminapi_datadic_groups` (`group_code`,`group_name`) VALUES ('ROUTE_TYPE','航线类别');
|
||||
|
||||
INSERT INTO `adminapi_datadic_items` (`dataitem_code`,`dataitem_name`,`dataitem_desc`,`group_code`) VALUES ('D','国内','航线类别类:D-国内','ROUTE_TYPE');
|
||||
INSERT INTO `adminapi_datadic_items` (`dataitem_code`,`dataitem_name`,`dataitem_desc`,`group_code`) VALUES ('I','国际','航线类别类别，I-国际','ROUTE_TYPE');
|
||||
|
||||
|
||||
INSERT INTO `adminapi_uisettings_default` (`id`,`env_code`,`group_code`,`setting_content`) VALUES ('36aa320785df40c29750bcd42f718a96','web','userSettingCol','{\"allCols\":[{\"COL_CODE\":\"ACFT\",\"COL_CN\":\"机型\",\"COL_ORDER\":\"1\"},{\"COL_CODE\":\"GCTM\",\"COL_CN\":\"登机结束\",\"COL_ORDER\":\"2\"},{\"COL_CODE\":\"BOTM\",\"COL_CN\":\"登机开始\",\"COL_ORDER\":\"3\"},{\"COL_CODE\":\"ABDG\",\"COL_CN\":\"登机桥\",\"COL_ORDER\":\"4\"},{\"COL_CODE\":\"AOTM_D\",\"COL_CN\":\"撤桥时间\",\"COL_ORDER\":\"5\"},{\"COL_CODE\":\"AOTM_A\",\"COL_CN\":\"靠桥时间\",\"COL_ORDER\":\"6\"},{\"COL_CODE\":\"BELT\",\"COL_CN\":\"转盘号\",\"COL_ORDER\":\"7\"},{\"COL_CODE\":\"CHKC\",\"COL_CN\":\"值机柜台\",\"COL_ORDER\":\"8\"},{\"COL_CODE\":\"CCTM\",\"COL_CN\":\"值机结束\",\"COL_ORDER\":\"9\"},{\"COL_CODE\":\"COTM\",\"COL_CN\":\"值机开始\",\"COL_ORDER\":\"10\"},{\"COL_CODE\":\"CHTM_OFF\",\"COL_CN\":\"下轮挡\",\"COL_ORDER\":\"11\"},{\"COL_CODE\":\"CHTM_ON\",\"COL_CN\":\"上轮挡\",\"COL_ORDER\":\"12\"},{\"COL_CODE\":\"LACL\",\"COL_CN\":\"最后通知时间\",\"COL_ORDER\":\"13\"},{\"COL_CODE\":\"CHUT\",\"COL_CN\":\"行李传送带\",\"COL_ORDER\":\"14\"},{\"COL_CODE\":\"RENO\",\"COL_CN\":\"飞机号\",\"COL_ORDER\":\"15\"},{\"COL_CODE\":\"ALCD\",\"COL_CN\":\"航空公司\",\"COL_ORDER\":\"16\"},{\"COL_CODE\":\"ACTT\",\"COL_CN\":\"实际到达／出发\",\"COL_ORDER\":\"17\"},{\"COL_CODE\":\"PSST\",\"COL_CN\":\"计划机位\",\"COL_ORDER\":\"18\"},{\"COL_CODE\":\"ESTT\",\"COL_CN\":\"预计到达／出发\\t\",\"COL_ORDER\":\"19\"},{\"COL_CODE\":\"MVIN\",\"COL_CN\":\"到达/出发\",\"COL_ORDER\":\"20\"},{\"COL_CODE\":\"ERUT\",\"COL_CN\":\"航线\",\"COL_ORDER\":\"21\"},{\"COL_CODE\":\"FLNO\",\"COL_CN\":\"航班号\",\"COL_ORDER\":\"22\"},{\"COL_CODE\":\"FTSS\",\"COL_CN\":\"运营状态\",\"COL_ORDER\":\"23\"},{\"COL_CODE\":\"FLIN\",\"COL_CN\":\"航线类别\",\"COL_ORDER\":\"24\"},{\"COL_CODE\":\"IMPA\",\"COL_CN\":\"重要提示\",\"COL_ORDER\":\"25\"},{\"COL_CODE\":\"SODT\",\"COL_CN\":\"计划到达／出发\",\"COL_ORDER\":\"26\"},{\"COL_CODE\":\"TRML\",\"COL_CN\":\"航站楼\",\"COL_ORDER\":\"27\"},{\"COL_CODE\":\"FLTY\",\"COL_CN\":\"航班类别\",\"COL_ORDER\":\"28\"},{\"COL_CODE\":\"GTDT\",\"COL_CN\":\"登机门号\\t\",\"COL_ORDER\":\"29\"},{\"COL_CODE\":\"PADT\",\"COL_CN\":\"前站起飞时间\",\"COL_ORDER\":\"30\"},{\"COL_CODE\":\"CSFT\",\"COL_CN\":\"共享航班号\",\"COL_ORDER\":\"31\"},{\"COL_CODE\":\"STND\",\"COL_CN\":\"当前机位\",\"COL_ORDER\":\"32\"}],\"sourceList\":[],\"targetList\":[{\"COL_CODE\":\"ACFT\",\"COL_CN\":\"机型\",\"COL_ORDER\":1},{\"COL_CODE\":\"GCTM\",\"COL_CN\":\"登机结束\",\"COL_ORDER\":2},{\"COL_CODE\":\"BOTM\",\"COL_CN\":\"登机开始\",\"COL_ORDER\":3},{\"COL_CODE\":\"ABDG\",\"COL_CN\":\"登机桥\",\"COL_ORDER\":4},{\"COL_CODE\":\"AOTM_D\",\"COL_CN\":\"撤桥时间\",\"COL_ORDER\":5},{\"COL_CODE\":\"AOTM_A\",\"COL_CN\":\"靠桥时间\",\"COL_ORDER\":6},{\"COL_CODE\":\"BELT\",\"COL_CN\":\"转盘号\",\"COL_ORDER\":7},{\"COL_CODE\":\"CHKC\",\"COL_CN\":\"值机柜台\",\"COL_ORDER\":8},{\"COL_CODE\":\"CCTM\",\"COL_CN\":\"值机结束\",\"COL_ORDER\":9},{\"COL_CODE\":\"COTM\",\"COL_CN\":\"值机开始\",\"COL_ORDER\":10},{\"COL_CODE\":\"CHTM_OFF\",\"COL_CN\":\"下轮挡\",\"COL_ORDER\":11},{\"COL_CODE\":\"CHTM_ON\",\"COL_CN\":\"上轮挡\",\"COL_ORDER\":12},{\"COL_CODE\":\"LACL\",\"COL_CN\":\"最后通知时间\",\"COL_ORDER\":13},{\"COL_CODE\":\"CHUT\",\"COL_CN\":\"行李传送带\",\"COL_ORDER\":14},{\"COL_CODE\":\"RENO\",\"COL_CN\":\"飞机号\",\"COL_ORDER\":15},{\"COL_CODE\":\"ALCD\",\"COL_CN\":\"航空公司\",\"COL_ORDER\":16},{\"COL_CODE\":\"ACTT\",\"COL_CN\":\"实际到达／出发\",\"COL_ORDER\":17},{\"COL_CODE\":\"PSST\",\"COL_CN\":\"计划机位\",\"COL_ORDER\":18},{\"COL_CODE\":\"ESTT\",\"COL_CN\":\"预计到达／出发\\t\",\"COL_ORDER\":19},{\"COL_CODE\":\"MVIN\",\"COL_CN\":\"到达/出发\",\"COL_ORDER\":20},{\"COL_CODE\":\"ERUT\",\"COL_CN\":\"航线\",\"COL_ORDER\":21},{\"COL_CODE\":\"FLNO\",\"COL_CN\":\"航班号\",\"COL_ORDER\":22},{\"COL_CODE\":\"FTSS\",\"COL_CN\":\"运营状态\",\"COL_ORDER\":23},{\"COL_CODE\":\"FLIN\",\"COL_CN\":\"航线类别\",\"COL_ORDER\":24},{\"COL_CODE\":\"IMPA\",\"COL_CN\":\"重要提示\",\"COL_ORDER\":25},{\"COL_CODE\":\"SODT\",\"COL_CN\":\"计划到达／出发\",\"COL_ORDER\":26},{\"COL_CODE\":\"TRML\",\"COL_CN\":\"航站楼\",\"COL_ORDER\":27},{\"COL_CODE\":\"FLTY\",\"COL_CN\":\"航班类别\",\"COL_ORDER\":28},{\"COL_CODE\":\"GTDT\",\"COL_CN\":\"登机门号\\t\",\"COL_ORDER\":29},{\"COL_CODE\":\"PADT\",\"COL_CN\":\"前站起飞时间\",\"COL_ORDER\":30},{\"COL_CODE\":\"CSFT\",\"COL_CN\":\"共享航班号\",\"COL_ORDER\":31},{\"COL_CODE\":\"STND\",\"COL_CN\":\"当前机位\",\"COL_ORDER\":32}]}');
|
||||
INSERT INTO `adminapi_uisettings_default` (`id`,`env_code`,`group_code`,`setting_content`) VALUES ('491f6a2342164210a390ebbe19660470','web','userSettingMsgAlert','{\"defaultData\":[{\"COL_CODE\":\"FLOP-CNCL\",\"COL_CN\":\"航班取消\"},{\"COL_CODE\":\"FLOP-FRET\",\"COL_CN\":\"航班返回\"},{\"COL_CODE\":\"FLOP-FDIV\",\"COL_CN\":\"航班备降\"},{\"COL_CODE\":\"FLOP-FDEL\",\"COL_CN\":\"航班删除\"},{\"COL_CODE\":\"FLOP-DELY\",\"COL_CN\":\"航班延误\"},{\"COL_CODE\":\"FLOP-ACTT\",\"COL_CN\":\"实际时间\"},{\"COL_CODE\":\"FLOP-GTDT\",\"COL_CN\":\"登机门消息\"},{\"COL_CODE\":\"FLOP-PSDT\",\"COL_CN\":\"机位变更\"},{\"COL_CODE\":\"FLOP-ESTT\",\"COL_CN\":\"预计到达时间\"},{\"COL_CODE\":\"FLOP-PADT\",\"COL_CN\":\"前站起飞\"},{\"COL_CODE\":\"FLOP-CKDT\",\"COL_CN\":\"值机柜台\"},{\"COL_CODE\":\"FLOP-BOTM\",\"COL_CN\":\"登机开始\"},{\"COL_CODE\":\"FLOP-CLDT\",\"COL_CN\":\"行李转盘\"},{\"COL_CODE\":\"FLOP-ROUT\",\"COL_CN\":\"航班航线\"},{\"COL_CODE\":\"FLOP-VIPP\",\"COL_CN\":\"航班VIP\"},{\"COL_CODE\":\"FLOP-HNAG\",\"COL_CN\":\"服务代理\"},{\"COL_CODE\":\"FLOP-FLBG\",\"COL_CN\":\"首末件行李到达\"},{\"COL_CODE\":\"FLOP-RENO\",\"COL_CN\":\"飞机号变更\"},{\"COL_CODE\":\"FLOP-ABTM\",\"COL_CN\":\"登桥撤桥\"},{\"COL_CODE\":\"FLOP-CHOT\",\"COL_CN\":\"上下轮档\"},{\"COL_CODE\":\"FLOP-TRML\",\"COL_CN\":\"航站楼\"}],\"sourceList\":[],\"targetList\":[{\"COL_CODE\":\"FLOP-CNCL\",\"COL_CN\":\"航班取消\"},{\"COL_CODE\":\"FLOP-FRET\",\"COL_CN\":\"航班返回\"},{\"COL_CODE\":\"FLOP-FDIV\",\"COL_CN\":\"航班备降\"},{\"COL_CODE\":\"FLOP-FDEL\",\"COL_CN\":\"航班删除\"},{\"COL_CODE\":\"FLOP-DELY\",\"COL_CN\":\"航班延误\"},{\"COL_CODE\":\"FLOP-ACTT\",\"COL_CN\":\"实际时间\"},{\"COL_CODE\":\"FLOP-GTDT\",\"COL_CN\":\"登机门消息\"},{\"COL_CODE\":\"FLOP-PSDT\",\"COL_CN\":\"机位变更\"},{\"COL_CODE\":\"FLOP-ESTT\",\"COL_CN\":\"预计到达时间\"},{\"COL_CODE\":\"FLOP-PADT\",\"COL_CN\":\"前站起飞\"},{\"COL_CODE\":\"FLOP-CKDT\",\"COL_CN\":\"值机柜台\"},{\"COL_CODE\":\"FLOP-BOTM\",\"COL_CN\":\"登机开始\"},{\"COL_CODE\":\"FLOP-CLDT\",\"COL_CN\":\"行李转盘\"},{\"COL_CODE\":\"FLOP-ROUT\",\"COL_CN\":\"航班航线\"},{\"COL_CODE\":\"FLOP-VIPP\",\"COL_CN\":\"航班VIP\"},{\"COL_CODE\":\"FLOP-HNAG\",\"COL_CN\":\"服务代理\"},{\"COL_CODE\":\"FLOP-FLBG\",\"COL_CN\":\"首末件行李到达\"},{\"COL_CODE\":\"FLOP-RENO\",\"COL_CN\":\"飞机号变更\"},{\"COL_CODE\":\"FLOP-ABTM\",\"COL_CN\":\"登桥撤桥\"},{\"COL_CODE\":\"FLOP-CHOT\",\"COL_CN\":\"上下轮档\"},{\"COL_CODE\":\"FLOP-TRML\",\"COL_CN\":\"航站楼\"}]}');
|
||||
INSERT INTO `adminapi_uisettings_default` (`id`,`env_code`,`group_code`,`setting_content`) VALUES ('52490af655624df6be0d3a8c92938468','web','userSettingColor','[{\"COL_CODE\":\"RENO\",\"COL_CN\":\"飞机号\",\"COL_BG_COLOR\":\"rgb(46,255,135,1)\",\"COL_COLOR\":\"rgb(0,70,255,1)\"},{\"COL_CODE\":\"ACTT\",\"COL_CN\":\"实际到达／出发\",\"COL_BG_COLOR\":\"rgb(149,207,255,1)\",\"COL_COLOR\":\"rgb(0,70,255,1)\"},{\"COL_CODE\":\"ESTT\",\"COL_CN\":\"预计到达／出发\",\"COL_BG_COLOR\":\"rgb(255,207,157,1)\",\"COL_COLOR\":\"rgb(0,70,255,1)\"},{\"COL_CODE\":\"PADT\",\"COL_CN\":\"前站起飞时间\",\"COL_BG_COLOR\":\"rgb(114,181,255,1)\",\"COL_COLOR\":\"rgb(0,70,255,1)\"},{\"COL_CODE\":\"PSST\",\"COL_CN\":\"计划机位\",\"COL_BG_COLOR\":\"rgb(173,255,46,1)\",\"COL_COLOR\":\"rgb(0,70,255,1)\"}]');
|
||||
Reference in New Issue
Block a user