From 7b71c68479b6508e7e58ef45f2cf63fd32243784 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 22 Mar 2022 17:49:30 +0800
Subject: [PATCH] Dockerfile 修改
---
Dockerfile | 2 +-
src/main/resources/application-test.yml | 10 +++++-----
src/main/resources/application.yml | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index c01f796..5141d05 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@
EXPOSE 81
#启动自行加载 服务名-prod.yml配置
-ENV PARAMS="--server.port=81 --spring.profiles.active=prod"
+ENV PARAMS="--server.port=81 --spring.profiles.active=test"
RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
COPY target/zhbaw.jar /app.jar
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 4da746c..f32e76d 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -13,8 +13,8 @@
# commandTimeout: 5000
datasource:
# MySql
- url: jdbc:mysql://localhost:3306/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
- username: root
+ url: jdbc:mysql://192.168.0.191:3306/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ username: zhbaw
password: 123456
# PostgreSQL
@@ -39,7 +39,7 @@
#ftp 设置
ftp:
- sqlConnect: jdbc:mysql://223.82.109.183:2083/zhbaw-test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ sqlConnect: jdbc:mysql://192.168.0.191:3306/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
ftpHost: 192.168.0.198
ftpPort: 21
ftpUserName: arsn
@@ -48,8 +48,8 @@
localPath: E:\\anbao\\
ip: http://223.82.109.183:2081
jsonUrl: E:\\anbao\\
- username: root
- password: ZHba@0112
+ username: zhbaw
+ password: 123456
qfqkBaseApiUrl: http://192.168.0.198:83
# qfqkBaseApiUrl : http://223.82.109.183:2082/api
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a6756d4..8ab2e94 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -116,7 +116,7 @@
#报表配置
report:
- enabled: false
+ enabled: true
database:
provider:
prefix: blade-
--
Gitblit v1.9.3