From 1f23e7dfc186c65434eda46fd6756d41fd01e867 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 11 十一月 2026 00:00:37 +0800
Subject: [PATCH] ai优化
---
jh-server/src/main/resources/application-local.yaml | 29 ++++---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java | 73 ++++++++++++++++-
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueService.java | 12 +++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueAutoRefillJob.java | 80 ++++++++++++++++++++
jh-server/src/main/resources/application.yaml | 4
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java | 28 +++++++
6 files changed, 205 insertions(+), 21 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueAutoRefillJob.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueAutoRefillJob.java
new file mode 100644
index 0000000..ba07f01
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueAutoRefillJob.java
@@ -0,0 +1,80 @@
+package cn.lihu.jh.module.ecg.service.queue;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.annotation.Resource;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 銆岃嚜鍔ㄨˉ浜恒�嶅懆鏈熷厹搴曚换鍔°��
+ *
+ * <h3>涓轰粈涔堥渶瑕佸畠</h3>
+ * 鍒嗘祦锛坽@code 鎺掗槦涓�(10) 鈫� 鍊欒瘖涓�(20)}锛夊師鏈槸**绾簨浠堕┍鍔�**鐨勶紝鍙湪涓嬮潰杩欎簺鏃舵満璺戜竴娆★細
+ * <ul>
+ * <li>绛惧埌鏃� 鈥斺�� {@code AppointmentServiceImpl#appoitmentConfirm} 鈫� {@code queue()} 鈫� {@code startHurryUpOneCheckType}</li>
+ * <li>鍖荤敓鍏ュ骇 / 鎭㈠鎺ヨ瘖 / 鎵嬪姩寮�璇� / 鍙彿 / 妫�鏌ュ畬鎴� 鈥斺�� 鍚勮嚜 {@code startHurryUpOneBed}</li>
+ * <li>寮�璇� 路 鏈嶅姟閲嶅惎 路 璇婂閲嶇疆 鈥斺�� {@code startBedReload} 閲岀殑 {@code hurryupAllBed}</li>
+ * </ul>
+ * 涓�鏃︽煇娆¤Е鍙戞病鏈夎窇鍒帮紙浜嬪姟鏈彁浜ゅ氨鏌ュ簱銆佹墽琛屽櫒寮傚父銆佹湇鍔″垰濂藉湪閲嶅惎銆�
+ * 宸ヤ綅褰撴椂杩樻病杩涘垎娴侀槦鍒椻�︹�︼級锛屾偅鑰呭氨浼�**姘歌繙**鍋滃湪銆屾帓闃熶腑(鏈垎閰嶅伐浣�)銆嶏紝
+ * 鍙兘鐢卞尰鐢熷湪宸ヤ綔鍙版墜宸ョ偣銆屾媺鍏ャ�嶃��
+ *
+ * <p>鐜板満鍙嶉锛氳繍鍔ㄨ瘯楠岀鍒板悗鍑虹幇璇ョ幇璞★紙浣庨妫�鏌ラ」鐩紝鎵ц鍣ㄧ┖闂� 鈬�
+ * 鍒嗘祦浠诲姟蹇呯劧璺戝湪浜嬪姟鎻愪氦涔嬪墠锛岃 {@code QueueServiceImpl#runAfterCommit}锛夈��
+ *
+ * <h3>鍋氫簡浠�涔�</h3>
+ * 姣� {@value #INTERVAL_SECONDS} 绉掑**鎵�鏈夊紑璇婂伐浣�**瑙﹀彂涓�娆¤嚜鍔ㄨˉ浜恒��
+ * 鍙槸"澶氳窇涓�娆″箓绛夌殑琛ヤ汉"锛岄棬闂革紙鏈紑璇� / 鍋滄鍊欒瘖 / 鍊欒瘖鍖哄凡婊★級鍏ㄩ儴淇濇寔涓嶅彉锛�
+ * 鍥犳涓嶄細鏀瑰彉鏃㈡湁涓氬姟瑙勫垯锛屽彧鎶�"婕忕綉鐨勬帓闃熸偅鑰�"鍦� 1 鍒嗛挓鍐呰ˉ涓娿��
+ *
+ * <p>鐢ㄧ嫭绔嬬殑鍗曠嚎绋嬪畧鎶よ皟搴﹀櫒锛�**涓嶅崰鐢�** {@code DynamicSchedulingConfig} 閲�
+ * 閭d釜鍙湁 1 涓嚎绋嬬殑 cron 姹狅紙閬垮厤褰卞搷寮�璇�/闂瘖/姣忔棩閲嶇疆浠诲姟锛夈��
+ */
+@Component
+@Slf4j
+public class QueueAutoRefillJob {
+
+ /** 琛ヤ汉闂撮殧锛堢锛� */
+ private static final long INTERVAL_SECONDS = 60L;
+
+ /** 鍚姩鍚庨娆″欢杩燂紙绉掞級锛氶伩寮�鍚姩闃舵锛堟鏃惰繕娌″紑璇娿�佸伐浣嶄篃娌¤杞藉畬锛� */
+ private static final long INITIAL_DELAY_SECONDS = 60L;
+
+ @Resource
+ private QueueService queueService;
+
+ private ScheduledExecutorService scheduler;
+
+ @PostConstruct
+ public void start() {
+ scheduler = Executors.newSingleThreadScheduledExecutor(r -> {
+ Thread t = new Thread(r, "ecg-queue-auto-refill");
+ t.setDaemon(true);
+ return t;
+ });
+ scheduler.scheduleWithFixedDelay(() -> {
+ try {
+ // 寮傛鎶曢�掑埌 QueueServiceImpl 鐨勪覆琛屾墽琛屽櫒锛涜繖閲屽彧璐熻矗"鎸夋椂韪逛竴鑴�"
+ queueService.startHurryUpAll();
+ } catch (Exception e) {
+ log.error("[QueueAutoRefillJob] 鍛ㄦ湡琛ヤ汉瑙﹀彂寮傚父锛堜笅涓�杞户缁級", e);
+ }
+ }, INITIAL_DELAY_SECONDS, INTERVAL_SECONDS, TimeUnit.SECONDS);
+
+ log.info("[QueueAutoRefillJob] 宸插惎鍔細姣� {} 绉掑厹搴曡Е鍙戜竴娆°�屽叏浣撳伐浣嶈嚜鍔ㄨˉ浜恒��"
+ + "锛堥棬闂镐笉鍙橈細鏈紑璇�/鍋滄鍊欒瘖/鍊欒瘖鍖哄凡婊� 鏃朵笉浼氳ˉ浜猴級", INTERVAL_SECONDS);
+ }
+
+ @PreDestroy
+ public void stop() {
+ if (null != scheduler) {
+ scheduler.shutdownNow();
+ scheduler = null;
+ }
+ }
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueService.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueService.java
index b80062c..34c755c 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueService.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueService.java
@@ -67,6 +67,18 @@
java.util.Map<String, Object> hurryUpNow(Long roomId, String bedNo);
void startHurryUpOneCheckType(Integer checkType);
+ /**
+ * 鍏滃簳锛氬**鎵�鏈�**寮�璇婂伐浣嶈Е鍙戜竴娆¤嚜鍔ㄨˉ浜猴紙绛変环浜庨�愪釜 {@link #startHurryUpOneBed}锛夈��
+ *
+ * <p>鐢� {@code QueueAutoRefillJob} 鍛ㄦ湡鎬ц皟鐢細鍒嗘祦鏈韩鏄�"浜嬩欢椹卞姩"鐨�
+ * 锛堢鍒� / 鍏ュ骇 / 寮�璇� / 鍙彿 / 瀹屾垚鍚勮Е鍙戜竴娆★級锛屼换浣曚竴娆¤Е鍙戞病璺戝埌鎴栬窇鏃╀簡
+ * 锛堜緥濡傜鍒颁簨鍔¤繕娌℃彁浜ゃ�佹墽琛屽櫒寮傚父锛夛紝鎮h�呭氨浼氫竴鐩村仠鍦ㄣ�屾帓闃熶腑銆嶏紝
+ * 鍙兘鐢卞尰鐢熸墜宸ャ�屾媺鍏ャ�嶃�傚懆鏈熷厹搴曚繚璇佽繖绉嶆紡缃戞渶澶� 1 鍒嗛挓灏辫琛ヤ笂銆�
+ *
+ * <p>闂ㄩ椄涓嶅彉锛氭湭寮�璇� / 鍋滄鍊欒瘖 / 鍊欒瘖鍖哄凡婊� 鏃剁収鏍蜂笉浼氳ˉ浜恒��
+ */
+ void startHurryUpAll();
+
void startBedReload();
void startResetRoom(Boolean needCloseBed);
MonitorInfoVO getMonitorInfo();
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java
index 6c3f1e9..e97c3eb 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java
@@ -22,6 +22,8 @@
import org.apache.cxf.common.util.CollectionUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionSynchronization;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
import org.springframework.validation.annotation.Validated;
import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
@@ -316,9 +318,45 @@
@Override
public void startHurryUpOneBed(Long roomId, String bedNo) {
- singleThreadExecutor.execute(() -> {
- queueServiceTxFunctions.hurryupOneBed(roomId, bedNo);
- });
+ // 銆愮己闄蜂慨澶嶃�戝繀椤荤瓑浜嬪姟鎻愪氦鍚庡啀璺戯細瑙� runAfterCommit 鐨勮鏄�
+ runAfterCommit(() -> singleThreadExecutor.execute(() -> {
+ try {
+ queueServiceTxFunctions.hurryupOneBed(roomId, bedNo);
+ } catch (Exception e) {
+ // 鍘熷疄鐜颁笉鎹曡幏锛氬紓甯稿彧鐣欏湪宸ヤ綔绾跨▼閲岋紝鏃ュ織涓�鏉¢兘娌℃湁锛岀幇鍦烘棤浠庢帓鏌�
+ log.error("[hurryupOneBed] 鑷姩琛ヤ汉鎵ц寮傚父. 宸ヤ綅={}/{}锛堜笉褰卞搷涓绘祦绋嬶紝涓嬩竴杞細閲嶈瘯锛�",
+ roomId, bedNo, e);
+ }
+ }));
+ }
+
+ /**
+ * 鎶娿�岃Е鍙戣嚜鍔ㄥ垎娴併�嶆帹杩熷埌**浜嬪姟鎻愪氦涔嬪悗**鍐嶆墽琛岋紱涓嶅湪浜嬪姟閲屽垯鐩存帴鎵ц銆�
+ *
+ * <p>銆愮己闄蜂慨澶嵚风幇鍦哄弽棣堛�戣繍鍔ㄨ瘯楠岀鍒板悗锛屾偅鑰呬竴鐩村仠鍦ㄥ尰鐢熷伐浣滃彴鐨�
+ * 銆屾湰璇婂鎺掗槦涓紙鏈垎閰嶅伐浣嶏級銆嶏紝蹇呴』鎵嬪伐鐐广�屾媺鍏ャ�嶆墠杩涘�欒瘖鍖恒��
+ *
+ * <p>鍘熷洜锛歿@link #queue} 鏄� {@code @Transactional}锛屾彃鍏ャ�屾帓闃熶腑銆嶈涔嬪悗**绔嬪嵆**鎶�
+ * 鍒嗘祦浠诲姟涓㈢粰 {@code singleThreadExecutor}銆傚伐浣滅嚎绋嬬敤鐨勬槸**鍙︿竴涓暟鎹簱杩炴帴**锛�
+ * READ COMMITTED 涓嬬湅涓嶅埌涓讳簨鍔″皻鏈彁浜ょ殑閭d竴琛� 鈬�
+ * {@code getFirstWaitingByCheckTypes} 杩斿洖 null 鈬� 杩欐鍒嗘祦浠�涔堥兘娌″仛灏遍��鍑猴紱
+ * 浜嬪姟鎻愪氦鍚庡張娌℃湁浠讳綍琛ュ伩 鈬� 鎮h�呮案杩滅暀鍦ㄣ�屾帓闃熶腑銆嶃��
+ *
+ * <p>涓轰粈涔堜綆棰戞鏌ラ」鐩紙杩愬姩璇曢獙銆侀閬撶數鐢熺悊锛夊嚑涔庡繀鐒朵腑鎷涖�侀珮棰戠殑鍗�"鐪嬭捣鏉ユ甯�"锛�
+ * 鎵ц鍣ㄥ钩鏃剁┖闂诧紝浠诲姟鑳�**绔嬪埢**鎵ц锛堝繀鐒舵棭浜庢彁浜わ級锛涢珮棰戦」鐩换鍔′細鎺掗槦锛�
+ * 杞埌鏃朵簨鍔″線寰�宸茬粡鎻愪氦锛屼簬鏄茎骞告垚鍔熴��
+ */
+ private void runAfterCommit(Runnable task) {
+ if (TransactionSynchronizationManager.isSynchronizationActive()) {
+ TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
+ @Override
+ public void afterCommit() {
+ task.run();
+ }
+ });
+ } else {
+ task.run();
+ }
}
@Override
@@ -329,9 +367,32 @@
@Override
public void startHurryUpOneCheckType(Integer checkType) {
- singleThreadExecutor.execute(() -> {
- queueServiceTxFunctions.hurryupOneCheckType(checkType);
- });
+ // 銆愮己闄蜂慨澶嶃�戝繀椤荤瓑浜嬪姟鎻愪氦鍚庡啀璺戯細瑙� runAfterCommit 鐨勮鏄�
+ runAfterCommit(() -> singleThreadExecutor.execute(() -> {
+ try {
+ queueServiceTxFunctions.hurryupOneCheckType(checkType);
+ } catch (Exception e) {
+ log.error("[hurryupOneCheckType] 鑷姩鍒嗘祦鎵ц寮傚父. checkType={}锛堜笉褰卞搷涓绘祦绋嬶紝涓嬩竴杞細閲嶈瘯锛�",
+ checkType, e);
+ }
+ }));
+ }
+
+ /**
+ * 鍏滃簳锛氬**鏈夊尰鐢熷湪搴�**鐨勫伐浣嶈Е鍙戜竴娆¤嚜鍔ㄨˉ浜猴紙鐢� {@code QueueAutoRefillJob} 鍛ㄦ湡璋冪敤锛夈��
+ *
+ * <p>娉ㄦ剰鐢ㄧ殑鏄� {@code hurryupAllSeatedBeds} 鑰屼笉鏄� {@code hurryupAllBed}锛�
+ * 鍚庤�呬細鎶婃偅鑰呮帹杩�"宸插紑閫氫絾娌″尰鐢�"鐨勫伐浣嶏紝鍛ㄦ湡璺戜細鏀惧ぇ璇ュ壇浣滅敤銆�
+ */
+ @Override
+ public void startHurryUpAll() {
+ runAfterCommit(() -> singleThreadExecutor.execute(() -> {
+ try {
+ queueServiceTxFunctions.hurryupAllSeatedBeds();
+ } catch (Exception e) {
+ log.error("[hurryupAllSeatedBeds] 鍛ㄦ湡琛ヤ汉鎵ц寮傚父锛堜笅涓�杞户缁級", e);
+ }
+ }));
}
@Override
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java
index 575ddc0..a30c9b0 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java
@@ -665,6 +665,34 @@
}
/**
+ * 銆愬懆鏈熷厹搴曚笓鐢ㄣ�戝彧缁�**鏈夊尰鐢熷湪搴э紙DOCTOR_ON锛�**鐨勫伐浣嶈ˉ浜恒��
+ *
+ * <p>涓轰粈涔堜笉鑳界洿鎺ョ敤 {@link #hurryupAllBed()}锛氬畠閬嶅巻鐨勬槸 `mapOpeningBed`
+ * 锛堝惈銆屽凡寮�閫氫絾娌′汉銆嶇殑宸ヤ綅锛夛紝浼氭妸鎺掗槦鎮h�呮帹杩�**娌℃湁鍖荤敓**鐨勫伐浣嶅�欒瘖鍖� 鈥斺��
+ * 鍚屼竴妫�鏌ラ」鐩湁澶氫釜宸ヤ綅鏃讹紙濡傚父瑙勫績鐢靛浘 116/117/118锛夛紝鎮h�呭彲鑳借"鍒嗛厤"鍒�
+ * 涓�涓病浜虹湅鐨勫伐浣嶏紝鐪熸鍦ㄥ骇鐨勫尰鐢熷弽鑰岀湅涓嶅埌銆傝鏂规硶鍘熸湰鍙湪寮�璇�/閲嶅惎鏃惰窇涓�娆★紝
+ * 鑻ユ敼鎴愭瘡鍒嗛挓璺戜竴閬嶏紝杩欎釜鍓綔鐢ㄤ細琚斁澶с�傚洜姝ゅ懆鏈熷厹搴曞彧琛ュ湪搴у伐浣嶏紝
+ * 涓庤嚜鍔ㄥ垎娴侀槦鍒楋紙{@code addBedToRoutingQueue} 鍙敹 DOCTOR_ON锛夌殑鍙e緞淇濇寔涓�鑷淬��
+ */
+ public void hurryupAllSeatedBeds() {
+ if (0 == openingFlag.get())
+ return;
+
+ mapOpeningBed.values().forEach(bedQueueBO -> {
+ // 鍙ˉ銆屾湁鍖荤敓鍦ㄥ骇銆嶇殑宸ヤ綅
+ if (!Objects.equals(BedStatusEnum.DOCTOR_ON.getStatus(), bedQueueBO.getStatus())) {
+ return;
+ }
+ // 銆屽仠姝㈠�欒瘖銆嶇殑宸ヤ綅鐩存帴璺宠繃锛歨urryupOneBed 鍐呴儴鏈潵涔熶細璺宠繃锛�
+ // 杩欓噷鎻愬墠鍒ゆ柇鏄负浜嗛伩鍏嶆瘡鍒嗛挓鍒蜂竴鏉� "[琛ヤ汉] 宸ヤ綅澶勪簬銆愬仠姝㈠�欒瘖銆�" 鐨� WARN銆�
+ if (Boolean.TRUE.equals(bedQueueBO.getStopReady())) {
+ return;
+ }
+ hurryupOneBed(bedQueueBO.roomId, bedQueueBO.bedNo);
+ });
+ }
+
+ /**
* 鎶婂尰鐢熷�欒瘖鐨勯槦鍒楀婊�
*/
public void hurryupOneBed(Long roomId, String bedNo) {
diff --git a/jh-server/src/main/resources/application-local.yaml b/jh-server/src/main/resources/application-local.yaml
index 7fd5b9e..252e148 100644
--- a/jh-server/src/main/resources/application-local.yaml
+++ b/jh-server/src/main/resources/application-local.yaml
@@ -51,16 +51,15 @@
primary: master
datasource:
master:
- url: jdbc:mysql://47.93.127.38:3308/lihu?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 杩炴帴鐨勭ず渚�
-# url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai # MySQL Connector/J 5.X 杩炴帴鐨勭ず渚�
- # url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 杩炴帴鐨勭ず渚�
- # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 杩炴帴鐨勭ず渚�
- # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=ruoyi-vue-pro;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true;useUnicode=true;characterEncoding=utf-8 # SQLServer 杩炴帴鐨勭ず渚�
- # url: jdbc:dm://127.0.0.1:5236?schema=RUOYI_VUE_PRO # DM 杩炴帴鐨勭ず渚�
- # url: jdbc:kingbase8://127.0.0.1:54321/test # 浜哄ぇ閲戜粨 KingbaseES 杩炴帴鐨勭ず渚�
- # url: jdbc:postgresql://127.0.0.1:5432/postgres # OpenGauss 杩炴帴鐨勭ず渚�
- username: smartor
- password: Smartor.2016
+# url: jdbc:mysql://127.0.0.1:3308/lihu?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 杩炴帴鐨勭ず渚�
+# url: jdbc:mysql://47.93.127.38:3308/lihu?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 杩炴帴鐨勭ず渚�
+# username: smartor
+# password: Smartor.2016
+
+ url: jdbc:mysql://127.0.0.1:3306/lihu?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 杩炴帴鐨勭ず渚�
+ username: root
+ password: sendohill
+
# username: sa # SQL Server 杩炴帴鐨勭ず渚�
# password: Jh@2024 # SQL Server 杩炴帴鐨勭ず渚�
# username: SYSDBA # DM 杩炴帴鐨勭ず渚�
@@ -69,9 +68,13 @@
# password: Jh@2024 # OpenGauss 杩炴帴鐨勭ず渚�
slave: # 妯℃嫙浠庡簱锛屽彲鏍规嵁鑷繁闇�瑕佷慨鏀�
lazy: true # 寮�鍚噿鍔犺浇锛屼繚璇佸惎鍔ㄩ�熷害
- url: jdbc:mysql://47.93.127.38:3308/lihu?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 杩炴帴鐨勭ず渚�
- username: smartor
- password: Smartor.2016
+# url: jdbc:mysql://127.0.0.1:3308/lihu?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 杩炴帴鐨勭ず渚�
+# url: jdbc:mysql://47.93.127.38:3308/lihu?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 杩炴帴鐨勭ず渚�
+# username: smartor
+# password: Smartor.2016
+ url: jdbc:mysql://127.0.0.1:3306/lihu?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 杩炴帴鐨勭ず渚�
+ username: root
+ password: sendohill
# Redis 閰嶇疆銆俁edisson 榛樿鐨勯厤缃冻澶熶娇鐢紝涓�鑸笉闇�瑕佽繘琛岃皟浼�
redis:
diff --git a/jh-server/src/main/resources/application.yaml b/jh-server/src/main/resources/application.yaml
index d216a8a..f6f7674 100644
--- a/jh-server/src/main/resources/application.yaml
+++ b/jh-server/src/main/resources/application.yaml
@@ -3,8 +3,8 @@
name: jh-server
profiles:
-# active: local
- active: prod
+ active: local
+# active: prod
main:
allow-circular-references: true # 鍏佽寰幆渚濊禆锛屽洜涓洪」鐩槸涓夊眰鏋舵瀯锛屾棤娉曢伩鍏嶈繖涓儏鍐点��
--
Gitblit v1.9.3