move config dir

64 files changed, 18 insertions, 6 deletions

diff --git a/galaxy-admin-server/src/main/resources/application-dev.properties b/galaxy-admin-server/config/application-dev.properties
index bdb95e5..bdb95e5 100644
--- a/galaxy-admin-server/src/main/resources/application-dev.properties
+++ b/galaxy-admin-server/config/application-dev.properties
diff --git a/galaxy-admin-server/src/main/resources/application-prod.properties b/galaxy-admin-server/config/application-prod.properties
index bdb95e5..bdb95e5 100644
--- a/galaxy-admin-server/src/main/resources/application-prod.properties
+++ b/galaxy-admin-server/config/application-prod.properties
diff --git a/galaxy-admin-server/src/main/resources/application-test.properties b/galaxy-admin-server/config/application-test.properties
index bdb95e5..bdb95e5 100644
--- a/galaxy-admin-server/src/main/resources/application-test.properties
+++ b/galaxy-admin-server/config/application-test.properties
diff --git a/galaxy-admin-server/src/main/resources/application.properties b/galaxy-admin-server/config/application.properties
index 3490a45..5d441ee 100644
--- a/galaxy-admin-server/src/main/resources/application.properties
+++ b/galaxy-admin-server/config/application.properties
@@ -3,4 +3,4 @@ spring.profiles.active=dev
 #Ӧ����������
 spring.application.name=galaxy-admin-server
 #��־�����ļ�·��
-logging.config=classpath:logback-spring.xml
+logging.config=./config/logback-spring.xml
diff --git a/galaxy-admin-server/src/main/resources/logback-spring.xml b/galaxy-admin-server/config/logback-spring.xml
index 1f82763..1f82763 100644
--- a/galaxy-admin-server/src/main/resources/logback-spring.xml
+++ b/galaxy-admin-server/config/logback-spring.xml
diff --git a/galaxy-auth-center/src/main/resources/application-dev.properties b/galaxy-auth-center/config/application-dev.properties
index 8ba6da3..8ba6da3 100644
--- a/galaxy-auth-center/src/main/resources/application-dev.properties
+++ b/galaxy-auth-center/config/application-dev.properties
diff --git a/galaxy-auth-center/src/main/resources/application-prod.properties b/galaxy-auth-center/config/application-prod.properties
index 8ba6da3..8ba6da3 100644
--- a/galaxy-auth-center/src/main/resources/application-prod.properties
+++ b/galaxy-auth-center/config/application-prod.properties
diff --git a/galaxy-auth-center/src/main/resources/application-test.properties b/galaxy-auth-center/config/application-test.properties
index 8ba6da3..8ba6da3 100644
--- a/galaxy-auth-center/src/main/resources/application-test.properties
+++ b/galaxy-auth-center/config/application-test.properties
diff --git a/galaxy-auth-center/src/main/resources/application.properties b/galaxy-auth-center/config/application.properties
index 2eddaf3..a9072a4 100644
--- a/galaxy-auth-center/src/main/resources/application.properties
+++ b/galaxy-auth-center/config/application.properties
@@ -3,4 +3,4 @@ spring.profiles.active=dev
 #Ӧ����������
 spring.application.name=galaxy-auth-center
 #��־�����ļ�·��
-logging.config=classpath:logback-spring.xml
\ No newline at end of file
+logging.config=./config/logback-spring.xml
\ No newline at end of file
diff --git a/galaxy-auth-center/src/main/resources/logback-spring.xml b/galaxy-auth-center/config/logback-spring.xml
index 1f82763..1f82763 100644
--- a/galaxy-auth-center/src/main/resources/logback-spring.xml
+++ b/galaxy-auth-center/config/logback-spring.xml
diff --git a/galaxy-data-engine/src/main/resources/application-dev.properties b/galaxy-data-engine/config/application-dev.properties
index c5b34bf..c5b34bf 100644
--- a/galaxy-data-engine/src/main/resources/application-dev.properties
+++ b/galaxy-data-engine/config/application-dev.properties
diff --git a/galaxy-data-engine/src/main/resources/application-prod.properties b/galaxy-data-engine/config/application-prod.properties
index c5b34bf..79b944d 100644
--- a/galaxy-data-engine/src/main/resources/application-prod.properties
+++ b/galaxy-data-engine/config/application-prod.properties
@@ -52,4 +52,4 @@ 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
+iplearning.uniqciprecent=-24
diff --git a/galaxy-data-engine/src/main/resources/application-test.properties b/galaxy-data-engine/config/application-test.properties
index c5b34bf..c5b34bf 100644
--- a/galaxy-data-engine/src/main/resources/application-test.properties
+++ b/galaxy-data-engine/config/application-test.properties
diff --git a/galaxy-data-engine/src/main/resources/application.properties b/galaxy-data-engine/config/application.properties
index 5208294..ff7981e 100644
--- a/galaxy-data-engine/src/main/resources/application.properties
+++ b/galaxy-data-engine/config/application.properties
@@ -3,4 +3,4 @@ spring.profiles.active=dev
 #Ӧ����������
 spring.application.name=galaxy-data-engine
 #��־�����ļ�·��
