更新 'README.md'

Signed-off-by: heibai2006 <heibai2006@noreply.localhost>

.github/workflows/docker.yml

@@ -14,10 +14,6 @@ jobs:
       name: Check out the repo
       uses: actions/checkout@v2
       
-    -
-      name: Set up QEMU
-      uses: docker/setup-qemu-action@v1
-
     - name: Cache node modules NPM
       uses: actions/cache@v2
       env:

.github/workflows/docker_dev.yml

@@ -0,0 +1,59 @@
+name: docker_dev
+
+on:
+  push:
+    branches: [ dev ]
+  pull_request:
+    branches: [ dev ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - 
+      name: Check out the repo
+      uses: actions/checkout@v2
+      
+    - name: Cache node modules NPM
+      uses: actions/cache@v2
+      env:
+        cache-name: cache-node-modules-NPM
+      with:
+        path: ~/.npm
+        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('./Inotify.Vue/package.json') }}
+        restore-keys: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('./Inotify.Vue/package.json') }}
+
+    - name: Cache node modules
+      uses: actions/cache@v2
+      env:
+        cache-name: cache-node-modules
+      with:
+        path: ./Inotify.Vue/node_modules
+        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('./Inotify.Vue/package.json') }}
+        restore-keys: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('./Inotify.Vue/package.json') }}
+
+    - name: InstallNode and BuildVue
+      run: |
+        cd ./Inotify.Vue
+        npm install
+        npm run build:prod
+
+    -
+      name: Login to DockerHub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+        
+    - 
+      name: Docker Build & Push to Docker Hub For Service
+      uses: docker/build-push-action@v2
+      with:
+        context: .
+        file: ./Inotify/Dockerfile
+        platforms: linux/amd64
+        push: true
+        tags: ${{ secrets.DOCKERHUB_TAG }}:dev
+
+    - name: 'Report Suecss'
+      run: curl ${{ secrets.INOTIFY }}/Inotify/DevIsOk!

.github/workflows/docker_release.yml

@@ -12,10 +12,6 @@ jobs:
       name: Check out the repo
       uses: actions/checkout@v2
       
-    -
-      name: Set up QEMU
-      uses: docker/setup-qemu-action@v1
-
     - name: Cache node modules NPM
       uses: actions/cache@v2
       env:

Inotify.Vue/package.json

@@ -17,7 +17,6 @@
     "axios": "0.18.1",
     "core-js": "3.6.5",
     "echarts": "^4.9.0",
-    "element-plus": "^1.0.2-beta.32",
     "element-ui": "2.13.2",
     "js-cookie": "2.2.0",
     "moment": "^2.29.1",

Inotify/Controllers/SettingController.cs

@@ -49,10 +49,9 @@ namespace Inotify.Controllers
                         sendTemplate.IsActive = sendAuthInfo.Active;
                         sendTemplate.AuthToTemplate(sendAuthInfo.AuthData);
                         userSendTemplates.Add(sendTemplate);
-                    }
+
-                    if (barkTemplateAttribute.Key == sendTemplate.Type)
+                        var bark = sendTemplate.Values.FirstOrDefault(e => e.Name == nameof(BarkSendTemplate.Auth.SendUrl));
-                    {
+                        if(bark!=null) bark .Value = "";
-                        sendTemplate.Values.FirstOrDefault(e => e.Name == nameof(BarkSendTemplate.Auth.SendUrl)).Value = "";
                     }
                 }
 

Inotify/Controllers/SetttingSysController.cs

