diff --git a/.idea/BeidouAstPos.iml b/.idea/BeidouAstPos.iml index 8d37387..1876644 100644 --- a/.idea/BeidouAstPos.iml +++ b/.idea/BeidouAstPos.iml @@ -18,25 +18,26 @@ - - - + + + + - - - - - + + + + + - - - - + + + + - - - + + + @@ -44,63 +45,63 @@ - + - - - + + + - + - + - + - - + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - - - + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3dd8917..3c856cf 100644 --- a/pom.xml +++ b/pom.xml @@ -58,6 +58,10 @@ true + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + org.apache.commons diff --git a/setup_dev.sh b/setup_dev.sh index bf815d6..cd01441 100644 --- a/setup_dev.sh +++ b/setup_dev.sh @@ -4,7 +4,7 @@ mvn package -Dmaven.test.skip=true #image_version=$(date +%Y%m%d%H%M) image_version=$version -docker cp docker_jenkins:/var/jenkins_home/workspace/beidou_ast/target/beidouast.jar /usr/local/beidou_ast/beidou_ast.jar +docker cp docker_jenkins:/var/jenkins_home/workspace/BeidouAstPos/target/beidouast.jar /usr/local/beidou_ast/beidouast.jar #docker stop dipperposition_service || true #docker rm dipperposition_service || true @@ -60,5 +60,5 @@ docker cp docker_jenkins:/var/jenkins_home/workspace/beidou_ast/target/beidouast echo '=================启动NettyAPP=======================' ps -ef |grep beidou |awk '{print $2}'|xargs kill -9 -java -jar -Xms256m -Xmx256m -Xss256k -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=512m /usr/local/beidou_ast/beidouast.jar +java -jar -Xms256m -Xmx256m -Xss256k -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=512m /usr/local/beidou_ast/beidouast.jar --spring.profiles.active=dev echo '=================完成NettyAPP启动=======================' diff --git a/src/main/resources/bootstrap-dev.yaml b/src/main/resources/bootstrap-dev.yaml new file mode 100644 index 0000000..eafa131 --- /dev/null +++ b/src/main/resources/bootstrap-dev.yaml @@ -0,0 +1,69 @@ +logging: + config: classpath:log/logback-spring.xml + level: + com: + telpo: + dipperposition: debug +spring: + application: + name: dipperposition-service + redis: + database: 1 + host: 172.16.192.26 + port: 8090 + password: telpo#1234 + timeout: 3000 + lettuce: + pool: + max-active: 100 # 连接池最大连接数(使用负值表示没有限制) + max-idle: 100 # 连接池中的最大空闲连接 + min-idle: 50 # 连接池中的最小空闲连接 + max-wait: 6000 # 连接池最大阻塞等待时间(使用负值表示没有限制) + +scheduler: + pool: + size: 2 + #等待任务完成退出最大秒数 + await-seconds: 600 + task: + cron: "0 0 1 * * ?" + +pos: + centerProvinceFilePath: /csv/provinceLonAlt.csv + ipPositionRequestPath: https://restapi.amap.com/v3/ip + ipPositionRequestKey: 65e794b0a1a4b87eeec86f93fea05411 + centerProvince: 湖北省 + ast: + server: agnss.techtotop.com + ephAstPort: 8012 + ephAstHexPort: 9012 + timeout: 30000 + +position-server: + serverAddr: localhost + timeAsycPort: 9011 + posAsycPort: 9013 + starsAsycPort: 9012 + +mongo: + datasource: + dblist: + - uri: mongodb://wangjx:wangjx#1234@172.16.192.26:27017/basicdata + database: basicdata + - uri: mongodb://wangjx:wangjx#1234@172.16.192.26:27017/common + database: common + + +OkHttp-config: + pool: + max-conn: 200 + keep-alive: 5 + read-timeout: 10 + conn-timeout: 10 + write-timeout: 10 + +async: + pool: + corePoolSize: 4 + maxPoolSize: 8 + queueCapacity: 5000 \ No newline at end of file