-logging.config=classpath:logback-spring.xml
\ No newline at end of file
+logging.config=./config/logback-spring.xml
\ No newline at end of file
diff --git a/galaxy-data-engine/src/main/resources/logback-spring.xml b/galaxy-data-engine/config/logback-spring.xml
index 9f21922..9f21922 100644
--- a/galaxy-data-engine/src/main/resources/logback-spring.xml
+++ b/galaxy-data-engine/config/logback-spring.xml
diff --git a/mmdb/asn_v4.mmdb b/galaxy-data-engine/mmdb/asn_v4.mmdb
index 4508ea2..4508ea2 100644
--- a/mmdb/asn_v4.mmdb
+++ b/galaxy-data-engine/mmdb/asn_v4.mmdb
diff --git a/mmdb/asn_v6.mmdb b/galaxy-data-engine/mmdb/asn_v6.mmdb
index a779312..a779312 100644
--- a/mmdb/asn_v6.mmdb
+++ b/galaxy-data-engine/mmdb/asn_v6.mmdb
diff --git a/mmdb/ip_private_v4.mmdb b/galaxy-data-engine/mmdb/ip_private_v4.mmdb
index 445f2aa..445f2aa 100644
--- a/mmdb/ip_private_v4.mmdb
+++ b/galaxy-data-engine/mmdb/ip_private_v4.mmdb
diff --git a/mmdb/ip_private_v6.mmdb b/galaxy-data-engine/mmdb/ip_private_v6.mmdb
index cf82ebe..cf82ebe 100644
--- a/mmdb/ip_private_v6.mmdb
+++ b/galaxy-data-engine/mmdb/ip_private_v6.mmdb
diff --git a/mmdb/ip_v4.mmdb b/galaxy-data-engine/mmdb/ip_v4.mmdb
index 842cce9..842cce9 100644
--- a/mmdb/ip_v4.mmdb
+++ b/galaxy-data-engine/mmdb/ip_v4.mmdb
diff --git a/mmdb/ip_v6.mmdb b/galaxy-data-engine/mmdb/ip_v6.mmdb
index cf82ebe..cf82ebe 100644
--- a/mmdb/ip_v6.mmdb
+++ b/galaxy-data-engine/mmdb/ip_v6.mmdb
diff --git a/schema/clickhouse/active_defence_event_log.avsc b/galaxy-data-engine/schema/clickhouse/active_defence_event_log.avsc
index d21aca3..d21aca3 100644
--- a/schema/clickhouse/active_defence_event_log.avsc
+++ b/galaxy-data-engine/schema/clickhouse/active_defence_event_log.avsc
diff --git a/schema/clickhouse/connection_record_log.avsc b/galaxy-data-engine/schema/clickhouse/connection_record_log.avsc
index 0956ae5..0956ae5 100644
--- a/schema/clickhouse/connection_record_log.avsc
+++ b/galaxy-data-engine/schema/clickhouse/connection_record_log.avsc
diff --git a/schema/clickhouse/connection_record_log_common_client_ip.avsc b/galaxy-data-engine/schema/clickhouse/connection_record_log_common_client_ip.avsc
index 76eb947..76eb947 100644
--- a/schema/clickhouse/connection_record_log_common_client_ip.avsc
+++ b/galaxy-data-engine/schema/clickhouse/connection_record_log_common_client_ip.avsc
diff --git a/schema/clickhouse/connection_record_log_common_server_ip.avsc b/galaxy-data-engine/schema/clickhouse/connection_record_log_common_server_ip.avsc
index 9e717ee..9e717ee 100644
--- a/schema/clickhouse/connection_record_log_common_server_ip.avsc
+++ b/galaxy-data-engine/schema/clickhouse/connection_record_log_common_server_ip.avsc
diff --git a/schema/clickhouse/connection_record_log_common_subscriber_id.avsc b/galaxy-data-engine/schema/clickhouse/connection_record_log_common_subscriber_id.avsc
index f8b0167..f8b0167 100644
--- a/schema/clickhouse/connection_record_log_common_subscriber_id.avsc
+++ b/galaxy-data-engine/schema/clickhouse/connection_record_log_common_subscriber_id.avsc
diff --git a/schema/clickhouse/connection_record_log_http_domain.avsc b/galaxy-data-engine/schema/clickhouse/connection_record_log_http_domain.avsc
index 5d6ba28..5d6ba28 100644
--- a/schema/clickhouse/connection_record_log_http_domain.avsc
+++ b/galaxy-data-engine/schema/clickhouse/connection_record_log_http_domain.avsc
diff --git a/schema/clickhouse/connection_sketch.avsc b/galaxy-data-engine/schema/clickhouse/connection_sketch.avsc
index acc87c8..acc87c8 100644
--- a/schema/clickhouse/connection_sketch.avsc
+++ b/galaxy-data-engine/schema/clickhouse/connection_sketch.avsc
diff --git a/schema/clickhouse/processes.avsc b/galaxy-data-engine/schema/clickhouse/processes.avsc
index 75d74a9..75d74a9 100644
--- a/schema/clickhouse/processes.avsc
+++ b/galaxy-data-engine/schema/clickhouse/processes.avsc
diff --git a/schema/clickhouse/proxy_event_log.avsc b/galaxy-data-engine/schema/clickhouse/proxy_event_log.avsc
index 834e3b2..834e3b2 100644
--- a/schema/clickhouse/proxy_event_log.avsc
+++ b/galaxy-data-engine/schema/clickhouse/proxy_event_log.avsc
diff --git a/schema/clickhouse/proxy_ip_info.avsc b/galaxy-data-engine/schema/clickhouse/proxy_ip_info.avsc
index 87797bd..87797bd 100644
--- a/schema/clickhouse/proxy_ip_info.avsc
+++ b/galaxy-data-engine/schema/clickhouse/proxy_ip_info.avsc
diff --git a/schema/clickhouse/query_log.avsc b/galaxy-data-engine/schema/clickhouse/query_log.avsc
index 4f5e8d5..4f5e8d5 100644
--- a/schema/clickhouse/query_log.avsc
+++ b/galaxy-data-engine/schema/clickhouse/query_log.avsc
diff --git a/schema/clickhouse/radius_onff_log.avsc b/galaxy-data-engine/schema/clickhouse/radius_onff_log.avsc
index 0e475c4..0e475c4 100644
--- a/schema/clickhouse/radius_onff_log.avsc
+++ b/galaxy-data-engine/schema/clickhouse/radius_onff_log.avsc
diff --git a/schema/clickhouse/radius_record_log.avsc b/galaxy-data-engine/schema/clickhouse/radius_record_log.avsc
index 981a031..981a031 100644
--- a/schema/clickhouse/radius_record_log.avsc
+++ b/galaxy-data-engine/schema/clickhouse/radius_record_log.avsc
diff --git a/schema/clickhouse/security_event_log.avsc b/galaxy-data-engine/schema/clickhouse/security_event_log.avsc
index 0a58bca..0a58bca 100644
--- a/schema/clickhouse/security_event_log.avsc
+++ b/galaxy-data-engine/schema/clickhouse/security_event_log.avsc
diff --git a/schema/clickhouse/security_ip_info.avsc b/galaxy-data-engine/schema/clickhouse/security_ip_info.avsc
index e4d8ad9..e4d8ad9 100644
--- a/schema/clickhouse/security_ip_info.avsc
+++ b/galaxy-data-engine/schema/clickhouse/security_ip_info.avsc
diff --git a/schema/clickhouse/security_website_domain_info.avsc b/galaxy-data-engine/schema/clickhouse/security_website_domain_info.avsc
index be084e6..be084e6 100644
--- a/schema/clickhouse/security_website_domain_info.avsc
+++ b/galaxy-data-engine/schema/clickhouse/security_website_domain_info.avsc
diff --git a/schema/clickhouse/sys_packet_capture_log.avsc b/galaxy-data-engine/schema/clickhouse/sys_packet_capture_log.avsc
index 73d3c42..73d3c42 100644
--- a/schema/clickhouse/sys_packet_capture_log.avsc
+++ b/galaxy-data-engine/schema/clickhouse/sys_packet_capture_log.avsc
diff --git a/schema/druid/injection_metrics_log.avsc b/galaxy-data-engine/schema/druid/injection_metrics_log.avsc
index 9e932bf..9e932bf 100644
--- a/schema/druid/injection_metrics_log.avsc
+++ b/galaxy-data-engine/schema/druid/injection_metrics_log.avsc
diff --git a/schema/druid/proxy_event_hits_log.avsc b/galaxy-data-engine/schema/druid/proxy_event_hits_log.avsc
index f6f700c..f6f700c 100644
--- a/schema/druid/proxy_event_hits_log.avsc
+++ b/galaxy-data-engine/schema/druid/proxy_event_hits_log.avsc
diff --git a/schema/druid/security_event_hits_log.avsc b/galaxy-data-engine/schema/druid/security_event_hits_log.avsc
index 906921e..906921e 100644
--- a/schema/druid/security_event_hits_log.avsc
+++ b/galaxy-data-engine/schema/druid/security_event_hits_log.avsc
diff --git a/schema/druid/source_country_ip_num_log.avsc b/galaxy-data-engine/schema/druid/source_country_ip_num_log.avsc
index 908fa08..908fa08 100644
--- a/schema/druid/source_country_ip_num_log.avsc
+++ b/galaxy-data-engine/schema/druid/source_country_ip_num_log.avsc
diff --git a/schema/druid/sys_storage_log.avsc b/galaxy-data-engine/schema/druid/sys_storage_log.avsc
index 61e0efe..61e0efe 100644
--- a/schema/druid/sys_storage_log.avsc
+++ b/galaxy-data-engine/schema/druid/sys_storage_log.avsc
diff --git a/schema/druid/top_domain_recommend_daily_log.avsc b/galaxy-data-engine/schema/druid/top_domain_recommend_daily_log.avsc
index 76766b5..76766b5 100644
--- a/schema/druid/top_domain_recommend_daily_log.avsc
+++ b/galaxy-data-engine/schema/druid/top_domain_recommend_daily_log.avsc
diff --git a/schema/druid/top_external_host_log.avsc b/galaxy-data-engine/schema/druid/top_external_host_log.avsc
index 700e774..700e774 100644
--- a/schema/druid/top_external_host_log.avsc
+++ b/galaxy-data-engine/schema/druid/top_external_host_log.avsc
diff --git a/schema/druid/top_internal_host_log.avsc b/galaxy-data-engine/schema/druid/top_internal_host_log.avsc
index 8ecf953..8ecf953 100644
--- a/schema/druid/top_internal_host_log.avsc
+++ b/galaxy-data-engine/schema/druid/top_internal_host_log.avsc
diff --git a/schema/druid/top_urls_log.avsc b/galaxy-data-engine/schema/druid/top_urls_log.avsc
index 44b5dbd..44b5dbd 100644
--- a/schema/druid/top_urls_log.avsc
+++ b/galaxy-data-engine/schema/druid/top_urls_log.avsc
diff --git a/schema/druid/top_user_log.avsc b/galaxy-data-engine/schema/druid/top_user_log.avsc
index 1f8dc0f..1f8dc0f 100644
--- a/schema/druid/top_user_log.avsc
+++ b/galaxy-data-engine/schema/druid/top_user_log.avsc
diff --git a/schema/druid/top_website_domain_log.avsc b/galaxy-data-engine/schema/druid/top_website_domain_log.avsc
index b6bfc7f..b6bfc7f 100644
--- a/schema/druid/top_website_domain_log.avsc
+++ b/galaxy-data-engine/schema/druid/top_website_domain_log.avsc
diff --git a/schema/druid/top_website_urls_daily_log.avsc b/galaxy-data-engine/schema/druid/top_website_urls_daily_log.avsc
index 5679d14..5679d14 100644
--- a/schema/druid/top_website_urls_daily_log.avsc
+++ b/galaxy-data-engine/schema/druid/top_website_urls_daily_log.avsc
diff --git a/schema/druid/traffic_metrics_log.avsc b/galaxy-data-engine/schema/druid/traffic_metrics_log.avsc
index f6df6d1..f6df6d1 100644
--- a/schema/druid/traffic_metrics_log.avsc
+++ b/galaxy-data-engine/schema/druid/traffic_metrics_log.avsc
diff --git a/schema/druid/traffic_protocol_stat_log.avsc b/galaxy-data-engine/schema/druid/traffic_protocol_stat_log.avsc
index 9eaf478..9eaf478 100644
--- a/schema/druid/traffic_protocol_stat_log.avsc
+++ b/galaxy-data-engine/schema/druid/traffic_protocol_stat_log.avsc
diff --git a/schema/druid/traffic_summary_log.avsc b/galaxy-data-engine/schema/druid/traffic_summary_log.avsc
index 7536304..7536304 100644
--- a/schema/druid/traffic_summary_log.avsc
+++ b/galaxy-data-engine/schema/druid/traffic_summary_log.avsc
diff --git a/schema/memory-schema.json b/galaxy-data-engine/schema/memory-schema.json
index 4880e0d..4880e0d 100644
--- a/schema/memory-schema.json
+++ b/galaxy-data-engine/schema/memory-schema.json
diff --git a/galaxy-eureka-server/src/main/resources/application-dev.properties b/galaxy-eureka-server/config/application-dev.properties
index f8afbd0..f8afbd0 100644
--- a/galaxy-eureka-server/src/main/resources/application-dev.properties
+++ b/galaxy-eureka-server/config/application-dev.properties
diff --git a/galaxy-eureka-server/src/main/resources/application-prod.properties b/galaxy-eureka-server/config/application-prod.properties
index f8afbd0..f8afbd0 100644
--- a/galaxy-eureka-server/src/main/resources/application-prod.properties
+++ b/galaxy-eureka-server/config/application-prod.properties
diff --git a/galaxy-eureka-server/src/main/resources/application-test.properties b/galaxy-eureka-server/config/application-test.properties
index f8afbd0..f8afbd0 100644
--- a/galaxy-eureka-server/src/main/resources/application-test.properties
+++ b/galaxy-eureka-server/config/application-test.properties
diff --git a/galaxy-eureka-server/src/main/resources/application.properties b/galaxy-eureka-server/config/application.properties
index 2664b33..18f95f0 100644
--- a/galaxy-eureka-server/src/main/resources/application.properties
+++ b/galaxy-eureka-server/config/application.properties
@@ -3,4 +3,4 @@ spring.profiles.active=dev
 #Ӧ����������
 spring.application.name=galaxy-eureka-server
 #��־�����ļ�·��
