From fd5f0214474764b8c9b9b68d26d2d8fccb70a334 Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期三, 29 三月 2023 22:30:21 +0800
Subject: [PATCH] init
---
DispatchTravel/guns-admin/docker/Dockerfile | 4 +---
DispatchTravel/guns-admin/src/main/resources/application.yml | 18 ++++++++++--------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/DispatchTravel/guns-admin/docker/Dockerfile b/DispatchTravel/guns-admin/docker/Dockerfile
index b06a0c4..77c6052 100644
--- a/DispatchTravel/guns-admin/docker/Dockerfile
+++ b/DispatchTravel/guns-admin/docker/Dockerfile
@@ -10,6 +10,4 @@
EXPOSE 5003
ENV JAVA_OPTS="-Xmx400m -Xms400m -Djava.security.egd=file:/dev/./urandom"
# 配置容器启动后执行的命令
-ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /server.jar","--spring.profiles.active=prod"]
-
-#ENTRYPOINT ["java","-Xmx400m","-Xms400m", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/server.jar", "--spring.profiles.active=prod"]
+ENTRYPOINT ["java","-Xmx400m","-Xms400m", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/server.jar", "--spring.profiles.active=prod"]
diff --git a/DispatchTravel/guns-admin/src/main/resources/application.yml b/DispatchTravel/guns-admin/src/main/resources/application.yml
index 7586877..d575e12 100644
--- a/DispatchTravel/guns-admin/src/main/resources/application.yml
+++ b/DispatchTravel/guns-admin/src/main/resources/application.yml
@@ -87,20 +87,21 @@
+
---
spring:
profiles: dev
datasource:
- url: jdbc:mysql://192.168.5.102:3306/jyxtravel-sjdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://127.0.0.1:3306/kuanzhaiyx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: 123456
- db-name: jyxtravel-sjdb #用来搜集数据库的所有表
+ db-name: kuanzhaiyx #用来搜集数据库的所有表
filters: wall,mergeStat
#多数据源情况的配置
guns:
muti-datasource:
open: false
- url: jdbc:mysql://127.0.0.1:3306/kuanzhaiyx?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+ url: jdbc:mysql://127.0.0.1:3306/kuanzhaiyx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
username: root
# password: Root2020!
password: 123456
@@ -111,18 +112,19 @@
spring:
profiles: prod
datasource:
- url: jdbc:mysql://172.18.0.4:10011/kuanzhaiyx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowPublicKeyRetrieval=true&&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://122.9.140.208:10010/kuanzhaiyx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
username: root
- password: kuanzhaiyx
- db-name: kuanzhaiyx #用来搜集数据库的所有表
+ password: 123456
+ db-name: 123456 #用来搜集数据库的所有表
filters: wall,mergeStat
#多数据源情况的配置
guns:
muti-datasource:
open: false
- url: jdbc:mysql://172.18.0.4:10011/kuanzhaiyx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowPublicKeyRetrieval=true&&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://122.9.140.208:10010/kuanzhaiyx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
username: root
- password: kuanzhaiyx
+ # password: Root2020!
+ password: 123456
dataSourceNames:
- dataSourceGuns
- dataSourceBiz
--
Gitblit v1.7.1