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