@@ -120,7 +120,7 @@ namespace Inotify.Controllers
         public IActionResult GetSendInfos(string? start, string? end)
         {
             var templates = SendTaskManager.Instance.GetInputTemeplates();
-            var sendInfos = DBManager.Instance.DBase.Fetch<SendInfo>();
+            var sendInfos = DBManager.Instance.DBase.Fetch<SendInfo>().Where(e=>!string.IsNullOrEmpty( e.TemplateID)).ToList();
             var sendInfoQuerys = sendInfos.Where(e => int.Parse(e.Date) >= int.Parse(start) && int.Parse(e.Date) <= int.Parse(end)).ToList();
             var sendInfoGroups = sendInfoQuerys.GroupBy(e => e.Date).Select(e => new { date = e.Key, count = e.Sum(item => item.Count) }).ToList();
             var sendTypeInfoGroups = sendInfoQuerys.GroupBy(e => e.TemplateID).Select(e => new { date = e.Key, count = e.Sum(item => item.Count) }).ToList();

Inotify/Data/DBManager.cs

@@ -164,17 +164,10 @@ namespace Inotify.Data
             return DBase.Query<SendUserInfo>().FirstOrDefault(e => e.UserName == userName);
         }
 
-        public string GetSendAuthInfo(string token, out string guid)
+        public string GetSendAuthInfo(string key, out string guid)
         {
-            guid = string.Empty;
+            guid = null;
-            var upToekn = token.ToUpper();
+            var authInfo = DBManager.Instance.DBase.Query<SendAuthInfo>().FirstOrDefault(e => e.Key== key.ToUpper());
-            var userInfo = DBManager.Instance.DBase.Query<SendUserInfo>().FirstOrDefault(e => e.Token == upToekn && e.Active);
-            if (userInfo == null)
-            {
-                return null;
-            }
-
-            var authInfo = DBManager.Instance.DBase.Query<SendAuthInfo>().FirstOrDefault(e => e.Id == userInfo.SendAuthId && e.UserId == userInfo.Id);
             if (authInfo == null)
             {
                 return null;
@@ -207,12 +200,13 @@ namespace Inotify.Data
         {
 
             var codeVersion = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
-            var migrationBuilder = new MigrationBuilder(MigrationName, DBase);
             var versionProvider = new DatabaseCurrentVersionProvider(DBase);
 
             if (!m_migrator.TableExists<SystemInfo>())
             {
+                var migrationBuilder = new MigrationBuilder(MigrationName, DBase);
                 migrationBuilder.Append(new Version(codeVersion.ToString()), new LatestMigration());
+                migrationBuilder.Execute();
                 versionProvider.SetMigrationVersion(MigrationName, new Version(codeVersion.ToString()));
             }
             else

Inotify/Data/DBMigrations.cs

@@ -25,6 +25,21 @@ namespace Inotify.Data
                     key = "administrators",
                     Value = "admin"
                 });
+                Migrator.Database.Insert(new SystemInfo()
+                {
+                    key = "barkKeyId",
+                    Value = "TEg0VDlWNVU0Ug==".Base64Decode(),
+                });
+                Migrator.Database.Insert(new SystemInfo()
+                {
+                    key = "barkTeamId",
+                    Value = "NVU4TEJSWEczQQ==".Base64Decode(),
+                });
+                Migrator.Database.Insert(new SystemInfo()
+                {
+                    key = "barkPrivateKey",
+                    Value = "LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JR1RBZ0VBTUJNR0J5cUdTTTQ5QWdFR0NDcUdTTTQ5QXdFSEJIa3dkd0lCQVFRZzR2dEMzZzVMNUhnS0dKMitUMWVBMHRPaXZSRXZFQVkyZytqdVJYSmtZTDJnQ2dZSUtvWkl6ajBEQVFlaFJBTkNBQVNtT3MzSmtTeW9HRVdac1VHeEZzLzRwdzFySWxTVjJJQzE5TTh1M0c1a3EzNnVwT3d5RldqOUdpM0VqYzlkM3NDNytTSFJxWHJFQUpvdzgvN3RScFYrCi0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0=".Base64Decode()
+                });
             }
 
             if (!Migrator.TableExists<SendInfo>())

Inotify/Inotify.csproj

@@ -6,8 +6,8 @@
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <StartupObject>Inotify.Program</StartupObject>
     <Nullable>enable</Nullable>
-    <AssemblyVersion>2.0.0.4</AssemblyVersion>
+    <AssemblyVersion>2.3.0.0</AssemblyVersion>
-    <FileVersion>2.0.0.4</FileVersion>
+    <FileVersion>2.3.0.0</FileVersion>
   </PropertyGroup>
  
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -18,8 +18,7 @@
     <PackageReference Include="FluentEmail.Core" Version="3.0.0" />
     <PackageReference Include="FluentEmail.Liquid" Version="3.0.0" />
     <PackageReference Include="FluentEmail.Smtp" Version="3.0.0" />
-    <PackageReference Include="jose-jwt" Version="3.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.18" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.12" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.3" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.9" />
@@ -28,7 +27,7 @@
     <PackageReference Include="NPoco.Migrations" Version="0.3.2" />
     <PackageReference Include="Portable.BouncyCastle" Version="1.8.10" />
     <PackageReference Include="System.Runtime.Caching" Version="5.0.0" />
-    <PackageReference Include="Telegram.Bot" Version="15.7.1" />
+    <PackageReference Include="Telegram.Bot" Version="18.0.0" />
   </ItemGroup>
 
   <ItemGroup>

Inotify/Sends/Products/BarkSendTemplate.cs

@@ -1,13 +1,7 @@
 using CorePush.Apple;
-using Jose;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net.Http;
-using System.Security.Cryptography;
-using System.Text;
 
 namespace Inotify.Sends.Products
 {
@@ -32,52 +26,50 @@ namespace Inotify.Sends.Products
         [InputTypeAttribte(6, "SendUrl", "SendUrl", "SendUrl", true, true)]
         public string SendUrl { get; set; }
 
-
     }
 
     [SendMethodKey("3B6DE04D-A9EF-4C91-A151-60B7425C5AB2", "Bark", Order = 2999, Waring = "BARK通道勿手动添加，请使用APP添加BARK地址绑定")]
     public class BarkSendTemplate : SendTemplate<BarkAuth>
     {
-        private static string KeyID;
-
-        private static string TeamID;
-
         private static ApnSender apnSender;
 
         public override bool SendMessage(SendMessage message)
         {
             if (apnSender == null)
             {
-                KeyID = SendCacheStore.GetSystemValue("barkKeyId");
+                var keyID = SendCacheStore.GetSystemValue("barkKeyId");
-                TeamID = SendCacheStore.GetSystemValue("barkTeamId");
+                var teamID = SendCacheStore.GetSystemValue("barkTeamId");
                 var privateKey = SendCacheStore.GetSystemValue("barkPrivateKey");
                 var privateKeyContent = privateKey.Split('\n')[1];
-                var decodeKey = Convert.FromBase64String(privateKeyContent);
                 var apnSettings = new ApnSettings()
                 {
 
-                    TeamId = TeamID,
+                    TeamId = teamID,
                     AppBundleIdentifier = "me.fin.bark",
                     P8PrivateKey = privateKeyContent,
                     ServerType = ApnServerType.Production,
-                    P8PrivateKeyId = KeyID,
+                    P8PrivateKeyId = keyID,
                 };
 
                 apnSender = new ApnSender(apnSettings, new HttpClient());
             }
 
-
             var payload = new AppleNotification(
                 Guid.NewGuid(),
                 message.Data,
-                message.Title);
+                message.Title)
+            {
+                IsArchive = Auth.IsArchive,
+                AutoMaticallyCopy=Auth.AutoMaticallyCopy,
+            };
+            payload.Aps.Sound = Auth.Sound;
+
             var response = apnSender.Send(payload, Auth.DeviceToken);
 
             if (response.IsSuccess)
                 return true;
             return false;
         }
-
     }
 
     public class AppleNotification
@@ -91,8 +83,12 @@ namespace Inotify.Sends.Products
 
                 [JsonProperty("body")]
                 public string Body { get; set; }
+
             }
 
+            [JsonProperty("sound")]
+            public string Sound { get; set; }
+
             [JsonProperty("alert")]
             public Alert AlertBody { get; set; }
 
@@ -119,5 +115,11 @@ namespace Inotify.Sends.Products
 
         [JsonProperty("id")]
         public Guid Id { get; set; }
+
+        [JsonProperty("isarchive")]
+        public string IsArchive { get; set; }
+
+        [JsonProperty("automaticallycopy")]
+        public string AutoMaticallyCopy { get; set; }
     }
 }

Inotify/Sends/Products/TelegramBotSendTemplate.cs

@@ -1,5 +1,6 @@
 
 using System;
+using System.Net.Http;
 using Telegram.Bot;
 using Telegram.Bot.Types.InputFiles;
 
@@ -26,7 +27,13 @@ namespace Inotify.Sends.Products
         {
 
             var proxy = GetProxy();
-            var client = proxy == null ? new TelegramBotClient(Auth.BotToken) : new TelegramBotClient(Auth.BotToken, proxy);
+            var proxyHttpClientHandler = new HttpClientHandler
+            {
+                Proxy = proxy,
+                UseProxy = true,
+            };
+            var httpClient = new HttpClient(proxyHttpClientHandler);      
+            var client = proxy == null ? new TelegramBotClient(Auth.BotToken) : new TelegramBotClient(Auth.BotToken, httpClient);
             var content = string.IsNullOrEmpty(message.Title) ? message.Title : message.Title + "\n" + message.Data;
             var isIMG = !string.IsNullOrEmpty(message.Title) && IsUrl(message.Title) && IsImage(message.Title) && string.IsNullOrEmpty(message.Data);
             if (isIMG)

Inotify/Sends/SendMessage.cs

@@ -2,9 +2,24 @@
 {
     public class SendMessage
     {
+        public SendMessage()
+        {
+
+        }
+
+        public SendMessage(SendMessage sendMessage)
+        {
+            Token = sendMessage.Token;
+            Title = sendMessage.Title;
+            Data = sendMessage.Data;
+            Key = sendMessage.Key;
+
+        }
         public string Token;
         public string Title;
         public string? Data;
         public string? Key;
     }
+
+
 }

Inotify/Sends/SendTaskManager.cs

@@ -178,15 +178,17 @@ namespace Inotify.Sends
                                         var result = sendMessageMethod.Invoke(sendMethodTemplateActor, new object[] { message });
                                         if (result != null)
                                         {
-                                            m_analyseMessages.Add(message);
+                                            var logMessage = new SendMessage(message);
+                                            logMessage.Key = authInfo.Key;
+                                            m_analyseMessages.Add(logMessage);
                                             if ((bool)result)
                                             {
-                                                OnSendSucessed?.Invoke(this, message);
+                                                OnSendSucessed?.Invoke(this, logMessage);
                                                 continue;
                                             }
                                             else
                                             {
-                                                OnSendFailed?.Invoke(this, message);
+                                                OnSendFailed?.Invoke(this, logMessage);
                                             }
                                         }
 
@@ -213,7 +215,7 @@ namespace Inotify.Sends
             {
                 var message = m_analyseMessages.Take();
                 var date = DateTime.Now.ToString("yyyyMMdd");
-                var authData = DBManager.Instance.GetSendAuthInfo(message.Token, out string temeplateId);
+                var authData = DBManager.Instance.GetSendAuthInfo(message.Key, out string temeplateId);
 
                 if (temeplateId != null)
                 {

Inotify/Sends/SendTemplate.cs

@@ -203,7 +203,7 @@ namespace Inotify.Sends
                 if (proxyurl != null)
                 {
 
-                    WebProxy proxy = new WebProxy
+                    WebProxy proxy = new WebProxy()
                     {
                         Address = new Uri(proxyurl)
                     };
@@ -237,8 +237,11 @@ namespace Inotify.Sends
         {
             if (IsUrl(url) && IsImage(url))
             {
-                WebClient mywebclient = new WebClient();
+                using (WebClient mywebclient = new WebClient())
-                return mywebclient.DownloadData(url);
+                {
+                    return mywebclient.DownloadData(url);
+                }
+      
             }
             return null;
         }

Inotify/Startup.cs

@@ -53,7 +53,7 @@ namespace Inotify
                     {
                         OnAuthenticationFailed = context =>
                         {
-                            var payload = JsonConvert.SerializeObject(new { message = "ÈÏ֤ʧ°Ü", code = 403 });
+                            var payload = JsonConvert.SerializeObject(new { message = "认证失败", code = 403 });
                             context.Response.ContentType = "application/json";
                             context.Response.StatusCode = StatusCodes.Status200OK;
                             context.Response.WriteAsync(payload);
@@ -62,7 +62,7 @@ namespace Inotify
                         },
                         OnForbidden = context =>
                          {
-                             var payload = JsonConvert.SerializeObject(new { message = "δ¾­ÊÚȨ", code = 405 });
+                             var payload = JsonConvert.SerializeObject(new { message = "未经授权", code = 405 });
                              context.Response.ContentType = "application/json";
                              context.Response.StatusCode = StatusCodes.Status200OK;
                              context.Response.WriteAsync(payload);
@@ -121,7 +121,7 @@ namespace Inotify
                     {
                         var groups = match.Groups;
                         rewriteContext.HttpContext.Request.Path = @"/api/send";
-                        rewriteContext.HttpContext.Request.QueryString = new QueryString($"?token={groups[2]}&title={groups[3]}&date={groups[4]}");
+                        rewriteContext.HttpContext.Request.QueryString = new QueryString($"?token={groups[2]}&title={groups[3]}&data={groups[4]}");
                     }
                     else
                     {

README.md

@@ -1,13 +1,11 @@
 # inotify
 
-[![docker](https://github.com/xpnas/inotify/actions/workflows/docker.yml/badge.svg)](https://github.com/xpnas/inotify/actions/workflows/docker.yml)
+[![docker](https://github.com/xpnas/inotify/actions/workflows/docker.yml/badge.svg?branch=master)](https://github.com/xpnas/inotify/actions/workflows/docker.yml)
 
 一个简易的消息通知系统，支持企业微信、电报机器人、邮件推送
 
 类似Server酱、容易扩展
 
-示例站点：https://inotify.cf
-
 ## 功能支持
 
 - [x] 通道设置  
@@ -27,27 +25,13 @@
 - [x] 飞书群机器人
 - [x] 自定义
 
-## 更新日志
-
-  * V1.0
-    * 支持企业微信应用、电报、SMTP消息
-  * V2.0.0.1
-    * 支持自定义Get、POST
-  * V2.0.0.2
-    * 支持BARK
-  * V2.0.0.3
-    * 支持钉钉群消息
-    * 支持飞书群消息
-  * V2.0.0.4
-    * 支持通道独立消息推送
-
 ## 使用方法
   1. Docker安装 
-   * 稳定版V1.0
+  * 发布版
   ```
   docker run --name=inotify -d -p 8000:80 -v inotify_data:/inotify_data --restart=always xpnas/inotify:latest
   ```
-  * 开发版V2.0.0.4 
+  * 开发版
   ```
   docker run --name=inotify -d -p 8000:80 -v inotify_data:/inotify_data --restart=always xpnas/inotify:master
   ```
@@ -72,11 +56,11 @@
 
 ## 系统截图
   
-![](../master/public/A.png)
+![](../public/A.png)
 
-![](../master/public/B.png)
+![](../public/B.png)
 
-![](../master/public/C.png)
+![](../public/C.png)
 
-![](../master/public/D.png)
+![](../public/D.png)
 

sonar.sln

@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31129.286
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Inotify", "Inotify\Inotify.csproj", "{EEDAC4E1-2C4F-4400-B2AE-E7027EE83C83}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{EEDAC4E1-2C4F-4400-B2AE-E7027EE83C83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EEDAC4E1-2C4F-4400-B2AE-E7027EE83C83}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EEDAC4E1-2C4F-4400-B2AE-E7027EE83C83}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EEDAC4E1-2C4F-4400-B2AE-E7027EE83C83}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {E659C816-7213-4399-9AB3-0E575CAD9C97}
+	EndGlobalSection
+EndGlobal