diff options
25 files changed, 195 insertions, 588 deletions
diff --git a/galaxy-admin-server/config/application-dev.properties b/galaxy-admin-server/config/application-dev.properties deleted file mode 100644 index 62680cb..0000000 --- a/galaxy-admin-server/config/application-dev.properties +++ /dev/null @@ -1,26 +0,0 @@ -#服务端口配置 -server.port=8800 -#表示eureka-client间隔多久去拉取服务注册信息 -eureka.client.registry-fetch-interval-seconds=5 -#表示eureka-client发送心跳给server端的频率 -eureka.instance.lease-renewal-interval-in-seconds=10 -#健康检查页面的URL -eureka.instance.health-check-url-path=/actuator/health -#服务注册中心地址 -eureka.client.serviceUrl.defaultZone=http://admin:admin@localhost:8501/eureka/ -#该实例相较于hostname是否优先使用IP -eureka.instance.prefer-ip-address=true -#该实例注册到服务中心的唯一ID -eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port} -#暴露所有端点 -management.endpoints.web.exposure.include=* -#详细的应用健康信息 -management.endpoint.health.show-details=always -#安全配置-用户名 -spring.security.user.name=admin -#安全配置-密码 -spring.security.user.password=admin -#自定义metadata -eureka.instance.metadata-map.user.name=${spring.security.user.name} -#自定义metadata -eureka.instance.metadata-map.user.password=${spring.security.user.password}
\ No newline at end of file diff --git a/galaxy-admin-server/config/application-prod.properties b/galaxy-admin-server/config/application-prod.properties deleted file mode 100644 index 62680cb..0000000 --- a/galaxy-admin-server/config/application-prod.properties +++ /dev/null @@ -1,26 +0,0 @@ -#服务端口配置 -server.port=8800 -#表示eureka-client间隔多久去拉取服务注册信息 -eureka.client.registry-fetch-interval-seconds=5 -#表示eureka-client发送心跳给server端的频率 -eureka.instance.lease-renewal-interval-in-seconds=10 -#健康检查页面的URL -eureka.instance.health-check-url-path=/actuator/health -#服务注册中心地址 -eureka.client.serviceUrl.defaultZone=http://admin:admin@localhost:8501/eureka/ -#该实例相较于hostname是否优先使用IP -eureka.instance.prefer-ip-address=true -#该实例注册到服务中心的唯一ID -eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port} -#暴露所有端点 -management.endpoints.web.exposure.include=* -#详细的应用健康信息 -management.endpoint.health.show-details=always -#安全配置-用户名 -spring.security.user.name=admin -#安全配置-密码 -spring.security.user.password=admin -#自定义metadata -eureka.instance.metadata-map.user.name=${spring.security.user.name} -#自定义metadata -eureka.instance.metadata-map.user.password=${spring.security.user.password}
\ No newline at end of file diff --git a/galaxy-admin-server/config/application-test.properties b/galaxy-admin-server/config/application-test.properties deleted file mode 100644 index eaabd87..0000000 --- a/galaxy-admin-server/config/application-test.properties +++ /dev/null @@ -1,26 +0,0 @@ -#服务端口配置 -server.port=8800 -#表示eureka-client间隔多久去拉取服务注册信息 -eureka.client.registry-fetch-interval-seconds=5 -#表示eureka-client发送心跳给server端的频率 -eureka.instance.lease-renewal-interval-in-seconds=10 -#健康检查页面的URL -eureka.instance.health-check-url-path=/actuator/health -#服务注册中心地址 -eureka.client.serviceUrl.defaultZone=http://admin:[email protected]:8501/eureka/,http://admin:[email protected]:8501/eureka/ -#该实例相较于hostname是否优先使用IP -eureka.instance.prefer-ip-address=true -#该实例注册到服务中心的唯一ID -eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port} -#暴露所有端点 -management.endpoints.web.exposure.include=* -#详细的应用健康信息 -management.endpoint.health.show-details=always -#安全配置-用户名 -spring.security.user.name=admin -#安全配置-密码 -spring.security.user.password=admin -#自定义metadata -eureka.instance.metadata-map.user.name=${spring.security.user.name} -#自定义metadata -eureka.instance.metadata-map.user.password=${spring.security.user.password}
\ No newline at end of file diff --git a/galaxy-admin-server/config/application.properties b/galaxy-admin-server/config/application.properties index 3fb0ef0..ab87051 100644 --- a/galaxy-admin-server/config/application.properties +++ b/galaxy-admin-server/config/application.properties @@ -1,6 +1,20 @@ -#当前激活的环境配置 -spring.profiles.active=dev -#应用名称配置 +#application config +server.port=8800 spring.application.name=galaxy-admin-server -#日志配置文件路径 +#spring cloud eureka config +eureka.instance.prefer-ip-address=true +eureka.client.registry-fetch-interval-seconds=5 +eureka.instance.lease-renewal-interval-in-seconds=10 +eureka.instance.health-check-url-path=/actuator/health +eureka.instance.metadata-map.user.name=${spring.security.user.name} +eureka.instance.metadata-map.user.password=${spring.security.user.password} +eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port} +eureka.client.serviceUrl.defaultZone=http://admin:[email protected]:8501/eureka/ +#management config +management.endpoints.web.exposure.include=* +management.endpoint.health.show-details=always +#spring security config +spring.security.user.name=admin +spring.security.user.password=admin +#log file path config logging.config=./config/logback-spring.xml
\ No newline at end of file diff --git a/galaxy-admin-server/config/logback-spring.xml b/galaxy-admin-server/config/logback-spring.xml index ac3d947..13f5549 100644 --- a/galaxy-admin-server/config/logback-spring.xml +++ b/galaxy-admin-server/config/logback-spring.xml @@ -4,18 +4,17 @@ <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" /> <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" /> - <!-- 开发环境-日志输出控制台格式 --> <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/> - <!--日志文件输出格式--> + <property name="FILE_LOG_PATTERN" value="${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/> - <!-- 测试环境-文件路径 --> + <property name="TEST_FILE_PATH" value="/home/galaxy/galaxy-admin-server/logs" /> - <!-- 生产环境-文件路径 --> + <property name="PROD_FILE_PATH" value="/home/galaxy/galaxy-admin-server/logs" /> - <!--文件名称--> + <property name="LOG_NAME" value="galaxy-admin-server" /> - <!-- 开发环境 --> + <!-- dev env --> <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> <encoder> <pattern>${CONSOLE_LOG_PATTERN}</pattern> @@ -25,9 +24,8 @@ <appender-ref ref="CONSOLE" /> </root> - <!-- 测试环境 --> + <!-- test env --> <springProfile name="test"> - <!-- 每天产生一个文件 --> <appender name="TEST_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <encoder> <pattern>${FILE_LOG_PATTERN}</pattern> @@ -36,7 +34,7 @@ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> <!-- rollover daily --> <fileNamePattern>${TEST_FILE_PATH}${file.separator}${LOG_NAME}-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB --> + <!-- each file should be at most 100MB, keep 30 days worth of history, but at most 20GB --> <maxHistory>30</maxHistory> <maxFileSize>100MB</maxFileSize> </rollingPolicy> @@ -46,7 +44,7 @@ </root> </springProfile> - <!-- 生产环境 --> + <!-- prod env --> <springProfile name="prod"> <appender name="PROD_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <encoder> @@ -56,7 +54,7 @@ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> <!-- rollover daily --> <fileNamePattern>${PROD_FILE_PATH}${file.separator}${LOG_NAME}-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB --> + <!-- each file should be at most 100MB, keep 30 days worth of history, but at most 20GB --> <maxHistory>30</maxHistory> <maxFileSize>100MB</maxFileSize> </rollingPolicy> diff --git a/galaxy-auth-center/config/application-dev.properties b/galaxy-auth-center/config/application-dev.properties deleted file mode 100644 index 7596835..0000000 --- a/galaxy-auth-center/config/application-dev.properties +++ /dev/null @@ -1,27 +0,0 @@ -#服务端口配置 -server.port=8601 -#表示eureka-client间隔多久去拉取服务注册信息 -eureka.client.registry-fetch-interval-seconds=5 -#表示eureka-client发送心跳给server端的频率 -eureka.instance.lease-renewal-interval-in-seconds=10 -#健康检查页面的URL -eureka.instance.health-check-url-path=/actuator/health -#与Eureka注册服务中心的通信zone和url地址 -eureka.client.serviceUrl.defaultZone=http://admin:admin@localhost:8501/eureka/ -#该实例相较于hostname是否优先使用IP -eureka.instance.prefer-ip-address=true -#该实例注册到服务中心的唯一ID -eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port} -#暴露所有端点 -management.endpoints.web.exposure.include=* -#详细的应用健康信息 -management.endpoint.health.show-details=always - -#Arango用户名 -arango.username=query -#Arango密码 -arango.password=ceiec2018 -#ArangoJWT授权地址 -arango.authurl=http://192.168.44.12:8529/_db/tsg_galaxy_v3/_open/auth -#Arango数据查询地址 -arango.query.url=http://192.168.44.12:8529/_db/tsg_galaxy_v3/_api/cursor
\ No newline at end of file diff --git a/galaxy-auth-center/config/application-prod.properties b/galaxy-auth-center/config/application-prod.properties deleted file mode 100644 index 7596835..0000000 --- a/galaxy-auth-center/config/application-prod.properties +++ /dev/null @@ -1,27 +0,0 @@ -#服务端口配置 -server.port=8601 -#表示eureka-client间隔多久去拉取服务注册信息 -eureka.client.registry-fetch-interval-seconds=5 -#表示eureka-client发送心跳给server端的频率 -eureka.instance.lease-renewal-interval-in-seconds=10 -#健康检查页面的URL -eureka.instance.health-check-url-path=/actuator/health -#与Eureka注册服务中心的通信zone和url地址 -eureka.client.serviceUrl.defaultZone=http://admin:admin@localhost:8501/eureka/ -#该实例相较于hostname是否优先使用IP -eureka.instance.prefer-ip-address=true -#该实例注册到服务中心的唯一ID -eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port} -#暴露所有端点 -management.endpoints.web.exposure.include=* -#详细的应用健康信息 -management.endpoint.health.show-details=always - -#Arango用户名 -arango.username=query -#Arango密码 -arango.password=ceiec2018 -#ArangoJWT授权地址 -arango.authurl=http://192.168.44.12:8529/_db/tsg_galaxy_v3/_open/auth -#Arango数据查询地址 -arango.query.url=http://192.168.44.12:8529/_db/tsg_galaxy_v3/_api/cursor
\ No newline at end of file diff --git a/galaxy-auth-center/config/application-test.properties b/galaxy-auth-center/config/application-test.properties deleted file mode 100644 index d8df5c2..0000000 --- a/galaxy-auth-center/config/application-test.properties +++ /dev/null @@ -1,27 +0,0 @@ -#服务端口配置 -server.port=8601 -#表示eureka-client间隔多久去拉取服务注册信息 -eureka.client.registry-fetch-interval-seconds=5 -#表示eureka-client发送心跳给server端的频率 -eureka.instance.lease-renewal-interval-in-seconds=10 -#健康检查页面的URL -eureka.instance.health-check-url-path=/actuator/health -#与Eureka注册服务中心的通信zone和url地址 -eureka.client.serviceUrl.defaultZone=http://admin:[email protected]:8501/eureka/,http://admin:[email protected]:8501/eureka/ -#该实例相较于hostname是否优先使用IP -eureka.instance.prefer-ip-address=true -#该实例注册到服务中心的唯一ID -eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port} -#暴露所有端点 -management.endpoints.web.exposure.include=* -#详细的应用健康信息 -management.endpoint.health.show-details=always - -#Arango用户名 -arango.username=query -#Arango密码 -arango.password=ceiec2018 -#ArangoJWT授权地址 -arango.authurl=http://192.168.44.12:8529/_db/tsg_galaxy_v3/_open/auth -#Arango数据查询地址 -arango.query.url=http://192.168.44.12:8529/_db/tsg_galaxy_v3/_api/cursor
\ No newline at end of file diff --git a/galaxy-auth-center/config/application.properties b/galaxy-auth-center/config/application.properties index 83aaee3..1e93bad 100644 --- a/galaxy-auth-center/config/application.properties +++ b/galaxy-auth-center/config/application.properties @@ -1,6 +1,24 @@ -#当前激活的环境配置 -spring.profiles.active=dev -#应用名称配置 +#application config +server.port=8601 spring.application.name=galaxy-auth-center -#日志配置文件路径 -logging.config=./config/logback-spring.xml
\ No newline at end of file +#spring cloud eureka config +eureka.instance.prefer-ip-address=true +eureka.client.registry-fetch-interval-seconds=5 +eureka.instance.lease-renewal-interval-in-seconds=10 +eureka.instance.health-check-url-path=/actuator/health +eureka.instance.metadata-map.user.name=${spring.security.user.name} +eureka.instance.metadata-map.user.password=${spring.security.user.password} +eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port} +eureka.client.serviceUrl.defaultZone=http://admin:[email protected]:8501/eureka/ +#management config +management.endpoints.web.exposure.include=* +management.endpoint.health.show-details=always +#log file path config +logging.config=./config/logback-spring.xml + +#arango db config +arango.username=query +arango.password=ceiec2018 +arango.address=192.168.44.12:8529 +arango.authurl=http://${arango.address}/_db/tsg_galaxy_v3/_open/auth +arango.query.url=http://${arango.address}/_db/tsg_galaxy_v3/_api/cursor
\ No newline at end of file diff --git a/galaxy-auth-center/config/logback-spring.xml b/galaxy-auth-center/config/logback-spring.xml index 05b67e1..c8b1682 100644 --- a/galaxy-auth-center/config/logback-spring.xml +++ b/galaxy-auth-center/config/logback-spring.xml @@ -4,18 +4,17 @@ <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" /> <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" /> - <!-- 开发环境-日志输出控制台格式 --> <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/> - <!--日志文件输出格式--> + <property name="FILE_LOG_PATTERN" value="${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/> - <!-- 测试环境-文件路径 --> + <property name="TEST_FILE_PATH" value="/home/galaxy/galaxy-auth-center/logs" /> - <!-- 生产环境-文件路径 --> + <property name="PROD_FILE_PATH" value="/home/galaxy/galaxy-auth-center/logs" /> - <!--文件名称--> + <property name="LOG_NAME" value="galaxy-auth-center" /> - <!-- 开发环境 --> + <!-- dev env --> <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> <encoder> <pattern>${CONSOLE_LOG_PATTERN}</pattern> @@ -25,9 +24,8 @@ <appender-ref ref="CONSOLE" /> </root> - <!-- 测试环境 --> + <!-- test env --> <springProfile name="test"> - <!-- 每天产生一个文件 --> <appender name="TEST_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <encoder> <pattern>${FILE_LOG_PATTERN}</pattern> @@ -36,7 +34,7 @@ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> <!-- rollover daily --> <fileNamePattern>${TEST_FILE_PATH}${file.separator}${LOG_NAME}-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB --> + <!-- each file should be at most 100MB, keep 30 days worth of history, but at most 20GB --> <maxHistory>30</maxHistory> <maxFileSize>100MB</maxFileSize> </rollingPolicy> @@ -46,7 +44,7 @@ </root> </springProfile> - <!-- 生产环境 --> + <!-- prod env --> <springProfile name="prod"> <appender name="PROD_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <encoder> @@ -56,7 +54,7 @@ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> <!-- rollover daily --> <fileNamePattern>${PROD_FILE_PATH}${file.separator}${LOG_NAME}-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB --> + <!-- each file should be at most 100MB, keep 30 days worth of history, but at most 20GB --> <maxHistory>30</maxHistory> <maxFileSize>100MB</maxFileSize> </rollingPolicy> diff --git a/galaxy-data-engine/config/application-dev.properties b/galaxy-data-engine/config/application-dev.properties deleted file mode 100644 index d244b1e..0000000 --- a/galaxy-data-engine/config/application-dev.properties +++ /dev/null @@ -1,55 +0,0 @@ -#服务端口配置 -server.port=8701 -#表示eureka-client间隔多久去拉取服务注册信息 -eureka.client.registry-fetch-interval-seconds=5 -#表示eureka-client发送心跳给server端的频率 -eureka.instance.lease-renewal-interval-in-seconds=10 -#健康检查页面的URL -eureka.instance.health-check-url-path=/actuator/health -#与Eureka注册服务中心的通信zone和url地址 -eureka.client.serviceUrl.defaultZone=http://admin:admin@localhost:8501/eureka/ -#该实例相较于hostname是否优先使用IP -eureka.instance.prefer-ip-address=true -#该实例注册到服务中心的唯一ID -eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port} -#暴露所有端点 -management.endpoints.web.exposure.include=* -#详细的应用健康信息 -management.endpoint.health.show-details=always - -#HttpClient配置 -httpclient.connectTimeout=1000 -httpclient.socketTimeout=21700000 -httpclient.maxConnection=500 -httpclient.maxPerRoute=500 -#xxl-job-admin配置 -xxl.job.admin.url=http://192.168.44.12:8181/xxl-job-admin -xxl.job.admin.username=admin -xxl.job.admin.password=123456 -#最大的数据查询条数 -engine.maxCacheNum=500000 -engine.defaultResultNum=300000 -#Hbase数据库相关配置 -hbase.url=192.168.44.12:8084 -hbase.dbname=tsg -hbase.tableName=report_result -hbase.columnFamily=response -hbase.columnName=result -#druid数据库相关配置 -druid.query.url=http://192.168.44.12:8082/druid/v2/sql -druid.dbname=druid -druid.sqlTimeZone=Asia/Shanghai -#arango数据库相关配置 -arango.maxrows=10000 -arango.login=http://galaxy-auth-center/authorize/arangoJwtLogin -arango.query.url=http://192.168.44.12:8529/_db/tsg_galaxy_v3/_api/cursor -arango.collection=http://192.168.44.12:8529/_db/tsg_galaxy_v3/_api/collection -#clickhouse数据库相关配置 -clickhouse.query.url=http://192.168.44.12:8123 -clickhouse.dbname=tsg_galaxy_v3 -clickhouse.real.time.username=tsg_query -clickhouse.real.time.password=ceiec2018 -clickhouse.long.term.username=tsg_report -clickhouse.long.term.password=ceiec2019 -#IPlearning最近24小时的独立客户端IP(单位小时) -iplearning.uniqciprecent=-24
\ No newline at end of file diff --git a/galaxy-data-engine/config/application-prod.properties b/galaxy-data-engine/config/application-prod.properties deleted file mode 100644 index d244b1e..0000000 --- a/galaxy-data-engine/config/application-prod.properties +++ /dev/null @@ -1,55 +0,0 @@ -#服务端口配置 -server.port=8701 -#表示eureka-client间隔多久去拉取服务注册信息 -eureka.client.registry-fetch-interval-seconds=5 -#表示eureka-client发送心跳给server端的频率 -eureka.instance.lease-renewal-interval-in-seconds=10 -#健康检查页面的URL -eureka.instance.health-check-url-path=/actuator/health -#与Eureka注册服务中心的通信zone和url地址 -eureka.client.serviceUrl.defaultZone=http://admin:admin@localhost:8501/eureka/ -#该实例相较于hostname是否优先使用IP -eureka.instance.prefer-ip-address=true -#该实例注册到服务中心的唯一ID -eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port} -#暴露所有端点 -management.endpoints.web.exposure.include=* -#详细的应用健康信息 -management.endpoint.health.show-details=always - -#HttpClient配置 -httpclient.connectTimeout=1000 -httpclient.socketTimeout=21700000 -httpclient.maxConnection=500 -httpclient.maxPerRoute=500 -#xxl-job-admin配置 -xxl.job.admin.url=http://192.168.44.12:8181/xxl-job-admin -xxl.job.admin.username=admin -xxl.job.admin.password=123456 -#最大的数据查询条数 -engine.maxCacheNum=500000 -engine.defaultResultNum=300000 -#Hbase数据库相关配置 -hbase.url=192.168.44.12:8084 -hbase.dbname=tsg -hbase.tableName=report_result -hbase.columnFamily=response -hbase.columnName=result -#druid数据库相关配置 -druid.query.url=http://192.168.44.12:8082/druid/v2/sql -druid.dbname=druid -druid.sqlTimeZone=Asia/Shanghai -#arango数据库相关配置 -arango.maxrows=10000 -arango.login=http://galaxy-auth-center/authorize/arangoJwtLogin -arango.query.url=http://192.168.44.12:8529/_db/tsg_galaxy_v3/_api/cursor -arango.collection=http://192.168.44.12:8529/_db/tsg_galaxy_v3/_api/collection -#clickhouse数据库相关配置 -clickhouse.query.url=http://192.168.44.12:8123 -clickhouse.dbname=tsg_galaxy_v3 -clickhouse.real.time.username=tsg_query -clickhouse.real.time.password=ceiec2018 -clickhouse.long.term.username=tsg_report -clickhouse.long.term.password=ceiec2019 -#IPlearning最近24小时的独立客户端IP(单位小时) -iplearning.uniqciprecent=-24
\ No newline at end of file diff --git a/galaxy-data-engine/config/application-test.properties b/galaxy-data-engine/config/application-test.properties deleted file mode 100644 index 1f33cca..0000000 --- a/galaxy-data-engine/config/application-test.properties +++ /dev/null @@ -1,55 +0,0 @@ -#服务端口配置 -server.port=8701 -#表示eureka-client间隔多久去拉取服务注册信息 -eureka.client.registry-fetch-interval-seconds=5 -#表示eureka-client发送心跳给server端的频率 -eureka.instance.lease-renewal-interval-in-seconds=10 -#健康检查页面的URL -eureka.instance.health-check-url-path=/actuator/health -#与Eureka注册服务中心的通信zone和url地址 -eureka.client.serviceUrl.defaultZone=http://admin:[email protected]:8501/eureka/,http://admin:[email protected]:8501/eureka/ -#该实例相较于hostname是否优先使用IP -eureka.instance.prefer-ip-address=true -#该实例注册到服务中心的唯一ID -eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port} -#暴露所有端点 -management.endpoints.web.exposure.include=* -#详细的应用健康信息 -management.endpoint.health.show-details=always - -#HttpClient配置 -httpclient.connectTimeout=1000 -httpclient.socketTimeout=21700000 -httpclient.maxConnection=500 -httpclient.maxPerRoute=500 -#xxl-job-admin配置 -xxl.job.admin.url=http://192.168.44.12:8181/xxl-job-admin -xxl.job.admin.username=admin -xxl.job.admin.password=123456 -#最大的数据查询条数 -engine.maxCacheNum=500000 -engine.defaultResultNum=300000 -#Hbase数据库相关配置 -hbase.url=192.168.44.12:8084 -hbase.dbname=tsg -hbase.tableName=report_result -hbase.columnFamily=response -hbase.columnName=result -#druid数据库相关配置 -druid.query.url=http://192.168.44.12:8082/druid/v2/sql -druid.dbname=druid -druid.sqlTimeZone=Asia/Shanghai -#arango数据库相关配置 -arango.maxrows=10000 -arango.login=http://galaxy-auth-center/authorize/arangoJwtLogin -arango.query.url=http://192.168.44.12:8529/_db/tsg_galaxy_v3/_api/cursor -arango.collection=http://192.168.44.12:8529/_db/tsg_galaxy_v3/_api/collection -#clickhouse数据库相关配置 -clickhouse.query.url=http://192.168.44.12:8123 -clickhouse.dbname=tsg_galaxy_v3 -clickhouse.real.time.username=tsg_query -clickhouse.real.time.password=ceiec2018 -clickhouse.long.term.username=tsg_report -clickhouse.long.term.password=ceiec2019 -#IPlearning最近24小时的独立客户端IP(单位小时) -iplearning.uniqciprecent=-24
\ No newline at end of file diff --git a/galaxy-data-engine/config/application.properties b/galaxy-data-engine/config/application.properties index abd9e9c..b03dc02 100644 --- a/galaxy-data-engine/config/application.properties +++ b/galaxy-data-engine/config/application.properties @@ -1,6 +1,58 @@ -#当前激活的环境配置 -spring.profiles.active=dev -#应用名称配置 +#application config +server.port=8701 spring.application.name=galaxy-data-engine -#日志配置文件路径 -logging.config=./config/logback-spring.xml
\ No newline at end of file +#spring cloud eureka config +eureka.instance.prefer-ip-address=true +eureka.client.registry-fetch-interval-seconds=5 +eureka.instance.lease-renewal-interval-in-seconds=10 +eureka.instance.health-check-url-path=/actuator/health +eureka.instance.metadata-map.user.name=${spring.security.user.name} +eureka.instance.metadata-map.user.password=${spring.security.user.password} +eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port} +eureka.client.serviceUrl.defaultZone=http://admin:[email protected]:8501/eureka/ +#management config +management.endpoints.web.exposure.include=* +management.endpoint.health.show-details=always +#log file path config +logging.config=./config/logback-spring.xml + +#httpclient config +httpclient.connectTimeout=1000 +httpclient.socketTimeout=21700000 +httpclient.maxConnection=500 +httpclient.maxPerRoute=500 +#job admin config +xxl.job.admin.add=192.168.44.12:8181 +xxl.job.admin.url=http://${xxl.job.admin.add}/xxl-job-admin +xxl.job.admin.username=admin +xxl.job.admin.password=123456 +#engine config +engine.maxCacheNum=500000 +engine.defaultResultNum=300000 +#hbase config +hbase.url=192.168.44.12:8084 +hbase.dbname=tsg +hbase.tableName=report_result +hbase.columnFamily=response +hbase.columnName=result +#druid config +druid.address=192.168.44.12:8082 +druid.dbname=druid +druid.sqlTimeZone=Asia/Shanghai +druid.query.url=http://${druid.address}/druid/v2/sql +#arango config +arango.address=192.168.44.12:8529 +arango.maxrows=10000 +arango.login=http://galaxy-auth-center/authorize/arangoJwtLogin +arango.query.url=http://${arango.address}/_db/tsg_galaxy_v3/_api/cursor +arango.collection=http://${arango.address}/_db/tsg_galaxy_v3/_api/collection +#clickhouse config +clickhouse.address=192.168.44.12:8123 +clickhouse.query.url=http://${clickhouse.address} +clickhouse.dbname=tsg_galaxy_v3 +clickhouse.real.time.username=tsg_query +clickhouse.real.time.password=ceiec2018 +clickhouse.long.term.username=tsg_report +clickhouse.long.term.password=ceiec2019 +#iplearning config +iplearning.uniqciprecent=-24
\ No newline at end of file diff --git a/galaxy-data-engine/config/logback-spring.xml b/galaxy-data-engine/config/logback-spring.xml index df70d4d..07bad98 100644 --- a/galaxy-data-engine/config/logback-spring.xml +++ b/galaxy-data-engine/config/logback-spring.xml @@ -4,18 +4,17 @@ <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" /> <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" /> - <!-- 开发环境-日志输出控制台格式 --> <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/> - <!--日志文件输出格式--> + <property name="FILE_LOG_PATTERN" value="${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/> - <!-- 测试环境-文件路径 --> + <property name="TEST_FILE_PATH" value="/home/galaxy/galaxy-data-engine/logs" /> - <!-- 生产环境-文件路径 --> + <property name="PROD_FILE_PATH" value="/home/galaxy/galaxy-data-engine/logs" /> - <!--文件名称--> + <property name="LOG_NAME" value="galaxy-data-engine" /> - <!-- 开发环境 --> + <!-- dev env --> <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> <encoder> <pattern>${CONSOLE_LOG_PATTERN}</pattern> @@ -25,9 +24,8 @@ <appender-ref ref="CONSOLE" /> </root> - <!-- 测试环境 --> + <!-- test env --> <springProfile name="test"> - <!-- 每天产生一个文件 --> <appender name="TEST_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <encoder> <pattern>${FILE_LOG_PATTERN}</pattern> @@ -36,7 +34,7 @@ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> <!-- rollover daily --> <fileNamePattern>${TEST_FILE_PATH}${file.separator}${LOG_NAME}-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB --> + <!-- each file should be at most 100MB, keep 30 days worth of history, but at most 20GB --> <maxHistory>30</maxHistory> <maxFileSize>100MB</maxFileSize> </rollingPolicy> @@ -46,7 +44,7 @@ </root> </springProfile> - <!-- 生产环境 --> + <!-- prod env --> <springProfile name="prod"> <appender name="PROD_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <encoder> @@ -56,7 +54,7 @@ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> <!-- rollover daily --> <fileNamePattern>${PROD_FILE_PATH}${file.separator}${LOG_NAME}-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB --> + <!-- each file should be at most 100MB, keep 30 days worth of history, but at most 20GB --> <maxHistory>30</maxHistory> <maxFileSize>100MB</maxFileSize> </rollingPolicy> diff --git a/galaxy-eureka-server/config/application-dev.properties b/galaxy-eureka-server/config/application-dev.properties deleted file mode 100644 index 1f34851..0000000 --- a/galaxy-eureka-server/config/application-dev.properties +++ /dev/null @@ -1,19 +0,0 @@ -#服务端口配置 -server.port=8501 -eureka.instance.hostname=localhost -#是否注册到eureka -eureka.client.registerWithEureka=false -#是否从eureka中拉取注册信息 -eureka.client.fetchRegistry=false -##暴露eureka服务的地址 -eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:${server.port}/eureka/ -#自我保护模式 -eureka.server.enable-self-preservation=false -#暴露所有端点 -management.endpoints.web.exposure.include=* -#详细的应用健康信息 -management.endpoint.health.show-details=always -#安全配置-用户名 -spring.security.user.name=admin -#安全配置-密码 -spring.security.user.password=admin
\ No newline at end of file diff --git a/galaxy-eureka-server/config/application-prod.properties b/galaxy-eureka-server/config/application-prod.properties deleted file mode 100644 index 1f34851..0000000 --- a/galaxy-eureka-server/config/application-prod.properties +++ /dev/null @@ -1,19 +0,0 @@ -#服务端口配置 -server.port=8501 -eureka.instance.hostname=localhost -#是否注册到eureka -eureka.client.registerWithEureka=false -#是否从eureka中拉取注册信息 -eureka.client.fetchRegistry=false -##暴露eureka服务的地址 -eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:${server.port}/eureka/ -#自我保护模式 -eureka.server.enable-self-preservation=false -#暴露所有端点 -management.endpoints.web.exposure.include=* -#详细的应用健康信息 -management.endpoint.health.show-details=always -#安全配置-用户名 -spring.security.user.name=admin -#安全配置-密码 -spring.security.user.password=admin
\ No newline at end of file diff --git a/galaxy-eureka-server/config/application-test.properties b/galaxy-eureka-server/config/application-test.properties deleted file mode 100644 index 1f34851..0000000 --- a/galaxy-eureka-server/config/application-test.properties +++ /dev/null @@ -1,19 +0,0 @@ -#服务端口配置 -server.port=8501 -eureka.instance.hostname=localhost -#是否注册到eureka -eureka.client.registerWithEureka=false -#是否从eureka中拉取注册信息 -eureka.client.fetchRegistry=false -##暴露eureka服务的地址 -eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:${server.port}/eureka/ -#自我保护模式 -eureka.server.enable-self-preservation=false -#暴露所有端点 -management.endpoints.web.exposure.include=* -#详细的应用健康信息 -management.endpoint.health.show-details=always -#安全配置-用户名 -spring.security.user.name=admin -#安全配置-密码 -spring.security.user.password=admin
\ No newline at end of file diff --git a/galaxy-eureka-server/config/application.properties b/galaxy-eureka-server/config/application.properties index 3aa5435..7561b95 100644 --- a/galaxy-eureka-server/config/application.properties +++ b/galaxy-eureka-server/config/application.properties @@ -1,6 +1,17 @@ -#当前激活的环境配置 -spring.profiles.active=dev -#应用名称配置 +#application config +server.port=8501 spring.application.name=galaxy-eureka-server -#日志配置文件路径 +#spring cloud eureka config +eureka.client.fetchRegistry=false +eureka.client.registerWithEureka=false +eureka.server.enable-self-preservation=false +eureka.instance.hostname=127.0.0.1 +eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:${server.port}/eureka/ +#management config +management.endpoints.web.exposure.include=* +management.endpoint.health.show-details=always +#spring security config +spring.security.user.name=admin +spring.security.user.password=admin +#log file path config logging.config=./config/logback-spring.xml
\ No newline at end of file diff --git a/galaxy-eureka-server/config/logback-spring.xml b/galaxy-eureka-server/config/logback-spring.xml index e56be3a..6ce832c 100644 --- a/galaxy-eureka-server/config/logback-spring.xml +++ b/galaxy-eureka-server/config/logback-spring.xml @@ -4,18 +4,17 @@ <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" /> <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" /> - <!-- 开发环境-日志输出控制台格式 --> <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/> - <!--日志文件输出格式--> + <property name="FILE_LOG_PATTERN" value="${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/> - <!-- 测试环境-文件路径 --> + <property name="TEST_FILE_PATH" value="/home/galaxy/galaxy-eureka-server/logs" /> - <!-- 生产环境-文件路径 --> + <property name="PROD_FILE_PATH" value="/home/galaxy/galaxy-eureka-server/logs" /> - <!--文件名称--> + <property name="LOG_NAME" value="galaxy-eureka-server" /> - <!-- 开发环境 --> + <!-- dev env --> <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> <encoder> <pattern>${CONSOLE_LOG_PATTERN}</pattern> @@ -25,9 +24,8 @@ <appender-ref ref="CONSOLE" /> </root> - <!-- 测试环境 --> + <!-- test env --> <springProfile name="test"> - <!-- 每天产生一个文件 --> <appender name="TEST_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <encoder> <pattern>${FILE_LOG_PATTERN}</pattern> @@ -36,7 +34,7 @@ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> <!-- rollover daily --> <fileNamePattern>${TEST_FILE_PATH}${file.separator}${LOG_NAME}-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB --> + <!-- each file should be at most 100MB, keep 30 days worth of history, but at most 20GB --> <maxHistory>30</maxHistory> <maxFileSize>100MB</maxFileSize> </rollingPolicy> @@ -46,7 +44,7 @@ </root> </springProfile> - <!-- 生产环境 --> + <!-- prod env --> <springProfile name="prod"> <appender name="PROD_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <encoder> @@ -56,7 +54,7 @@ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> <!-- rollover daily --> <fileNamePattern>${PROD_FILE_PATH}${file.separator}${LOG_NAME}-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB --> + <!-- each file should be at most 100MB, keep 30 days worth of history, but at most 20GB --> <maxHistory>30</maxHistory> <maxFileSize>100MB</maxFileSize> </rollingPolicy> diff --git a/galaxy-gateway/config/application-dev.properties b/galaxy-gateway/config/application-dev.properties deleted file mode 100644 index 1d665cd..0000000 --- a/galaxy-gateway/config/application-dev.properties +++ /dev/null @@ -1,43 +0,0 @@ -#服务端口配置 -server.port=9999 -#表示eureka-client间隔多久去拉取服务注册信息 -eureka.client.registry-fetch-interval-seconds=5 -#表示eureka-client发送心跳给server端的频率 -eureka.instance.lease-renewal-interval-in-seconds=10 -#健康检查页面的URL -eureka.instance.health-check-url-path=/actuator/health -#与Eureka注册服务中心的通信zone和url地址 -eureka.client.serviceUrl.defaultZone=http://admin:admin@localhost:8501/eureka/ -#该实例相较于hostname是否优先使用IP -eureka.instance.prefer-ip-address=true -#该实例注册到服务中心的唯一ID -eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port} -#暴露所有端点 -management.endpoints.web.exposure.include=* -#详细的应用健康信息 -management.endpoint.health.show-details=always -#开启基于服务发现的路由规则 -spring.cloud.gateway.discovery.locator.enabled=true -#将服务名称转小写 -spring.cloud.gateway.discovery.locator.lower-case-service-id=true - -#系统相关接口路由配置 -spring.cloud.gateway.routes[0].id=system-config-route -spring.cloud.gateway.routes[0].uri=lb://galaxy-data-engine -spring.cloud.gateway.routes[0].predicates[0]=Path=/sys/** -#元数据相关接口路由配置 -spring.cloud.gateway.routes[1].id=metadata-route -spring.cloud.gateway.routes[1].uri=lb://galaxy-data-engine -spring.cloud.gateway.routes[1].predicates[0]=Path=/metadata/** -#基于SQL的查询路由配置 -spring.cloud.gateway.routes[2].id=sql-query-route -spring.cloud.gateway.routes[2].uri=lb://galaxy-data-engine -spring.cloud.gateway.routes[2].predicates[0]=Query=query -#流量分布相关接口路由配置 -spring.cloud.gateway.routes[3].id=network-route -spring.cloud.gateway.routes[3].uri=lb://galaxy-data-engine -spring.cloud.gateway.routes[3].predicates[0]=Query=protocol -#服务推荐相关接口路由配置 -spring.cloud.gateway.routes[4].id=knowledge-route -spring.cloud.gateway.routes[4].uri=lb://galaxy-data-engine -spring.cloud.gateway.routes[4].predicates[0]=Path=/knowledge/**
\ No newline at end of file diff --git a/galaxy-gateway/config/application-prod.properties b/galaxy-gateway/config/application-prod.properties deleted file mode 100644 index 1d665cd..0000000 --- a/galaxy-gateway/config/application-prod.properties +++ /dev/null @@ -1,43 +0,0 @@ -#服务端口配置 -server.port=9999 -#表示eureka-client间隔多久去拉取服务注册信息 -eureka.client.registry-fetch-interval-seconds=5 -#表示eureka-client发送心跳给server端的频率 -eureka.instance.lease-renewal-interval-in-seconds=10 -#健康检查页面的URL -eureka.instance.health-check-url-path=/actuator/health -#与Eureka注册服务中心的通信zone和url地址 -eureka.client.serviceUrl.defaultZone=http://admin:admin@localhost:8501/eureka/ -#该实例相较于hostname是否优先使用IP -eureka.instance.prefer-ip-address=true -#该实例注册到服务中心的唯一ID -eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port} -#暴露所有端点 -management.endpoints.web.exposure.include=* -#详细的应用健康信息 -management.endpoint.health.show-details=always -#开启基于服务发现的路由规则 -spring.cloud.gateway.discovery.locator.enabled=true -#将服务名称转小写 -spring.cloud.gateway.discovery.locator.lower-case-service-id=true - -#系统相关接口路由配置 -spring.cloud.gateway.routes[0].id=system-config-route -spring.cloud.gateway.routes[0].uri=lb://galaxy-data-engine -spring.cloud.gateway.routes[0].predicates[0]=Path=/sys/** -#元数据相关接口路由配置 -spring.cloud.gateway.routes[1].id=metadata-route -spring.cloud.gateway.routes[1].uri=lb://galaxy-data-engine -spring.cloud.gateway.routes[1].predicates[0]=Path=/metadata/** -#基于SQL的查询路由配置 -spring.cloud.gateway.routes[2].id=sql-query-route -spring.cloud.gateway.routes[2].uri=lb://galaxy-data-engine -spring.cloud.gateway.routes[2].predicates[0]=Query=query -#流量分布相关接口路由配置 -spring.cloud.gateway.routes[3].id=network-route -spring.cloud.gateway.routes[3].uri=lb://galaxy-data-engine -spring.cloud.gateway.routes[3].predicates[0]=Query=protocol -#服务推荐相关接口路由配置 -spring.cloud.gateway.routes[4].id=knowledge-route -spring.cloud.gateway.routes[4].uri=lb://galaxy-data-engine -spring.cloud.gateway.routes[4].predicates[0]=Path=/knowledge/**
\ No newline at end of file diff --git a/galaxy-gateway/config/application-test.properties b/galaxy-gateway/config/application-test.properties deleted file mode 100644 index 240f712..0000000 --- a/galaxy-gateway/config/application-test.properties +++ /dev/null @@ -1,43 +0,0 @@ -#服务端口配置 -server.port=9999 -#表示eureka-client间隔多久去拉取服务注册信息 -eureka.client.registry-fetch-interval-seconds=5 -#表示eureka-client发送心跳给server端的频率 -eureka.instance.lease-renewal-interval-in-seconds=10 -#健康检查页面的URL -eureka.instance.health-check-url-path=/actuator/health -#与Eureka注册服务中心的通信zone和url地址 -eureka.client.serviceUrl.defaultZone=http://admin:[email protected]:8501/eureka/,http://admin:[email protected]:8501/eureka/ -#该实例相较于hostname是否优先使用IP -eureka.instance.prefer-ip-address=true -#该实例注册到服务中心的唯一ID -eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port} -#暴露所有端点 -management.endpoints.web.exposure.include=* -#详细的应用健康信息 -management.endpoint.health.show-details=always -#开启基于服务发现的路由规则 -spring.cloud.gateway.discovery.locator.enabled=true -#将服务名称转小写 -spring.cloud.gateway.discovery.locator.lower-case-service-id=true - -#系统相关接口路由配置 -spring.cloud.gateway.routes[0].id=system-config-route -spring.cloud.gateway.routes[0].uri=lb://galaxy-data-engine -spring.cloud.gateway.routes[0].predicates[0]=Path=/sys/** -#元数据相关接口路由配置 -spring.cloud.gateway.routes[1].id=metadata-route -spring.cloud.gateway.routes[1].uri=lb://galaxy-data-engine -spring.cloud.gateway.routes[1].predicates[0]=Path=/metadata/** -#基于SQL的查询路由配置 -spring.cloud.gateway.routes[2].id=sql-query-route -spring.cloud.gateway.routes[2].uri=lb://galaxy-data-engine -spring.cloud.gateway.routes[2].predicates[0]=Query=query -#流量分布相关接口路由配置 -spring.cloud.gateway.routes[3].id=network-route -spring.cloud.gateway.routes[3].uri=lb://galaxy-data-engine -spring.cloud.gateway.routes[3].predicates[0]=Query=protocol -#服务推荐相关接口路由配置 -spring.cloud.gateway.routes[4].id=knowledge-route -spring.cloud.gateway.routes[4].uri=lb://galaxy-data-engine -spring.cloud.gateway.routes[4].predicates[0]=Path=/knowledge/**
\ No newline at end of file diff --git a/galaxy-gateway/config/application.properties b/galaxy-gateway/config/application.properties index d257219..af1b10c 100644 --- a/galaxy-gateway/config/application.properties +++ b/galaxy-gateway/config/application.properties @@ -1,6 +1,38 @@ -#当前激活的环境配置 -spring.profiles.active=dev -#应用名称配置 +#application config +server.port=9999 spring.application.name=galaxy-gateway -#日志配置文件路径 -logging.config=./config/logback-spring.xml
\ No newline at end of file +#spring cloud eureka config +eureka.instance.prefer-ip-address=true +eureka.client.registry-fetch-interval-seconds=5 +eureka.instance.lease-renewal-interval-in-seconds=10 +eureka.instance.health-check-url-path=/actuator/health +eureka.client.serviceUrl.defaultZone=http://admin:[email protected]:8501/eureka/ +eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port} +#management config +management.endpoints.web.exposure.include=* +management.endpoint.health.show-details=always +#gateway config +spring.cloud.gateway.discovery.locator.enabled=true +spring.cloud.gateway.discovery.locator.lower-case-service-id=true +#log file path config +logging.config=./config/logback-spring.xml +#system-config-route +spring.cloud.gateway.routes[0].id=system-config-route +spring.cloud.gateway.routes[0].uri=lb://galaxy-data-engine +spring.cloud.gateway.routes[0].predicates[0]=Path=/sys/** +#metadata-route +spring.cloud.gateway.routes[1].id=metadata-route +spring.cloud.gateway.routes[1].uri=lb://galaxy-data-engine +spring.cloud.gateway.routes[1].predicates[0]=Path=/metadata/** +#sql-query-route +spring.cloud.gateway.routes[2].id=sql-query-route +spring.cloud.gateway.routes[2].uri=lb://galaxy-data-engine +spring.cloud.gateway.routes[2].predicates[0]=Query=query +#network-route +spring.cloud.gateway.routes[3].id=network-route +spring.cloud.gateway.routes[3].uri=lb://galaxy-data-engine +spring.cloud.gateway.routes[3].predicates[0]=Query=protocol +#knowledge-route +spring.cloud.gateway.routes[4].id=knowledge-route +spring.cloud.gateway.routes[4].uri=lb://galaxy-data-engine +spring.cloud.gateway.routes[4].predicates[0]=Path=/knowledge/**
\ No newline at end of file diff --git a/galaxy-gateway/config/logback-spring.xml b/galaxy-gateway/config/logback-spring.xml index 7b8f453..f23fe46 100644 --- a/galaxy-gateway/config/logback-spring.xml +++ b/galaxy-gateway/config/logback-spring.xml @@ -4,18 +4,17 @@ <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" /> <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" /> - <!-- 开发环境-日志输出控制台格式 --> <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/> - <!--日志文件输出格式--> + <property name="FILE_LOG_PATTERN" value="${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/> - <!-- 测试环境-文件路径 --> + <property name="TEST_FILE_PATH" value="/home/galaxy/galaxy-gateway/logs" /> - <!-- 生产环境-文件路径 --> + <property name="PROD_FILE_PATH" value="/home/galaxy/galaxy-gateway/logs" /> - <!--文件名称--> + <property name="LOG_NAME" value="galaxy-gateway" /> - <!-- 开发环境 --> + <!-- dev env --> <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> <encoder> <pattern>${CONSOLE_LOG_PATTERN}</pattern> @@ -25,9 +24,8 @@ <appender-ref ref="CONSOLE" /> </root> - <!-- 测试环境 --> + <!-- test env --> <springProfile name="test"> - <!-- 每天产生一个文件 --> <appender name="TEST_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <encoder> <pattern>${FILE_LOG_PATTERN}</pattern> @@ -36,7 +34,7 @@ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> <!-- rollover daily --> <fileNamePattern>${TEST_FILE_PATH}${file.separator}${LOG_NAME}-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB --> + <!-- each file should be at most 100MB, keep 30 days worth of history, but at most 20GB --> <maxHistory>30</maxHistory> <maxFileSize>100MB</maxFileSize> </rollingPolicy> @@ -46,7 +44,7 @@ </root> </springProfile> - <!-- 生产环境 --> + <!-- prod env --> <springProfile name="prod"> <appender name="PROD_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <encoder> @@ -56,7 +54,7 @@ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> <!-- rollover daily --> <fileNamePattern>${PROD_FILE_PATH}${file.separator}${LOG_NAME}-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB --> + <!-- each file should be at most 100MB, keep 30 days worth of history, but at most 20GB --> <maxHistory>30</maxHistory> <maxFileSize>100MB</maxFileSize> </rollingPolicy> |