From e7162a67b1b6b47b28d4fd4f68f652d960640fb6 Mon Sep 17 00:00:00 2001 From: ludj Date: Mon, 19 Dec 2022 20:27:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/config/application-prod.yml | 11 +++++------ .../src/main/resources/config/application.yml | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml b/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml index f6f93752..7cbb6672 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml @@ -8,10 +8,10 @@ erp: username: erp password: erp sqlserver: - enabled: false - jdbcurl: jdbc:sqlserver://47.97.157.227:1433;DatabaseName=testdb-lx - username: sa - password: Nl@123 + enabled: true + jdbcurl: jdbc:sqlserver://10.14.0.174:1433;DatabaseName=wcs-xr + username: mes + password: 123456 #配置数据源 spring: datasource: @@ -68,7 +68,6 @@ spring: database: ${REDIS_DB:15} host: ${REDIS_HOST:10.16.1.25} port: ${REDIS_PORT:6379} - password: ${REDIS_PWD:} #连接超时时间 timeout: 5000 redisson: @@ -165,4 +164,4 @@ file: logging: file: path: /app/jar/logs - config: classpath:logback-spring.xml + config: classpath:logback-spring.xml \ No newline at end of file diff --git a/mes/hd/nladmin-system/src/main/resources/config/application.yml b/mes/hd/nladmin-system/src/main/resources/config/application.yml index e1f8184a..9534dc3c 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application.yml @@ -2,7 +2,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev + active: prod jackson: time-zone: GMT+8 data: