From 279b381d288cf6d1358408684d308d50ef3dd7a5 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 03 十一月 2023 09:10:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mes-web/src/main/resources/bootstrap.yml | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/mes-web/src/main/resources/bootstrap.yml b/mes-web/src/main/resources/bootstrap.yml
index 4ada563..8947b51 100644
--- a/mes-web/src/main/resources/bootstrap.yml
+++ b/mes-web/src/main/resources/bootstrap.yml
@@ -1,14 +1,14 @@
server:
- port: 6060
+ port: 6066
spring:
datasource:
druid:
username: postgres
# password: postgres123
- password: 123456
+ password: root2022
# 灏勯寮�鍙戞暟鎹簱
- url: jdbc:postgresql://114.132.189.42:9005/zs_db
+ url: jdbc:postgresql://106.13.194.57:9015/postgres
application:
name: ztt-mes
cloud:
@@ -17,7 +17,7 @@
# password: nacos
password: zttZTT123!
discovery:
- server-addr: 127.0.0.1:8848
+ server-addr: 106.13.194.57:8848
metadata:
# VERSION: 10.88.15.224
VERSION: 127.0.0.1
@@ -36,7 +36,6 @@
mybatis-plus:
configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
#erpBase: http://localhost:7071/zbgj
--
Gitblit v1.9.3