From b19777e7f005fe2cbcd6ec711882dd16aa213290 Mon Sep 17 00:00:00 2001 From: pangshenghao Date: Fri, 14 Jul 2023 10:27:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E9=83=A8=E7=BD=B2=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=8C=E5=90=8C=E6=AD=A5=E7=8E=B0?= =?UTF-8?q?=E5=9C=BAprod=EF=BC=8Clms=E6=97=A0=E8=BE=93=E5=87=BA=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- acs/hd/nladmin-system/pom.xml | 10 +++++++ .../task/service/impl/TaskServiceImpl.java | 2 ++ .../resources/config/application-prod.yml | 8 +++--- .../main/resources/config/application-dev.yml | 2 +- .../resources/config/application-prod.yml | 6 ++--- .../src/main/resources/logback-spring.xml | 26 +++++++++++++++++-- 6 files changed, 44 insertions(+), 10 deletions(-) diff --git a/acs/hd/nladmin-system/pom.xml b/acs/hd/nladmin-system/pom.xml index a6dc1ef..ba51eb0 100644 --- a/acs/hd/nladmin-system/pom.xml +++ b/acs/hd/nladmin-system/pom.xml @@ -20,6 +20,12 @@ + + org.bouncycastle + bcprov-jdk15on + 1.50 + + net.logstash.logback logstash-logback-encoder @@ -213,6 +219,10 @@ guava 29.0-jre + + org.projectlombok + lombok + diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 12f3429..546a307 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -47,6 +47,7 @@ import org.nl.wql.WQL; import org.nl.wql.core.bean.WQLObject; import org.nl.wql.util.WqlUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -85,6 +86,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { private final DeviceAssignedService deviceAssignedService; @Autowired + @Lazy private InstructionService instructionService; private final StorageCellService storageCellService; diff --git a/acs/hd/nladmin-system/src/main/resources/config/application-prod.yml b/acs/hd/nladmin-system/src/main/resources/config/application-prod.yml index fec9f7c..974150b 100644 --- a/acs/hd/nladmin-system/src/main/resources/config/application-prod.yml +++ b/acs/hd/nladmin-system/src/main/resources/config/application-prod.yml @@ -8,11 +8,11 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:lnsh_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true - # url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:rljn_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true + # url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true username: ${DB_USER:root} # password: ${DB_PWD:P@ssw0rd} - password: ${DB_PWD:Root.123456} + password: ${DB_PWD:123456} # password: ${DB_PWD:123456} # 初始连接数 initial-size: 5 @@ -63,7 +63,7 @@ spring: database: ${REDIS_DB:2} host: ${REDIS_HOST:127.0.0.1} port: ${REDIS_PORT:6379} - password: ${REDIS_PWD:} + #password: ${REDIS_PWD:} #连接超时时间 timeout: 5000 # 登录相关配置 diff --git a/lms/hd/nladmin-system/src/main/resources/config/application-dev.yml b/lms/hd/nladmin-system/src/main/resources/config/application-dev.yml index b8c3fa4..dda1a6f 100644 --- a/lms/hd/nladmin-system/src/main/resources/config/application-dev.yml +++ b/lms/hd/nladmin-system/src/main/resources/config/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 8010 + port: 8011 #海亮sqlserver erp: sqlserver: diff --git a/lms/hd/nladmin-system/src/main/resources/config/application-prod.yml b/lms/hd/nladmin-system/src/main/resources/config/application-prod.yml index d9faa99..8ac5fdc 100644 --- a/lms/hd/nladmin-system/src/main/resources/config/application-prod.yml +++ b/lms/hd/nladmin-system/src/main/resources/config/application-prod.yml @@ -8,10 +8,10 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.225}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false + url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false&allowPublicKeyRetrieval=true username: ${DB_USER:root} password: ${DB_PWD:123456} - #password: ${DB_PWD:Root.123456} + #password: ${DB_PWD:123456} # 初始连接数 initial-size: 5 # 最小连接数 @@ -58,7 +58,7 @@ spring: redis: #数据库索引 database: ${REDIS_DB:6} - host: ${REDIS_HOST:192.168.46.225} + host: ${REDIS_HOST:127.0.0.1} #host: ${REDIS_HOST:localhost} port: ${REDIS_PORT:6379} password: ${REDIS_PWD:} diff --git a/lms/hd/nladmin-system/src/main/resources/logback-spring.xml b/lms/hd/nladmin-system/src/main/resources/logback-spring.xml index a45bcd6..d74fc23 100644 --- a/lms/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/lms/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -115,9 +115,31 @@ https://juejin.cn/post/6844903775631572999 - - + + + + + + + + + + + + + + + + + + + + + + + +