CrazyIter_Bin 1 year ago
parent
commit
0f30a09eec

+ 16 - 5
TEAMModelOS.SDK/DI/DingDing/DingDing.cs

@@ -12,6 +12,7 @@ using System.Text.Json;
 using System.IO;
 using TEAMModelOS.SDK.Extension;
 using System.Diagnostics;
+using HTEXLib.COMM.Helpers;
 
 namespace TEAMModelOS.SDK.DI
 {
@@ -58,16 +59,27 @@ namespace TEAMModelOS.SDK.DI
         /// <param name="secret">加簽密鑰</param>
         /// <param name="msg">發送訊息</param>
         /// <returns></returns>
-        public async Task SendBotMsg(string msg, GroupNames groupkey)
+        public async Task SendBotMsg(string msg , GroupNames groupkey, List<string> mobiles = null)
         {
             // TODO 有空處理自動抓取方法名,代碼行數顯示
             //StackTrace st = new StackTrace(new StackFrame(1, true));
             //StackFrame sf = st.GetFrame(0);            
             //var f = $"Func:{sf.GetMethod().Name},Line : {sf.GetFileLineNumber()}";
-
-            var content = new { msgtype = "text", text = new { content = msg } };
+            List<string> atMobiles = new List<string>();
+            if (mobiles.IsNotEmpty()) {
+                atMobiles=mobiles;
+            }
+            var content = new { msgtype = "text", text = new { content = msg }, at=new { atMobiles  } };
 #if DEBUG
-            var keys = GroupNames.成都开发測試群組.GetDescriptionText().Split(',');
+            string[] keys = null; 
+            if (groupkey.Equals(GroupNames.醍摩豆小财神))
+            {
+                  keys = GroupNames.醍摩豆小财神.GetDescriptionText().Split(',');
+            }
+            else
+            {
+                  keys = GroupNames.成都开发測試群組.GetDescriptionText().Split(',');
+            }
 #else
             var keys = groupkey.GetDescriptionText().Split(',');
 #endif
@@ -78,7 +90,6 @@ namespace TEAMModelOS.SDK.DI
                 await _httpClient.PostAsJsonAsync($"{url}{keys[0]}&timestamp={timestamp}&sign={BotAddSign(keys[1], timestamp)}", content);
             }
         }
-
         // <summary>
         /// 發送需要加簽驗證的Bot訊息(msgtype為text)
         /// </summary>

File diff suppressed because it is too large
+ 4 - 0
TEAMModelOS/Controllers/System/WeChatPayController.cs


+ 4 - 4
TEAMModelOS/JsonFile/Core/mail.html

@@ -72,11 +72,11 @@
                                         感谢您在醍摩豆CN ( <a href="https://www.habook.com.cn" rel="noopener"
                                             target="_blank">www.habook.com.cn</a> ) 购买产品!<br> 已经为您开具订单,产品名称:<a href=""
                                             rel="noopener" target="_blank">{productName},{orderId}</a>的电子普通发票,如下:
-                                        <br>发票类型:增值税电子普通发票,订单支付金额{pay_amount}元,发票代码:{invoiceCode},发票号码: {invoiceNum},您可以点击“ <a
+                                        <br>发票类型:增值税电子普通发票,订单支付金额{pay_amount}元,发票代码:{invoiceCode},发票号码: {invoiceNum},您可以点击“ <a
                                             href="{invoiceUrl}" rel="noopener" target="_blank">发票文件下载</a> ”获取该发票文件;
-                                        <br>同时您也可以访问<a href="https://www.habook.com.cn" rel="noopener"
-                                            target="_blank">醍摩豆CN(www.habook.com.cn)</a>网站订单管理及下载安装<a
-                                            href="https://www.habook.com.cn/download.php?act=view&id=54">HiTA5</a>中的通知中心详情查看下载电子普通发票。
+                                        <br>同时您也可以<!--访问<a href="https://www.habook.com.cn" rel="noopener"
+                                            target="_blank">醍摩豆CN(www.habook.com.cn)</a>网站订单管理及-->下载安装<a
+                                            href="https://www.habook.com.cn/download.php?act=view&id=54">HiTA5</a>,在应用中的通知中心详情查看下载电子普通发票。
                                         <br>电子普通发票是税务机关认可的有效收付款凭证,与纸质发票具有同等法律效力,可用于报销入账、售后维权等。
                                     </td>
                                 </tr>