From 3a16c873425ac7af6622d25813fed03022014132 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 07 二月 2025 08:49:33 +0800
Subject: [PATCH] zjh20250207
---
ltkj-admin/src/main/resources/application-test.yml | 2 +-
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/DictHosp.java | 3 +++
ltkj-admin/src/main/resources/application.yml | 20 +++++---------------
ltkj-admin/src/main/resources/application-dev.yml | 2 +-
ltkj-admin/src/main/resources/application-prod.yml | 2 +-
5 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/ltkj-admin/src/main/resources/application-dev.yml b/ltkj-admin/src/main/resources/application-dev.yml
index beec389..f58b1b2 100644
--- a/ltkj-admin/src/main/resources/application-dev.yml
+++ b/ltkj-admin/src/main/resources/application-dev.yml
@@ -21,7 +21,7 @@
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 5011
+ port: 5000
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /
diff --git a/ltkj-admin/src/main/resources/application-prod.yml b/ltkj-admin/src/main/resources/application-prod.yml
index 28ec201..d9e6174 100644
--- a/ltkj-admin/src/main/resources/application-prod.yml
+++ b/ltkj-admin/src/main/resources/application-prod.yml
@@ -21,7 +21,7 @@
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 5000
+ port: 5001
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /ltkj-admin
diff --git a/ltkj-admin/src/main/resources/application-test.yml b/ltkj-admin/src/main/resources/application-test.yml
index c8ad41b..7b30897 100644
--- a/ltkj-admin/src/main/resources/application-test.yml
+++ b/ltkj-admin/src/main/resources/application-test.yml
@@ -21,7 +21,7 @@
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 5001
+ port: 5002
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /ltkj-admin
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index bf60c66..2ac5edf 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -1,19 +1,9 @@
# Spring閰嶇疆
-#dev 鍏徃 寮�鍙�/閮ㄧ讲浣跨敤
-#prod 娉惧窛鍘块儴缃叉寮忕幆澧冧娇鐢�(灏忕▼搴忕涔熷彲浣跨敤)
-#test 娉惧窛鍘块儴缃叉祴璇曠幆澧冧娇鐢�
-# linux-prod
-# linux-test
-# linux-mjprod
-# linux-mjtest
-# win-xamjyyprod
-# win-xamjyytest
-# win-chkwyyprod
-# win-pbkwyyprod
-# 闄曞仴鍖绘緞鍚堢熆鍔″眬涓績鍖婚櫌姝ｅ紡 5001
-# 闄曞仴鍖绘緞鍚堢熆鍔″眬涓績鍖婚櫌娴嬭瘯 5002
-# 闄曡タ瑗垮畨鐓ゆ満鍖婚櫌姝ｅ紡 5003
-# 闄曡タ瑗垮畨鐓ゆ満鍖婚櫌娴嬭瘯 5004
+#dev 鍏徃 寮�鍙�/閮ㄧ讲浣跨敤 5000
+#prod 娉惧窛鍘块儴缃叉寮忕幆澧冧娇鐢�(灏忕▼搴忕涔熷彲浣跨敤) 5001
+#test 娉惧窛鍘块儴缃叉祴璇曠幆澧冧娇鐢� 5002
+# linux-prod 5001
+# linux-test 5002
spring:
profiles:
active: dev
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/DictHosp.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/DictHosp.java
index d8de12f..c1de204 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/DictHosp.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/DictHosp.java
@@ -173,6 +173,9 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date expirationTime;
+// 鏁版嵁搴撳悕
+ private String database;
+
@Override
public String toString() {
--
Gitblit v1.8.0