From f60cd61615a971818ffb03dd2c6e016d0ac5366c Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期一, 20 十月 2025 15:05:28 +0800
Subject: [PATCH] Merge branch 'dev' of http://nonxin.cn:8090/r/product/product-server-web/V2.0.0 into dev
---
doc/系统设计 | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git "a/doc/\347\263\273\347\273\237\350\256\276\350\256\241" "b/doc/\347\263\273\347\273\237\350\256\276\350\256\241"
index 6a6c62b..18e94c5 100644
--- "a/doc/\347\263\273\347\273\237\350\256\276\350\256\241"
+++ "b/doc/\347\263\273\347\273\237\350\256\276\350\256\241"
@@ -43,6 +43,7 @@
* 鐗规畩缂撳瓨锛氬崟鐙啓鏂规硶鍔犺浇鏁版嵁骞跺鐞嗘暟鎹紝灏佽鍚岄�氱敤缂撳瓨涓�鏍�
* 鏀寔鍒嗙粍缂撳瓨锛屾棤闄愮骇,鍒嗙粍瀛楁蹇呴』鍦ㄧ紦瀛樺瓧娈甸噷闈�
鏀寔鍔犺浇瀛愯〃鏁版嵁
+ * 鏉′欢瀛楁鏀寔閰嶇疆绯荤粺鍙橀噺,瑙� SystemParamReplace.replaceSystemParameter {{key}} 璋冪敤锛歱aramReplacePrompt
* 缂撳瓨鏁版嵁锛屽瓨鍦ㄦ暟鎹笉涓�鑷撮棶棰橈紝褰撲袱涓繘绋嬪悓鏃跺涓�涓〃鐨勭紦瀛樿繘琛岃鍜屽啓鏃�---------------
* 鏂板銆佷慨鏀广�佸垹闄ょ紦瀛樿〃鏃讹紝瑕佹洿鏂扮紦瀛�-------------------------------------
* 鍒濆鏁版嵁
@@ -61,8 +62,9 @@
DataTableEntity dt=DataPoolCacheImpl.getInstance().getCacheData("鎵�鏈夊瓧娈典俊鎭苟鎸夎〃鍒嗙粍",new String[] {tableUuid});
鏈垎缁勶細
DataTableEntity table=DataPoolCacheImpl.getInstance().getCacheData("鎵�鏈夎〃淇℃伅");
+
- 锛�1锛塺edis宸ュ叿绫�
+锛�1锛塺edis宸ュ叿绫�
閰嶇疆鏂囦欢锛歭x-base-server\lx-base-server-cache\src\main\resource\cache.properties
绫伙細com.lx.base.cache.util.RedisUtil
浠嬬粛锛�
@@ -882,6 +884,7 @@
54.娑堟伅鐢熸垚
/**
+ * 涓嶆敮鎸佹墜鏈虹
* 鎵�鏈夊簲鐢ㄦ湇鍔＄敓鎴愭秷鎭皟浜涙柟娉曞幓娣诲姞娑堟伅
* 鏍规嵁message.server.ip鍙傛暟鍒ゆ柇鏄惁绛変簬127.0.0.1
* 鏄細鍒欑洿鎺ヨ皟writeUserMessage鏈満鏂规硶娣诲姞娑堟伅
@@ -899,6 +902,27 @@
* @param is_send_sms 鏄惁鍙戦�佺煭淇� 0:鍚� 1锛氭槸 蹇呭～
*/
WebsocketMesssageServiceThread.getInstance().appendMessage(String ....);
+ /**
+ * 鏀寔鎵嬫満绔紝鏂规硶閲嶈浇锛屽浜嗕竴涓猰obile_url鍙傛暟
+ * 鎵�鏈夊簲鐢ㄦ湇鍔＄敓鎴愭秷鎭皟浜涙柟娉曞幓娣诲姞娑堟伅
+ * 鏍规嵁message.server.ip鍙傛暟鍒ゆ柇鏄惁绛変簬127.0.0.1
+ * 鏄細鍒欑洿鎺ヨ皟writeUserMessage鏈満鏂规硶娣诲姞娑堟伅
+ * 鍚︼細鍒欒皟娑堟伅鏈嶅姟鍣ㄦ帴鍙ｆ坊鍔犳秷鎭�
+ * @param userids 娑堟伅鎺ユ敹浜�
+ * @param content 娑堟伅鍐呭
+ * @param title 娑堟伅鏍囬
+ * @param send_user_id 娑堟伅鍙戦�佷汉
+ * @param message_type 娑堟伅绫诲瀷
+ * @param url 娑堟伅閾炬帴鍦板潃
+ * @param source_table 鏁版嵁琛�
+ * @param source_uuid 鏁版嵁琛╱uid
+ * @param create_by 鍒涘缓浜�
+ * @param is_send_mail 鏄惁鍙戦�侀偖浠�
+ * @param is_send_sms 鏄惁鍙戦�佺煭淇�
+ * @param mobile_url 鎵嬫満绔疷RL
+ * @throws BaseException
+ */
+ WebsocketMesssageServiceThread.getInstance().appendMessage(String ....);
//娑堟伅绫诲瀷
//琛ㄥ悕甯搁噺瀹氫箟
@@ -984,4 +1008,11 @@
//鍘熼敊璇殑淇℃伅浣滀负鍙傛暟浼犺繃鍘伙紝涓�骞舵樉绀�
be.setMessagePara("error", e.getMessage());
throw be;
- }
\ No newline at end of file
+ }
+64.鏁版嵁寤烘ā瑙勫垯
+ 瀛楁鏄剧ず鍚嶇О锛�4-6涓瓧锛岀簿缁冿紝鎻忚堪鎵嶆槸鍐欏娉ㄧ被鍨嬫枃瀛�
+ 瀛楁绫诲瀷锛岀敤鎴烽�塙serId锛屽浜洪�塙serIds,缁勭粐鏈烘瀯閫塷rgUuid,澶氫釜閫塷rgUuids锛屼笉鑳介�塖tring, 涓婚敭pk锛屽紩鐢ㄥ閿〃瀛楁閫塽uid
+ 鏄弬鐓х殑锛屼竴瀹氳鍔犱笂鍙傜収鍚嶏紝楂樼骇鍙傜収鍚嶅拰鏁版嵁瀛楀吀鍚嶏紝鏁版嵁瀛楀吀瑕佸姞銆妜xx銆嬫潵鍖哄垎
+ 寮曠敤澶栭敭琛紝涓�瀹氳閫夛紝涓斿搴旂殑瀛楁绫诲瀷涓�瀹氳鏄疷UID
+
+
\ No newline at end of file
--
Gitblit v1.9.2