-logging.config=classpath:logback-spring.xml
\ No newline at end of file
+logging.config=./config/logback-spring.xml
\ No newline at end of file
diff --git a/galaxy-eureka-server/src/main/resources/logback-spring.xml b/galaxy-eureka-server/config/logback-spring.xml
index 19082f4..19082f4 100644
--- a/galaxy-eureka-server/src/main/resources/logback-spring.xml
+++ b/galaxy-eureka-server/config/logback-spring.xml
diff --git a/galaxy-gateway/src/main/resources/application-dev.properties b/galaxy-gateway/config/application-dev.properties
index dcded34..e783bf0 100644
--- a/galaxy-gateway/src/main/resources/application-dev.properties
+++ b/galaxy-gateway/config/application-dev.properties
@@ -16,6 +16,10 @@ 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
diff --git a/galaxy-gateway/src/main/resources/application-prod.properties b/galaxy-gateway/config/application-prod.properties
index dcded34..e783bf0 100644
--- a/galaxy-gateway/src/main/resources/application-prod.properties
+++ b/galaxy-gateway/config/application-prod.properties
@@ -16,6 +16,10 @@ 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
diff --git a/galaxy-gateway/src/main/resources/application-test.properties b/galaxy-gateway/config/application-test.properties
index dcded34..e783bf0 100644
--- a/galaxy-gateway/src/main/resources/application-test.properties
+++ b/galaxy-gateway/config/application-test.properties
@@ -16,6 +16,10 @@ 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
diff --git a/galaxy-gateway/src/main/resources/application.properties b/galaxy-gateway/config/application.properties
index 74daf5d..de8c07d 100644
--- a/galaxy-gateway/src/main/resources/application.properties
+++ b/galaxy-gateway/config/application.properties
@@ -3,4 +3,4 @@ spring.profiles.active=dev
 #Ӧ����������
 spring.application.name=galaxy-gateway
 #��־�����ļ�·��
-logging.config=classpath:logback-spring.xml
\ No newline at end of file
+logging.config=./config/logback-spring.xml
\ No newline at end of file
diff --git a/galaxy-gateway/src/main/resources/logback-spring.xml b/galaxy-gateway/config/logback-spring.xml
index c1a8ce4..c1a8ce4 100644
--- a/galaxy-gateway/src/main/resources/logback-spring.xml
+++ b/galaxy-gateway/config/logback-spring.xml