From 2b0dc519ddc4fefcabc7f60dcda4968964155e11 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 17 十一月 2023 16:45:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mes-web/src/main/resources/bootstrap.yml | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/mes-web/src/main/resources/bootstrap.yml b/mes-web/src/main/resources/bootstrap.yml
index 4ada563..b3510fa 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: zsAdmin123!
# 灏勯寮�鍙戞暟鎹簱
- url: jdbc:postgresql://114.132.189.42:9005/zs_db
+ url: jdbc:postgresql://10.1.51.136:5432/zs_dev
application:
name: ztt-mes
cloud:
@@ -36,7 +36,6 @@
mybatis-plus:
configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
#erpBase: http://localhost:7071/zbgj
--
Gitblit v1.9.3