From 2925d46a0725ef6777294be96250db83d521487b Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Tue, 23 May 2023 19:31:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pqs-auth/Dockerfile | 19 +++++++----- pqs-auth/pom.xml | 10 ------ pqs-device/device-boot/Dockerfile | 15 ++++++--- pqs-device/pms-device/pms-device-boot/pom.xml | 10 ------ pqs-device/pq-device/pq-device-boot/pom.xml | 10 ------ .../service/impl/TerminalBaseServiceImpl.java | 31 ++++++++++--------- pqs-energy/energy-boot/Dockerfile | 13 ++++++-- pqs-energy/energy-boot/pom.xml | 10 ------ pqs-event/event-boot/Dockerfile | 16 +++++++--- pqs-gateway/Dockerfile | 16 +++++++--- .../java/com/njcn/gateway/utils/IpUtils.java | 8 ++--- pqs-harmonic/harmonic-boot/Dockerfile | 15 ++++++--- .../service/impl/CustomReportServiceImpl.java | 14 ++++++--- pqs-job/job-admin/Dockerfile | 16 +++++++--- pqs-job/job-executor/Dockerfile | 13 ++++++-- pqs-prepare/prepare-api/pom.xml | 10 ------ pqs-prepare/prepare-boot/Dockerfile | 13 ++++++-- pqs-prepare/prepare-boot/pom.xml | 5 +++ .../com/njcn/prepare/PrepareApplication.java | 1 + pqs-process/process-boot/Dockerfile | 15 ++++++--- pqs-system/system-boot/Dockerfile | 15 ++++++--- pqs-user/user-boot/Dockerfile | 16 +++++++--- 22 files changed, 166 insertions(+), 125 deletions(-) diff --git a/pqs-auth/Dockerfile b/pqs-auth/Dockerfile index 5ef77123e..5ee6b6a27 100644 --- a/pqs-auth/Dockerfile +++ b/pqs-auth/Dockerfile @@ -1,9 +1,12 @@ -FROM openjdk:8-jdk-alpine -#作者MAINTAINER Wu Jize #指定阿里镜象 -RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories -RUN set -xe \&& apk --no-cache add ttf-dejavu fontconfig +FROM eclipse-temurin:8-jdk-ubi9-minimal +MAINTAINER hongawen_13914774158@163.com +ENV JAVA_OPTS="-Xms1024m -Xmx1024m" +# 挂载时区的目录 +VOLUME /usr/share/zoneinfo +# 设置时区为上海 +ENV TZ=Asia/Shanghai +# 设置时区信息 +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone ADD target/auth.jar auth.jar -ENTRYPOINT ["java","-jar","/auth.jar"] -EXPOSE 10214 -RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone - +ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /auth.jar +EXPOSE 10214 \ No newline at end of file diff --git a/pqs-auth/pom.xml b/pqs-auth/pom.xml index 88cb7c86a..78b6e2a15 100644 --- a/pqs-auth/pom.xml +++ b/pqs-auth/pom.xml @@ -21,16 +21,6 @@ com.njcn common-web ${project.version} - - - org.slf4j - slf4j-log4j12 - - - ch.qos.logback - logback-classic - - com.njcn diff --git a/pqs-device/device-boot/Dockerfile b/pqs-device/device-boot/Dockerfile index ace3f1820..0b02179a8 100644 --- a/pqs-device/device-boot/Dockerfile +++ b/pqs-device/device-boot/Dockerfile @@ -1,5 +1,12 @@ -FROM openjdk:8-jdk-alpine +FROM eclipse-temurin:8-jdk-ubi9-minimal +MAINTAINER hongawen_13914774158@163.com +ENV JAVA_OPTS="-Xms1024m -Xmx1024m" +# 挂载时区的目录 +VOLUME /usr/share/zoneinfo +# 设置时区为上海 +ENV TZ=Asia/Shanghai +# 设置时区信息 +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone ADD target/deviceboot.jar deviceboot.jar -ENTRYPOINT ["java","-jar","/deviceboot.jar"] -EXPOSE 10202 -RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone \ No newline at end of file +ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /deviceboot.jar +EXPOSE 10202 \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-boot/pom.xml b/pqs-device/pms-device/pms-device-boot/pom.xml index dde0351fa..262f0ea71 100644 --- a/pqs-device/pms-device/pms-device-boot/pom.xml +++ b/pqs-device/pms-device/pms-device-boot/pom.xml @@ -39,16 +39,6 @@ com.njcn common-web ${project.version} - - - org.slf4j - slf4j-log4j12 - - - ch.qos.logback - logback-classic - - com.njcn diff --git a/pqs-device/pq-device/pq-device-boot/pom.xml b/pqs-device/pq-device/pq-device-boot/pom.xml index 3fad2704d..63bbe2463 100644 --- a/pqs-device/pq-device/pq-device-boot/pom.xml +++ b/pqs-device/pq-device/pq-device-boot/pom.xml @@ -38,16 +38,6 @@ com.njcn common-web ${project.version} - - - org.slf4j - slf4j-log4j12 - - - ch.qos.logback - logback-classic - - com.njcn diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java index c91e963c3..9cf1200af 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java @@ -1649,7 +1649,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple private String saveTerminalInfo(List oracleTerminalExcels, List overLimitExcels) { List oracleTerminalExcelMsg = new ArrayList<>(); //任意集合数据为空，不处理 - if (CollectionUtil.isNotEmpty(oracleTerminalExcels) && CollectionUtil.isNotEmpty(overLimitExcels)) { + if (CollectionUtil.isNotEmpty(oracleTerminalExcels)) { Line temp; List pids = new ArrayList<>(); for (OracleTerminalExcel oracleTerminalExcel : oracleTerminalExcels) { @@ -1865,15 +1865,15 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple } } //获取该监测点的限值数据 - List overLimitList = overLimitExcels.stream() - .filter(overLimitExcel -> overLimitExcel.getId().equals(oracleTerminalExcel.getId())) - .collect(Collectors.toList()); - if (CollectionUtil.isEmpty(overLimitList)) { - oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "没有找到该监测点的限值数据")); - //删除刚刚新增装置信息 - this.baseMapper.deleteById(temp.getId()); - continue; - } +// List overLimitList = overLimitExcels.stream() +// .filter(overLimitExcel -> overLimitExcel.getId().equals(oracleTerminalExcel.getId())) +// .collect(Collectors.toList()); +// if (CollectionUtil.isEmpty(overLimitList)) { +// oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "没有找到该监测点的限值数据")); +// //删除刚刚新增装置信息 +// this.baseMapper.deleteById(temp.getId()); +// continue; +// } lineDetail.setNum(oracleTerminalExcel.getLineNum()); //干扰源类型 DictData loadTypeDicData = dicDataFeignClient.getDicDataByName(oracleTerminalExcel.getLoadType()).getData(); @@ -1910,15 +1910,16 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple lineBak.setLineId(oracleTerminalExcel.getId()); lineBakService.removeById(oracleTerminalExcel.getId()); lineBakService.save(lineBak); - OverLimitExcel overLimitExcel = overLimitList.get(0); - Overlimit overlimit = new Overlimit(); - BeanUtils.copyProperties(overLimitExcel, overlimit); - overlimit.setId(temp.getId()); - overlimitMapper.insert(overlimit); +// OverLimitExcel overLimitExcel = overLimitList.get(0); +// Overlimit overlimit = new Overlimit(); +// BeanUtils.copyProperties(overLimitExcel, overlimit); +// overlimit.setId(temp.getId()); +// overlimitMapper.insert(overlimit); } } } //错误信息不为空，则以excel的形式输出到前台 + this.updatePqOverLimit(); if (CollectionUtil.isNotEmpty(oracleTerminalExcelMsg)) { ExcelUtil.exportExcel("失败列表.xlsx", OracleTerminalExcel.OracleTerminalExcelMsg.class, oracleTerminalExcelMsg); return null; diff --git a/pqs-energy/energy-boot/Dockerfile b/pqs-energy/energy-boot/Dockerfile index 78e1fb5e1..af80c6c31 100644 --- a/pqs-energy/energy-boot/Dockerfile +++ b/pqs-energy/energy-boot/Dockerfile @@ -1,6 +1,13 @@ -FROM openjdk:8-jdk-alpine +FROM eclipse-temurin:8-jdk-ubi9-minimal +MAINTAINER hongawen_13914774158@163.com +ENV JAVA_OPTS="-Xms1024m -Xmx1024m" +# 挂载时区的目录 +VOLUME /usr/share/zoneinfo +# 设置时区为上海 +ENV TZ=Asia/Shanghai +# 设置时区信息 +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone ADD target/energyboot.jar energyboot.jar -ENTRYPOINT ["java","-jar","/energyboot.jar"] +ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /energyboot.jar EXPOSE 10208 -RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone diff --git a/pqs-energy/energy-boot/pom.xml b/pqs-energy/energy-boot/pom.xml index bc59987f8..0bdd127ab 100644 --- a/pqs-energy/energy-boot/pom.xml +++ b/pqs-energy/energy-boot/pom.xml @@ -42,16 +42,6 @@ com.njcn common-web ${project.version} - - - org.slf4j - slf4j-log4j12 - - - ch.qos.logback - logback-classic - - com.njcn diff --git a/pqs-event/event-boot/Dockerfile b/pqs-event/event-boot/Dockerfile index b28e85f76..4f8fc8a5e 100644 --- a/pqs-event/event-boot/Dockerfile +++ b/pqs-event/event-boot/Dockerfile @@ -1,7 +1,15 @@ -FROM openjdk:8-jdk-alpine -RUN mkdir -p /usr/local/comtrate +FROM eclipse-temurin:8-jdk-ubi9-minimal +MAINTAINER hongawen_13914774158@163.com +ENV JAVA_OPTS="-Xms1024m -Xmx1024m" +# 挂载时区的目录 +VOLUME /usr/share/zoneinfo +# 设置时区为上海 +ENV TZ=Asia/Shanghai +# 设置时区信息 +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone ADD target/eventboot.jar eventboot.jar -ENTRYPOINT ["java","-jar","/eventboot.jar"] +ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /eventboot.jar EXPOSE 10203 -RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone + + diff --git a/pqs-gateway/Dockerfile b/pqs-gateway/Dockerfile index 3674aea5c..1cb87d651 100644 --- a/pqs-gateway/Dockerfile +++ b/pqs-gateway/Dockerfile @@ -1,6 +1,12 @@ -FROM openjdk:8-jdk-alpine +FROM eclipse-temurin:8-jdk-ubi9-minimal +MAINTAINER hongawen_13914774158@163.com +ENV JAVA_OPTS="-Xms1024m -Xmx1024m" +# 挂载时区的目录 +VOLUME /usr/share/zoneinfo +# 设置时区为上海 +ENV TZ=Asia/Shanghai +# 设置时区信息 +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone ADD target/gateway.jar gateway.jar -ENTRYPOINT ["java","-jar","/gateway.jar"] -EXPOSE 10215 -RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone - +ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /gateway.jar +EXPOSE 10215 \ No newline at end of file diff --git a/pqs-gateway/src/main/java/com/njcn/gateway/utils/IpUtils.java b/pqs-gateway/src/main/java/com/njcn/gateway/utils/IpUtils.java index f01039dbe..3dd6a3a93 100644 --- a/pqs-gateway/src/main/java/com/njcn/gateway/utils/IpUtils.java +++ b/pqs-gateway/src/main/java/com/njcn/gateway/utils/IpUtils.java @@ -45,13 +45,13 @@ public class IpUtils { public static String getRealIpAddress(ServerHttpRequest request) { HttpHeaders headers = request.getHeaders(); String ipAddress = headers.getFirst(HEADER_X_FORWARDED_FOR); - log.error("X-Forwarded-For:"+ipAddress); +// log.error("X-Forwarded-For:"+ipAddress); ipAddress = headers.getFirst("X-Real-IP"); - log.error("X-Real-IP:"+ipAddress); +// log.error("X-Real-IP:"+ipAddress); ipAddress = headers.getFirst("Proxy-Client-IP"); - log.error("Proxy-Client-IP:"+ipAddress); +// log.error("Proxy-Client-IP:"+ipAddress); ipAddress = headers.getFirst("REMOTE-HOST"); - log.error("REMOTE-HOST:"+ipAddress); +// log.error("REMOTE-HOST:"+ipAddress); if (StrUtil.isBlankIfStr(ipAddress) || UNKNOWN.equalsIgnoreCase(ipAddress)) { ipAddress = headers.getFirst(HEADER_PROXY_CLIENT_IP); } diff --git a/pqs-harmonic/harmonic-boot/Dockerfile b/pqs-harmonic/harmonic-boot/Dockerfile index f81e9f0fc..3db9bf9d1 100644 --- a/pqs-harmonic/harmonic-boot/Dockerfile +++ b/pqs-harmonic/harmonic-boot/Dockerfile @@ -1,5 +1,12 @@ -FROM openjdk:8-jdk-alpine +FROM eclipse-temurin:8-jdk-ubi9-minimal +MAINTAINER hongawen_13914774158@163.com +ENV JAVA_OPTS="-Xms1024m -Xmx1024m" +# 挂载时区的目录 +VOLUME /usr/share/zoneinfo +# 设置时区为上海 +ENV TZ=Asia/Shanghai +# 设置时区信息 +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone ADD target/harmonicboot.jar harmonicboot.jar -ENTRYPOINT ["java","-jar","/harmonicboot.jar"] -EXPOSE 10204 -RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone \ No newline at end of file +ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /harmonicboot.jar +EXPOSE 10204 \ No newline at end of file diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java index edcdaebbc..abc502fed 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java @@ -242,9 +242,9 @@ public class CustomReportServiceImpl implements CustomReportService { //报表日期 .eq(ExcelRpt::getDataDate, reportSearchParam.getStartTime()); try { - ExcelRpt excelRpts = excelRptMapper.selectOne(lambdaQuery); - if (Objects.nonNull(excelRpts)) { - fileStorageUtil.downloadStream(response, excelRpts.getContent()); + List excelRpts = excelRptMapper.selectList(lambdaQuery); + if (CollUtil.isNotEmpty(excelRpts)) { + fileStorageUtil.downloadStream(response, excelRpts.get(0).getContent()); } else { fileStorageUtil.downloadStream(response, analyzeReport(reportSearchParam, excelRptTemp)); } @@ -467,7 +467,7 @@ public class CustomReportServiceImpl implements CustomReportService { InputStream reportStream = IoUtil.toStream(jsonArray.toString(), CharsetUtil.UTF_8); String newContent = fileStorageUtil.uploadStream(reportStream, OssPath.HARMONIC_EXCEL_REPORT, FileUtil.generateFileName("json")); - //存入报表库 + //入库前判断是否有了，有了就更新 ExcelRpt excelRpt = new ExcelRpt(); excelRpt.setName(excelRptTemp.getName()); excelRpt.setLineId(reportSearchParam.getLineId()); @@ -524,6 +524,7 @@ public class CustomReportServiceImpl implements CustomReportService { .append(InfluxDBSqlConstant.QM); } + //data_flicker、data_fluc、data_plt 无 value_type if (!InfluxDBTableConstant.DATA_FLICKER.equals(data.getClassId()) && !InfluxDBTableConstant.DATA_FLUC.equals(data.getClassId()) && !InfluxDBTableConstant.DATA_PLT.equals(data.getClassId())) { sql.append(InfluxDBSqlConstant.AND) @@ -541,6 +542,11 @@ public class CustomReportServiceImpl implements CustomReportService { .append(InfluxDBSqlConstant.TIME).append(InfluxDBSqlConstant.LT).append(InfluxDBSqlConstant.QM).append(reportSearchParam.getEndTime()).append(InfluxDBSqlConstant.END_TIME).append(InfluxDBSqlConstant.QM); sql.append(InfluxDBSqlConstant.TZ); + + if(data.getClassId().equals(InfluxDBTableConstant.DATA_PLT)){ + System.out.println(sql); + } + //根据不同的库表赋值 QueryResult queryResult = influxDbUtils.query(String.valueOf(sql)); diff --git a/pqs-job/job-admin/Dockerfile b/pqs-job/job-admin/Dockerfile index 0a1f1f431..e0a8fb850 100644 --- a/pqs-job/job-admin/Dockerfile +++ b/pqs-job/job-admin/Dockerfile @@ -1,6 +1,12 @@ -FROM openjdk:8-jdk-alpine +FROM eclipse-temurin:8-jdk-ubi9-minimal +MAINTAINER hongawen_13914774158@163.com +ENV JAVA_OPTS="-Xms1024m -Xmx1024m" +# 挂载时区的目录 +VOLUME /usr/share/zoneinfo +# 设置时区为上海 +ENV TZ=Asia/Shanghai +# 设置时区信息 +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone ADD target/job-admin.jar job-admin.jar -ENTRYPOINT ["java","-jar","/job-admin.jar"] -EXPOSE 10217 -RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone - +ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /job-admin.jar +EXPOSE 10217 \ No newline at end of file diff --git a/pqs-job/job-executor/Dockerfile b/pqs-job/job-executor/Dockerfile index ac596e0af..cae2fc0be 100644 --- a/pqs-job/job-executor/Dockerfile +++ b/pqs-job/job-executor/Dockerfile @@ -1,6 +1,13 @@ -FROM openjdk:8-jdk-alpine +FROM eclipse-temurin:8-jdk-ubi9-minimal +MAINTAINER hongawen_13914774158@163.com +ENV JAVA_OPTS="-Xms1024m -Xmx1024m" +# 挂载时区的目录 +VOLUME /usr/share/zoneinfo +# 设置时区为上海 +ENV TZ=Asia/Shanghai +# 设置时区信息 +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone ADD target/job-executor.jar job-executor.jar -ENTRYPOINT ["java","-jar","/job-executor.jar"] +ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /job-executor.jar EXPOSE 10218 -RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone diff --git a/pqs-prepare/prepare-api/pom.xml b/pqs-prepare/prepare-api/pom.xml index 1c5d7c32b..03b87c456 100644 --- a/pqs-prepare/prepare-api/pom.xml +++ b/pqs-prepare/prepare-api/pom.xml @@ -33,16 +33,6 @@ com.njcn common-web ${project.version} - - - org.slf4j - slf4j-log4j12 - - - ch.qos.logback - logback-classic - - diff --git a/pqs-prepare/prepare-boot/Dockerfile b/pqs-prepare/prepare-boot/Dockerfile index 2f5582cfe..9c4378037 100644 --- a/pqs-prepare/prepare-boot/Dockerfile +++ b/pqs-prepare/prepare-boot/Dockerfile @@ -1,5 +1,12 @@ -FROM openjdk:8-jdk-alpine +FROM eclipse-temurin:8-jdk-ubi9-minimal +MAINTAINER hongawen_13914774158@163.com +ENV JAVA_OPTS="-Xms1024m -Xmx1024m" +# 挂载时区的目录 +VOLUME /usr/share/zoneinfo +# 设置时区为上海 +ENV TZ=Asia/Shanghai +# 设置时区信息 +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone ADD target/prepareboot.jar prepareboot.jar -ENTRYPOINT ["java","-jar","/prepareboot.jar"] +ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /prepareboot.jar EXPOSE 10221 -RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone diff --git a/pqs-prepare/prepare-boot/pom.xml b/pqs-prepare/prepare-boot/pom.xml index b41c95056..ae88621a6 100644 --- a/pqs-prepare/prepare-boot/pom.xml +++ b/pqs-prepare/prepare-boot/pom.xml @@ -165,6 +165,11 @@ process-api 1.0.0 + + + + + diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/PrepareApplication.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/PrepareApplication.java index c9aa86347..bc639fb61 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/PrepareApplication.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/PrepareApplication.java @@ -6,6 +6,7 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.DependsOn; /** * @author hongawen diff --git a/pqs-process/process-boot/Dockerfile b/pqs-process/process-boot/Dockerfile index c542f6c44..e146c2c14 100644 --- a/pqs-process/process-boot/Dockerfile +++ b/pqs-process/process-boot/Dockerfile @@ -1,5 +1,12 @@ -FROM openjdk:8-jdk-alpine +FROM eclipse-temurin:8-jdk-ubi9-minimal +MAINTAINER hongawen_13914774158@163.com +ENV JAVA_OPTS="-Xms1024m -Xmx1024m" +# 挂载时区的目录 +VOLUME /usr/share/zoneinfo +# 设置时区为上海 +ENV TZ=Asia/Shanghai +# 设置时区信息 +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone ADD target/processboot.jar processboot.jar -ENTRYPOINT ["java","-jar","/processboot.jar"] -EXPOSE 10222 -RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone +ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /processboot.jar +EXPOSE 10222 \ No newline at end of file diff --git a/pqs-system/system-boot/Dockerfile b/pqs-system/system-boot/Dockerfile index 395942857..ee65df1a3 100644 --- a/pqs-system/system-boot/Dockerfile +++ b/pqs-system/system-boot/Dockerfile @@ -1,5 +1,12 @@ -FROM openjdk:8-jdk-alpine +FROM eclipse-temurin:8-jdk-ubi9-minimal +MAINTAINER hongawen_13914774158@163.com +ENV JAVA_OPTS="-Xms1024m -Xmx1024m" +# 挂载时区的目录 +VOLUME /usr/share/zoneinfo +# 设置时区为上海 +ENV TZ=Asia/Shanghai +# 设置时区信息 +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone ADD target/systemboot.jar systemboot.jar -ENTRYPOINT ["java","-jar","/systemboot.jar"] -EXPOSE 10207 -RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone \ No newline at end of file +ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /systemboot.jar +EXPOSE 10207 \ No newline at end of file diff --git a/pqs-user/user-boot/Dockerfile b/pqs-user/user-boot/Dockerfile index 8e3a7083a..e9fc063ff 100644 --- a/pqs-user/user-boot/Dockerfile +++ b/pqs-user/user-boot/Dockerfile @@ -1,6 +1,12 @@ -FROM openjdk:8-jdk-alpine +FROM eclipse-temurin:8-jdk-ubi9-minimal +MAINTAINER hongawen_13914774158@163.com +ENV JAVA_OPTS="-Xms1024m -Xmx1024m" +# 挂载时区的目录 +VOLUME /usr/share/zoneinfo +# 设置时区为上海 +ENV TZ=Asia/Shanghai +# 设置时区信息 +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone ADD target/userboot.jar userboot.jar -ENTRYPOINT ["java","-jar","/userboot.jar"] -EXPOSE 10201 -RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone - +ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /userboot.jar +EXPOSE 10201 \ No newline at end of file