diff --git a/pom.xml b/pom.xml index 9ae26f0..a56dba9 100644 --- a/pom.xml +++ b/pom.xml @@ -40,6 +40,12 @@ true + + + com.telpo + common + 1.1.19 + com.alibaba.cloud @@ -93,12 +99,6 @@ 4.1.13.Final - - com.telpo - common - 1.1.19 - - org.springframework.boot @@ -132,6 +132,12 @@ 2.0 + + com.mongodb + mongo + 1.0 + + diff --git a/setup_dev.sh b/setup_dev.sh index 3dfc300..ccac94b 100644 --- a/setup_dev.sh +++ b/setup_dev.sh @@ -3,25 +3,61 @@ mvn clean mvn package -Dmaven.test.skip=true #image_version=$(date +%Y%m%d%H%M) image_version=$version -docker stop dipperposition_service || true -docker rm dipperposition_service || true + +docker cp docker-jenkin:/var/jenkins_home/workspace/dipperpos_service/target/dipperposition.jar /home/data/dipperposition/dipperposition.jar +#docker stop dipperposition_service || true +#docker rm dipperposition_service || true # 删除镜像 -docker rmi -f $(docker images | grep telpo/dipperposition_service | awk '{print $3}') +#docker rmi -f $(docker images | grep telpo/dipperposition_service | awk '{print $3}') -docker build . -t telpo/dipperposition_service:$image_version +#docker build . -t telpo/dipperposition_service:$image_version #TODO:推送镜像到私有仓库 -echo '=================开始推送镜像=======================' -docker tag telpo/dipperposition_service:$image_version 139.224.254.18:5000/dipperposition_service:$image_version -docker push 139.224.254.18:5000/dipperposition_service:$image_version -echo '=================推送镜像完成=======================' +#echo '=================开始推送镜像=======================' +#docker tag telpo/dipperposition_service:$image_version 139.224.254.18:5000/dipperposition_service:$image_version +#docker push 139.224.254.18:5000/dipperposition_service:$image_version +#echo '=================推送镜像完成=======================' #删除产生的None镜像 -docker rmi -f $(docker images | grep none | awk '{print $3}') +#docker rmi -f $(docker images | grep none | awk '{print $3}') # 查看镜像列表 -docker images +#docker images # 启动容器 -docker run -v /home/data/dipperposition/log:/var/log/dipperposition -d -e active=dev --network host --restart=always -p 9011:9011 -p 9012:9012 -p 9013:9013 --name dipperposition_service 139.224.254.18:5000/dipperposition_service:$image_version +#docker run -v /home/data/dipperposition/log:/var/log/dipperposition -d -e active=dev --network host --restart=always +# -p 9011:9011 -p 9012:9012 -p 9013:9013 --name dipperposition_service 139.224.254.18:5000/dipperposition_service:$image_version + +#echo "scp ${WORKSPACE} files......begin" +#set passwd "telpo#1234" +#scp /var/jenkins_home/workspace/dipperpos_service/target/dipperposition.jar root@47.116.142.20:/home/data/dipperposition/dipperposition.jar +#expect { +# "密码：" +# { +# send "$passwd\n" +# } +# "pass" +# { +# send "$passwd\n" +# } +# +# "yes/no" +# { +# sleep 5 +# send_user "send yes" +# send "yes\n" +# } +# eof +# { +# sleep 5 +# send_user "eof\n" +# } +#} +#send "exit\r" +#expect eof +#echo "scp ${WORKSPACE} files......end" # 查看日志 # docker logs dipperposition_service + +echo '=================启动NettyAPP=======================' +java -jar -Xms256m -Xmx256m -Xss256k -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=512m /home/data/dipperposition/dipperposition.jar +echo '=================完成NettyAPP启动=======================' diff --git a/src/main/java/com/telpo/dipperposition/DipperPositionApplication.java b/src/main/java/com/telpo/dipperposition/DipperPositionApplication.java index bc64010..38c509d 100644 --- a/src/main/java/com/telpo/dipperposition/DipperPositionApplication.java +++ b/src/main/java/com/telpo/dipperposition/DipperPositionApplication.java @@ -44,12 +44,7 @@ public class DipperPositionApplication { log.info("北斗定位服务启动!"); //启动服务端 ConfigurableEnvironment environment = applicationContext.getEnvironment(); - //log.info(environment.toString()); - //log.info(environment.getProperty("position-server")); - //PositionConfigInfo pci; - //pci = (PositionConfigInfo)environment.getProperty("position-server"); DipperPositionServer nettyServer = new DipperPositionServer(environment); - //log.info(environment.getSystemProperties().toString()); nettyServer.start2(); } catch (Exception e) { log.error(e.getMessage()); diff --git a/src/main/java/com/telpo/dipperposition/common/TimeTools.java b/src/main/java/com/telpo/dipperposition/common/TimeTools.java deleted file mode 100644 index f23879c..0000000 --- a/src/main/java/com/telpo/dipperposition/common/TimeTools.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.telpo.dipperposition.common; - -import tools.CommonTools; - -import java.time.LocalTime; -import java.time.format.DateTimeFormatter; - -/** - * @program: DataPushServer - * @description: 时间工具类 - * @author: linwl - * @create: 2020-08-05 11:16 - */ -public class TimeTools { - - private TimeTools() {} - - /** - * 校验时间段 - * - * @param startTime 起始时间 HH:mm - * @param endTime 结束时间 HH:mm - * @return - */ - public static boolean checkTime(String startTime, String endTime) { - boolean result = false; - DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("HH:mm"); - LocalTime pushStartTime = LocalTime.parse(startTime, dateTimeFormatter); - LocalTime pushEndTime = LocalTime.parse(endTime, dateTimeFormatter); - LocalTime zeroTime = LocalTime.parse("00:00"); - if (zeroTime.equals(pushEndTime)) { - pushEndTime = pushEndTime.plusNanos(-10); - } - if (CommonTools.checkInTime(pushStartTime, pushEndTime)) { - result = true; - } - return result; - } -} diff --git a/src/main/resources/bootstrap.yaml b/src/main/resources/bootstrap.yaml index 66034b2..9ea575b 100644 --- a/src/main/resources/bootstrap.yaml +++ b/src/main/resources/bootstrap.yaml @@ -1,20 +1,36 @@ +logging: + config: classpath:log/logback-spring.xml + level: + com: + telpo: + dipperposition: + server: debug + common: debug + service: debug + handler: debug spring: - main: - allow-bean-definition-overriding: true application: name: dipperposition-service - cloud: - nacos: - config: - server-addr: 172.16.192.26:8848 - file-extension: yaml + redis: + database: 1 + host: 172.19.42.44 + 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: - pool: - size: 2 - #等待任务完成退出最大秒数 - await-seconds: 600 - cron: "0 */30 * * * *" + cron: "0 0 1 * * ?" pos: centerProvinceFilePath: /csv/provinceLonAlt.csv @@ -28,7 +44,30 @@ pos: timeout: 30000 position-server: - serverAddr: 172.16.192.26 - timeAsycPort: 9011 - posAsycPort: 9013 - starsAsycPort: 9012 \ No newline at end of file + serverAddr: localhost + timeAsycPort: 9011 + posAsycPort: 9013 + starsAsycPort: 9012 + +mongo: + datasource: + dblist: + - uri: mongodb://wangjx:wangjx#1234@172.19.42.40:27018/basicdatatest + database: basicdata + - uri: mongodb://wangjx:wangjx#1234@172.19.42.40:27018/commontest + 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 diff --git a/src/main/resources/log/logback-spring.xml b/src/main/resources/log/logback-spring.xml index f4101af..4b080ce 100644 --- a/src/main/resources/log/logback-spring.xml +++ b/src/main/resources/log/logback-spring.xml @@ -7,7 +7,8 @@ - + +