From 9553e19e92ce5cec07b2b665b193d81644d63d06 Mon Sep 17 00:00:00 2001 From: "udf_admin@163.com" Date: Sat, 10 Nov 2018 22:26:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- udf-server/pom.xml | 35 ------------- .../main/resources/bootstrap-dev.properties | 51 +++++-------------- .../src/main/resources/bootstrap.properties | 14 ++--- .../src/main/resources/build_qa.sh | 45 ---------------- udf-starter/pom.xml | 15 ------ 5 files changed, 19 insertions(+), 141 deletions(-) delete mode 100644 udf-server/udf-eureka-server/src/main/resources/build_qa.sh diff --git a/udf-server/pom.xml b/udf-server/pom.xml index 60ba09a..8f943ab 100644 --- a/udf-server/pom.xml +++ b/udf-server/pom.xml @@ -24,33 +24,6 @@ udf-eureka-server - - - - - dev - - true - - - dev - - - - - qa - - qa - - - - - pe - - pe - - - @@ -106,14 +79,6 @@ - - - - - - - diff --git a/udf-server/udf-eureka-server/src/main/resources/bootstrap-dev.properties b/udf-server/udf-eureka-server/src/main/resources/bootstrap-dev.properties index 8cfb66c..04dd69e 100644 --- a/udf-server/udf-eureka-server/src/main/resources/bootstrap-dev.properties +++ b/udf-server/udf-eureka-server/src/main/resources/bootstrap-dev.properties @@ -1,12 +1,12 @@ -######################################################## -###security (must reboot) -######################################################## -spring.security.user.name=admin -spring.security.user.password=123456 +# ---------------------------------------- +# CORE PROPERTIES +# ---------------------------------------- +debug=false +trace=false ######################################################## ###eureka.environment ( EurekaServerBootstrap ) (must reboot) ######################################################## -eureka.environment=${spring.profiles.active} +#eureka.environment=${spring.profiles.active} ######################################################## ###eureka.instance ( EurekaInstanceConfigBean ) (must reboot) ######################################################## @@ -15,56 +15,29 @@ eureka.instance.preferIpAddress=true ###eureka.client (EurekaClientConfigBean , EurekaServerConfigBean ) (must reboot) ######################################################## eureka.client.enabled=true -eureka.client.serviceUrl.defaultZone=http://admin:123456@127.0.0.1:${server.port}/eureka/ +eureka.client.serviceUrl.defaultZone=http://127.0.0.1:${server.port}/eureka/ eureka.client.register-with-eureka=true eureka.client.fetch-registry=true ######################################################## -###spring.cloud.config.server ( ConfigServerProperties ) -######################################################## -spring.cloud.config.server.prefix=config-server -######################################################## -###spring.cloud.config.server.git ( MultipleJGitEnvironmentRepository ) ({application}/{profile}/{label}) -######################################################## -spring.cloud.config.server.git.uri=https://gitee.com/wangkang/udf.git -spring.cloud.config.server.git.searchPaths=udf-config-repository/{application} -spring.cloud.config.server.git.defaultLabel=master -spring.cloud.config.server.git.forcePull=true -spring.cloud.config.server.git.username=udf_admin@163.com -spring.cloud.config.server.git.password=123456!@#$%^ -######################################################## -###spring.rabbitmq ( RabbitProperties ) -######################################################## -spring.rabbitmq.host=itkk.org -spring.rabbitmq.port=5672 -spring.rabbitmq.username=dev_udf_sample_api -spring.rabbitmq.password=1qazxsw2 -spring.rabbitmq.virtual-host=/dev_udf_sample_api -spring.rabbitmq.template.retry.enabled=true -######################################################## -###org.itkk.application.config (ApplicationConfig) -######################################################## -org.itkk.application.config.outputExceptionStackTrace=true -org.itkk.application.config.threadPool.poolSize=100 -######################################################## ###LOGGING (must reboot) ######################################################## logging.file=d:/develop/application-log/${spring.application.name}_${server.port}_${spring.profiles.active}/base.log ######################################################## ###GZIP (ServerProperties) ((must reboot) ######################################################## -server.compression.enabled=true -server.compression.mime-types=text/html,text/xml,text/plain,text/css,text/javascript,application/javascript,application/json +#server.compression.enabled=true +#server.compression.mime-types=text/html,text/xml,text/plain,text/css,text/javascript,application/javascript,application/json ######################################################## ###SPRING MVC (WebMvcProperties) (must reboot) ######################################################## -spring.mvc.async.request-timeout=-1 -spring.mandatory-file-encoding=${org.itkk.application.config.encoding} +#spring.mvc.async.request-timeout=-1 +#spring.mandatory-file-encoding=${org.itkk.application.config.encoding} ######################################################## ###JACKSON ( JacksonProperties ) ######################################################## #spring.jackson.dateFormat=${org.itkk.application.config.dateFormat} #spring.jackson.jodaDateTimeFormat=${org.itkk.application.config.dateFormat} -spring.jackson.timeZone=${org.itkk.application.config.timeZone} +#spring.jackson.timeZone=${org.itkk.application.config.timeZone} spring.jackson.serialization.INDENT_OUTPUT=true spring.jackson.serialization.FAIL_ON_EMPTY_BEANS=true spring.jackson.deserialization.FAIL_ON_UNKNOWN_PROPERTIES=true diff --git a/udf-server/udf-eureka-server/src/main/resources/bootstrap.properties b/udf-server/udf-eureka-server/src/main/resources/bootstrap.properties index 584bf18..691c915 100644 --- a/udf-server/udf-eureka-server/src/main/resources/bootstrap.properties +++ b/udf-server/udf-eureka-server/src/main/resources/bootstrap.properties @@ -20,19 +20,19 @@ server.port=${server.port} ######################################################## ###MANAGEMENT (ManagementServerProperties) ######################################################## -management.security.enabled=false +#management.security.enabled=false ######################################################## ###PROFILES ######################################################## -spring.profiles.active=${profiles.activation} +#spring.profiles.active=${profiles.activation} ######################################################## ###org.itkk.application.config (ApplicationConfig) (must reboot) ######################################################## -org.itkk.application.config.encoding=UTF-8 -org.itkk.application.config.timeZone=Asia/Shanghai -org.itkk.application.config.dateFormat=yyyy-MM-dd'T'HH:mm:ss:SSSZ +#org.itkk.application.config.encoding=UTF-8 +#org.itkk.application.config.timeZone=Asia/Shanghai +#org.itkk.application.config.dateFormat=yyyy-MM-dd'T'HH:mm:ss:SSSZ ######################################################## ### shutdown ######################################################## -management.endpoint.shutdown.enabled=true -management.server.port=${management.port} \ No newline at end of file +#management.endpoint.shutdown.enabled=true +#management.server.port=${management.port} \ No newline at end of file diff --git a/udf-server/udf-eureka-server/src/main/resources/build_qa.sh b/udf-server/udf-eureka-server/src/main/resources/build_qa.sh deleted file mode 100644 index f20dd0b..0000000 --- a/udf-server/udf-eureka-server/src/main/resources/build_qa.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -base_path="udf-server" - -echo 'shutdown application begin' -returnCode=`curl -I -s -X POST "http://127.0.0.1:${management.port}/shutdown"|head -1|cut -d" " -f2` -echo "shutdown status code : $returnCode" -sleep 5 -echo 'shutdown application end' - -echo 'stop application begin' - PID=$(ps -ef | grep ${project.name}-${project.version}.jar | grep -v grep | awk '{ print $2 }') - if [ -z "$PID" ] - then - echo 'application is already stopped' - else - echo kill $PID - kill -9 $PID - fi - rm -rf /${base_path}/${project.name}-${project.version}.jar -echo 'stop application end' - -echo 'clean copy application begin' -rm -rf /${base_path}/${project.name}-${project.version}.jar -cp ../${project.name}-${project.version}.jar /${base_path}/${project.name}-${project.version}.jar -echo 'copy application end' - -echo 'start application begin' -nohup java -server -Xms256m -Xmx256m -XX:+UseG1GC -jar /${base_path}/${project.name}-${project.version}.jar --spring.profiles.active=qa & -echo 'start application end' - -echo 'sleep 60ms begin' -sleep 60 -echo 'sleep 60ms end' - -echo 'check service begin' -returnCode=`curl -I -s "http://127.0.0.1:${management.port}/info"|head -1|cut -d" " -f2` -if [ "$returnCode" == "200" ] -then - echo "service has started"; -else - echo "service has error or start time out of 60ms"; - exit 1; -fi -echo 'check service end' \ No newline at end of file diff --git a/udf-starter/pom.xml b/udf-starter/pom.xml index 7334040..de3951e 100644 --- a/udf-starter/pom.xml +++ b/udf-starter/pom.xml @@ -81,14 +81,6 @@ - - - - - - - @@ -109,9 +101,6 @@ true - - @@ -139,9 +128,5 @@ true - -