From 5b94ccf256005f48be490f49b2f431188de5a3a1 Mon Sep 17 00:00:00 2001 From: cKey <35512826+colinin@users.noreply.github.com> Date: Wed, 16 Jun 2021 16:11:29 +0800 Subject: [PATCH] upgrade cap 5.1.0 --- .../IMyNotificationAppService.cs | 2 - .../Notifications/INotificationAppService.cs | 9 + .../Abp/MessageService/Chat/ChatAppService.cs | 2 +- .../Notifications/MyNotificationAppService.cs | 2 + .../Notifications/NotificationAppService.cs | 35 ++++ .../Abp/MessageService/Chat/ChatController.cs | 2 +- .../Notifications/MyNotificationController.cs | 6 - .../Notifications/NotificationController.cs | 26 +++ .../AuthServer.Host/AuthServer.Host.csproj | 8 +- ...NGYUN.Abp.BackendAdmin.HttpApi.Host.csproj | 6 +- .../LINGYUN.ApiGateway.Host.csproj | 6 +- .../LINGYUN.ApiGateway.HttpApi.Host.csproj | 6 +- ...UN.Abp.IdentityServer4.HttpApi.Host.csproj | 6 +- ...LocalizationManagement.HttpApi.Host.csproj | 6 +- ...YUN.Abp.MessageService.HttpApi.Host.csproj | 6 +- .../LINGYUN.Platform.HttpApi.Host.csproj | 6 +- vueJs/package-lock.json | 155 ++---------------- vueJs/package.json | 3 +- .../MarkdownEditor/default-options.ts | 27 --- vueJs/src/components/MarkdownEditor/index.vue | 128 --------------- vueJs/src/router/modules/components.ts | 6 - vueJs/src/views/components-demo/markdown.vue | 135 --------------- 22 files changed, 110 insertions(+), 478 deletions(-) create mode 100644 aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/INotificationAppService.cs create mode 100644 aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN/Abp/MessageService/Notifications/NotificationAppService.cs create mode 100644 aspnet-core/modules/message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN/Abp/MessageService/Notifications/NotificationController.cs delete mode 100644 vueJs/src/components/MarkdownEditor/default-options.ts delete mode 100644 vueJs/src/components/MarkdownEditor/index.vue delete mode 100644 vueJs/src/views/components-demo/markdown.vue diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/IMyNotificationAppService.cs b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/IMyNotificationAppService.cs index e5dce9110..0c328c8f7 100644 --- a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/IMyNotificationAppService.cs +++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/IMyNotificationAppService.cs @@ -14,8 +14,6 @@ namespace LINGYUN.Abp.MessageService.Notifications >, IDeleteAppService { - Task SendNofiterAsync(NotificationSendDto input); - Task> GetAssignableNotifiersAsync(); } } diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/INotificationAppService.cs b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/INotificationAppService.cs new file mode 100644 index 000000000..3af9843d1 --- /dev/null +++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/INotificationAppService.cs @@ -0,0 +1,9 @@ +using System.Threading.Tasks; + +namespace LINGYUN.Abp.MessageService.Notifications +{ + public interface INotificationAppService + { + Task SendAsync(NotificationSendDto input); + } +} diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN/Abp/MessageService/Chat/ChatAppService.cs b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN/Abp/MessageService/Chat/ChatAppService.cs index 191969f19..ee7f85368 100644 --- a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN/Abp/MessageService/Chat/ChatAppService.cs +++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN/Abp/MessageService/Chat/ChatAppService.cs @@ -9,6 +9,7 @@ using Volo.Abp.Users; namespace LINGYUN.Abp.MessageService.Chat { + [Authorize] public class ChatAppService : ApplicationService, IChatAppService { protected IMessageSender MessageSender => LazyServiceProvider.LazyGetRequiredService(); @@ -24,7 +25,6 @@ namespace LINGYUN.Abp.MessageService.Chat _userGroupStore = userGroupStore; } - [Authorize] public virtual async Task> GetMyChatMessageAsync(UserMessageGetByPagedDto input) { var chatMessageCount = await _messageStore diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN/Abp/MessageService/Notifications/MyNotificationAppService.cs b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN/Abp/MessageService/Notifications/MyNotificationAppService.cs index d8c1c43ea..17bda9d91 100644 --- a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN/Abp/MessageService/Notifications/MyNotificationAppService.cs +++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN/Abp/MessageService/Notifications/MyNotificationAppService.cs @@ -1,4 +1,5 @@ using LINGYUN.Abp.Notifications; +using Microsoft.AspNetCore.Authorization; using System.Collections.Generic; using System.Threading.Tasks; using Volo.Abp.Application.Dtos; @@ -7,6 +8,7 @@ using Volo.Abp.Users; namespace LINGYUN.Abp.MessageService.Notifications { + [Authorize] public class MyNotificationAppService : ApplicationService, IMyNotificationAppService { protected INotificationSender NotificationSender { get; } diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN/Abp/MessageService/Notifications/NotificationAppService.cs b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN/Abp/MessageService/Notifications/NotificationAppService.cs new file mode 100644 index 000000000..7ffe5a310 --- /dev/null +++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application/LINGYUN/Abp/MessageService/Notifications/NotificationAppService.cs @@ -0,0 +1,35 @@ +using LINGYUN.Abp.Notifications; +using Microsoft.AspNetCore.Authorization; +using System.Threading.Tasks; +using Volo.Abp.Application.Services; + +namespace LINGYUN.Abp.MessageService.Notifications +{ + [Authorize] + public class NotificationAppService : ApplicationService, INotificationAppService + { + protected INotificationSender NotificationSender { get; } + + public NotificationAppService( + INotificationSender notificationSender) + { + NotificationSender = notificationSender; + } + + public virtual async Task SendAsync(NotificationSendDto input) + { + UserIdentifier user = null; + if (input.ToUserId.HasValue) + { + user = new UserIdentifier(input.ToUserId.Value, input.ToUserName); + } + await NotificationSender + .SendNofiterAsync( + input.Name, + input.Data, + user, + CurrentTenant.Id, + input.Severity); + } + } +} diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN/Abp/MessageService/Chat/ChatController.cs b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN/Abp/MessageService/Chat/ChatController.cs index 75be01a94..48bb31206 100644 --- a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN/Abp/MessageService/Chat/ChatController.cs +++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN/Abp/MessageService/Chat/ChatController.cs @@ -39,7 +39,7 @@ namespace LINGYUN.Abp.MessageService.Chat return await _chatAppService.GetMyLastChatMessageAsync(input); } - [HttpGet] + [HttpPost] [Route("send-message")] public virtual async Task SendMessageAsync(ChatMessage input) { diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN/Abp/MessageService/Notifications/MyNotificationController.cs b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN/Abp/MessageService/Notifications/MyNotificationController.cs index b1761ee5d..76b1eac76 100644 --- a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN/Abp/MessageService/Notifications/MyNotificationController.cs +++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN/Abp/MessageService/Notifications/MyNotificationController.cs @@ -19,12 +19,6 @@ namespace LINGYUN.Abp.MessageService.Notifications MyNotificationAppService = myNotificationAppService; } - [HttpPost] - public virtual async Task SendNofiterAsync(NotificationSendDto input) - { - await MyNotificationAppService.SendNofiterAsync(input); - } - [HttpDelete] [Route("{id}")] public virtual async Task DeleteAsync(long id) diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN/Abp/MessageService/Notifications/NotificationController.cs b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN/Abp/MessageService/Notifications/NotificationController.cs new file mode 100644 index 000000000..c92a54ec7 --- /dev/null +++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN/Abp/MessageService/Notifications/NotificationController.cs @@ -0,0 +1,26 @@ +using Microsoft.AspNetCore.Mvc; +using System.Threading.Tasks; +using Volo.Abp; +using Volo.Abp.AspNetCore.Mvc; + +namespace LINGYUN.Abp.MessageService.Notifications +{ + [RemoteService(Name = AbpMessageServiceConsts.RemoteServiceName)] + [Route("api/notifilers")] + public class NotificationController : AbpController, INotificationAppService + { + protected INotificationAppService NotificationAppService { get; } + + public NotificationController( + INotificationAppService notificationAppService) + { + NotificationAppService = notificationAppService; + } + + [HttpPost] + public virtual async Task SendAsync(NotificationSendDto input) + { + await NotificationAppService.SendAsync(input); + } + } +} diff --git a/aspnet-core/services/account/AuthServer.Host/AuthServer.Host.csproj b/aspnet-core/services/account/AuthServer.Host/AuthServer.Host.csproj index e73fc2287..f906b02f1 100644 --- a/aspnet-core/services/account/AuthServer.Host/AuthServer.Host.csproj +++ b/aspnet-core/services/account/AuthServer.Host/AuthServer.Host.csproj @@ -1,4 +1,4 @@ - + net5.0 @@ -22,9 +22,9 @@ - - - + + + diff --git a/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/LINGYUN.Abp.BackendAdmin.HttpApi.Host.csproj b/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/LINGYUN.Abp.BackendAdmin.HttpApi.Host.csproj index 8d47574d2..625c06231 100644 --- a/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/LINGYUN.Abp.BackendAdmin.HttpApi.Host.csproj +++ b/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/LINGYUN.Abp.BackendAdmin.HttpApi.Host.csproj @@ -23,9 +23,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/LINGYUN.ApiGateway.Host.csproj b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/LINGYUN.ApiGateway.Host.csproj index d9a87777a..d369adc3c 100644 --- a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/LINGYUN.ApiGateway.Host.csproj +++ b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/LINGYUN.ApiGateway.Host.csproj @@ -11,9 +11,9 @@ - - - + + + diff --git a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/LINGYUN.ApiGateway.HttpApi.Host.csproj b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/LINGYUN.ApiGateway.HttpApi.Host.csproj index f9d61f303..bb4eee50d 100644 --- a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/LINGYUN.ApiGateway.HttpApi.Host.csproj +++ b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/LINGYUN.ApiGateway.HttpApi.Host.csproj @@ -11,9 +11,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/LINGYUN.Abp.IdentityServer4.HttpApi.Host.csproj b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/LINGYUN.Abp.IdentityServer4.HttpApi.Host.csproj index 5421866d6..a08193d84 100644 --- a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/LINGYUN.Abp.IdentityServer4.HttpApi.Host.csproj +++ b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/LINGYUN.Abp.IdentityServer4.HttpApi.Host.csproj @@ -21,9 +21,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/LINGYUN.Abp.LocalizationManagement.HttpApi.Host.csproj b/aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/LINGYUN.Abp.LocalizationManagement.HttpApi.Host.csproj index 980642823..0dbe80fbf 100644 --- a/aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/LINGYUN.Abp.LocalizationManagement.HttpApi.Host.csproj +++ b/aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/LINGYUN.Abp.LocalizationManagement.HttpApi.Host.csproj @@ -6,9 +6,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/LINGYUN.Abp.MessageService.HttpApi.Host.csproj b/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/LINGYUN.Abp.MessageService.HttpApi.Host.csproj index 6a15a0b68..9f81465fa 100644 --- a/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/LINGYUN.Abp.MessageService.HttpApi.Host.csproj +++ b/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/LINGYUN.Abp.MessageService.HttpApi.Host.csproj @@ -16,9 +16,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/LINGYUN.Platform.HttpApi.Host.csproj b/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/LINGYUN.Platform.HttpApi.Host.csproj index adbd085aa..5f5064fb0 100644 --- a/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/LINGYUN.Platform.HttpApi.Host.csproj +++ b/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/LINGYUN.Platform.HttpApi.Host.csproj @@ -20,9 +20,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/vueJs/package-lock.json b/vueJs/package-lock.json index f1fe61585..8da98c69a 100644 --- a/vueJs/package-lock.json +++ b/vueJs/package-lock.json @@ -2224,7 +2224,8 @@ "@types/estree": { "version": "0.0.44", "resolved": "https://registry.npm.taobao.org/@types/estree/download/@types/estree-0.0.44.tgz", - "integrity": "sha1-mAzFopo+876m/x99AhBH1+pXXiE=" + "integrity": "sha1-mAzFopo+876m/x99AhBH1+pXXiE=", + "dev": true }, "@types/events": { "version": "3.0.0", @@ -2325,6 +2326,7 @@ "version": "3.3.36", "resolved": "https://registry.npm.taobao.org/@types/jquery/download/@types/jquery-3.3.36.tgz", "integrity": "sha1-qGjBwkSp97mI2PxWoyNPIuc8V7g=", + "dev": true, "requires": { "@types/sizzle": "*" } @@ -2350,25 +2352,12 @@ "@types/node": "*" } }, - "@types/linkify-it": { - "version": "2.1.0", - "resolved": "https://registry.npm.taobao.org/@types/linkify-it/download/@types/linkify-it-2.1.0.tgz", - "integrity": "sha1-6j3WTEgFWXMReQth6HLL0e0s2AY=" - }, "@types/lodash": { "version": "4.14.150", "resolved": "https://registry.npm.taobao.org/@types/lodash/download/@types/lodash-4.14.150.tgz", "integrity": "sha1-ZJ/kRoTD8fy2Fk2UPFphl36M8L0=", "dev": true }, - "@types/markdown-it": { - "version": "0.0.7", - "resolved": "https://registry.npm.taobao.org/@types/markdown-it/download/@types/markdown-it-0.0.7.tgz", - "integrity": "sha1-dQcEhaPYrRHn3rgof0QwvhW/TTk=", - "requires": { - "@types/linkify-it": "*" - } - }, "@types/mime": { "version": "2.0.1", "resolved": "https://registry.npm.taobao.org/@types/mime/download/@types/mime-2.0.1.tgz?cache=0&sync_timestamp=1588201521623&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fmime%2Fdownload%2F%40types%2Fmime-2.0.1.tgz", @@ -2450,7 +2439,8 @@ "@types/sizzle": { "version": "2.3.2", "resolved": "https://registry.npm.taobao.org/@types/sizzle/download/@types/sizzle-2.3.2.tgz", - "integrity": "sha1-qBG4wY4rq6t9VCszZYh64uTZ3kc=" + "integrity": "sha1-qBG4wY4rq6t9VCszZYh64uTZ3kc=", + "dev": true }, "@types/sortablejs": { "version": "1.10.4", @@ -2480,6 +2470,7 @@ "version": "0.23.3", "resolved": "https://registry.npm.taobao.org/@types/tern/download/@types/tern-0.23.3.tgz", "integrity": "sha1-S1RTjwSojJ/3neH2+U9XWn8zlGA=", + "dev": true, "requires": { "@types/estree": "*" } @@ -7623,7 +7614,8 @@ "entities": { "version": "1.1.2", "resolved": "https://registry.npm.taobao.org/entities/download/entities-1.1.2.tgz", - "integrity": "sha1-vfpzUplmTfr9NFKe1PhSKidf6lY=" + "integrity": "sha1-vfpzUplmTfr9NFKe1PhSKidf6lY=", + "dev": true }, "errno": { "version": "0.1.7", @@ -8337,10 +8329,6 @@ "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", "dev": true }, - "eve": { - "version": "git+ssh://git@github.com/adobe-webplatform/eve.git#eef80ed8d188423c2272746fb8ae5cc8dad84cb1", - "from": "eve@git://github.com/adobe-webplatform/eve.git#eef80ed" - }, "event-pubsub": { "version": "4.3.0", "resolved": "https://registry.npm.taobao.org/event-pubsub/download/event-pubsub-4.3.0.tgz", @@ -10217,7 +10205,8 @@ "highlight.js": { "version": "9.18.1", "resolved": "https://registry.npm.taobao.org/highlight.js/download/highlight.js-9.18.1.tgz?cache=0&sync_timestamp=1587986410564&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhighlight.js%2Fdownload%2Fhighlight.js-9.18.1.tgz", - "integrity": "sha1-7SGqAB/mJSuxCj121HVzxlOf4Tw=" + "integrity": "sha1-7SGqAB/mJSuxCj121HVzxlOf4Tw=", + "dev": true }, "hmac-drbg": { "version": "1.0.1", @@ -14309,11 +14298,6 @@ } } }, - "jquery": { - "version": "3.5.0", - "resolved": "https://registry.npm.taobao.org/jquery/download/jquery-3.5.0.tgz?cache=0&sync_timestamp=1586533553065&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjquery%2Fdownload%2Fjquery-3.5.0.tgz", - "integrity": "sha1-mYC5fZ5BlGEcNlMOfcRqWNc0D8k=" - }, "js-beautify": { "version": "1.11.0", "resolved": "https://registry.npm.taobao.org/js-beautify/download/js-beautify-1.11.0.tgz", @@ -14651,14 +14635,6 @@ "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", "dev": true }, - "linkify-it": { - "version": "2.2.0", - "resolved": "https://registry.npm.taobao.org/linkify-it/download/linkify-it-2.2.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flinkify-it%2Fdownload%2Flinkify-it-2.2.0.tgz", - "integrity": "sha1-47VGl+eL+RXHCjis14/QngBYsc8=", - "requires": { - "uc.micro": "^1.0.1" - } - }, "lint-staged": { "version": "10.2.0", "resolved": "https://registry.npm.taobao.org/lint-staged/download/lint-staged-10.2.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flint-staged%2Fdownload%2Flint-staged-10.2.0.tgz", @@ -15960,18 +15936,6 @@ "object-visit": "^1.0.0" } }, - "markdown-it": { - "version": "9.1.0", - "resolved": "https://registry.npm.taobao.org/markdown-it/download/markdown-it-9.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmarkdown-it%2Fdownload%2Fmarkdown-it-9.1.0.tgz", - "integrity": "sha1-35YBwWhWhwTVVLH/+a8MW1YRaNk=", - "requires": { - "argparse": "^1.0.7", - "entities": "~1.1.1", - "linkify-it": "^2.0.0", - "mdurl": "^1.0.1", - "uc.micro": "^1.0.5" - } - }, "md5.js": { "version": "1.3.5", "resolved": "https://registry.npm.taobao.org/md5.js/download/md5.js-1.3.5.tgz", @@ -15988,11 +15952,6 @@ "resolved": "https://registry.npm.taobao.org/mdn-data/download/mdn-data-2.0.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmdn-data%2Fdownload%2Fmdn-data-2.0.4.tgz", "integrity": "sha1-aZs8OKxvHXKAkaZGULZdOIUC/Vs=" }, - "mdurl": { - "version": "1.0.1", - "resolved": "https://registry.npm.taobao.org/mdurl/download/mdurl-1.0.1.tgz", - "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=" - }, "media-typer": { "version": "0.3.0", "resolved": "https://registry.npm.taobao.org/media-typer/download/media-typer-0.3.0.tgz", @@ -17361,11 +17320,6 @@ } } }, - "plantuml-encoder": { - "version": "1.4.0", - "resolved": "https://registry.npm.taobao.org/plantuml-encoder/download/plantuml-encoder-1.4.0.tgz", - "integrity": "sha1-eJkwLPeF3pVr8aFn4VQg/u5Zdfc=" - }, "please-upgrade-node": { "version": "3.2.0", "resolved": "https://registry.npm.taobao.org/please-upgrade-node/download/please-upgrade-node-3.2.0.tgz", @@ -18345,13 +18299,6 @@ "integrity": "sha1-PPNwI9GZ4cJNGlW4SADC8+ZGgDE=", "dev": true }, - "raphael": { - "version": "git+ssh://git@github.com/nhn/raphael.git#78a6ed3ec269f33b6457b0ec66f8c3d1f2ed70e0", - "from": "raphael@git+https://github.com/nhn/raphael.git#2.2.0-c", - "requires": { - "eve": "eve@git://github.com/adobe-webplatform/eve.git#eef80ed" - } - }, "raw-body": { "version": "2.4.0", "resolved": "https://registry.npm.taobao.org/raw-body/download/raw-body-2.4.0.tgz", @@ -19728,10 +19675,6 @@ "resolved": "https://registry.npm.taobao.org/sprintf-js/download/sprintf-js-1.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsprintf-js%2Fdownload%2Fsprintf-js-1.0.3.tgz", "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, - "squire-rte": { - "version": "git+ssh://git@github.com/seonim-ryu/Squire.git#fd40b4e3020845825701e9689f190bab3f4775d4", - "from": "squire-rte@github:seonim-ryu/Squire#fd40b4e3020845825701e9689f190bab3f4775d4" - }, "ssf": { "version": "0.10.3", "resolved": "https://registry.npm.taobao.org/ssf/download/ssf-0.10.3.tgz?cache=0&sync_timestamp=1583708815803&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fssf%2Fdownload%2Fssf-0.10.3.tgz", @@ -20458,11 +20401,6 @@ "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", "dev": true }, - "to-mark": { - "version": "1.1.9", - "resolved": "https://registry.npm.taobao.org/to-mark/download/to-mark-1.1.9.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fto-mark%2Fdownload%2Fto-mark-1.1.9.tgz", - "integrity": "sha1-LPvI52XEMN3LRqIYvgebTKJ3PVs=" - }, "to-object-path": { "version": "0.3.0", "resolved": "https://registry.npm.taobao.org/to-object-path/download/to-object-path-0.3.0.tgz", @@ -20846,74 +20784,6 @@ "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", "dev": true }, - "tui-chart": { - "version": "3.11.2", - "resolved": "https://registry.npm.taobao.org/tui-chart/download/tui-chart-3.11.2.tgz", - "integrity": "sha1-LRjs3+JlSL+ELoG2woscfiIvs8w=", - "requires": { - "core-js": "^3.6.4", - "raphael": "raphael@git+https://github.com/nhn/raphael.git#2.2.0-c", - "tui-code-snippet": "^2.3.1" - }, - "dependencies": { - "tui-code-snippet": { - "version": "2.3.2", - "resolved": "https://registry.npm.taobao.org/tui-code-snippet/download/tui-code-snippet-2.3.2.tgz?cache=0&sync_timestamp=1586137651875&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftui-code-snippet%2Fdownload%2Ftui-code-snippet-2.3.2.tgz", - "integrity": "sha1-Oes85G6pIEOzJE8VV5ckhTWIDF0=" - } - } - }, - "tui-code-snippet": { - "version": "1.5.2", - "resolved": "https://registry.npm.taobao.org/tui-code-snippet/download/tui-code-snippet-1.5.2.tgz?cache=0&sync_timestamp=1586137651875&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftui-code-snippet%2Fdownload%2Ftui-code-snippet-1.5.2.tgz", - "integrity": "sha1-9Ljw8ayZawtbYh93yVB68ZoN4jg=" - }, - "tui-color-picker": { - "version": "2.2.6", - "resolved": "https://registry.npm.taobao.org/tui-color-picker/download/tui-color-picker-2.2.6.tgz?cache=0&sync_timestamp=1578537206138&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftui-color-picker%2Fdownload%2Ftui-color-picker-2.2.6.tgz", - "integrity": "sha1-urVORzgOVQuzrIrpdAIbPMJRiqk=", - "requires": { - "tui-code-snippet": "^2.2.0" - }, - "dependencies": { - "tui-code-snippet": { - "version": "2.3.2", - "resolved": "https://registry.npm.taobao.org/tui-code-snippet/download/tui-code-snippet-2.3.2.tgz?cache=0&sync_timestamp=1586137651875&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftui-code-snippet%2Fdownload%2Ftui-code-snippet-2.3.2.tgz", - "integrity": "sha1-Oes85G6pIEOzJE8VV5ckhTWIDF0=" - } - } - }, - "tui-editor": { - "version": "1.4.10", - "resolved": "https://registry.npm.taobao.org/tui-editor/download/tui-editor-1.4.10.tgz", - "integrity": "sha1-xprBWEL4GSdIV/GEMA0k8KXtZxc=", - "requires": { - "@types/codemirror": "0.0.71", - "@types/jquery": "^3.3.29", - "@types/markdown-it": "0.0.7", - "codemirror": "^5.48.4", - "highlight.js": "^9.12.0", - "jquery": "^3.3.1", - "markdown-it": "^9.0.0", - "plantuml-encoder": "^1.2.5", - "resize-observer-polyfill": "^1.5.0", - "squire-rte": "squire-rte@github:seonim-ryu/Squire#fd40b4e3020845825701e9689f190bab3f4775d4", - "to-mark": "^1.1.9", - "tui-chart": "^3.7.0", - "tui-code-snippet": "^1.5.0", - "tui-color-picker": "^2.2.1" - }, - "dependencies": { - "@types/codemirror": { - "version": "0.0.71", - "resolved": "https://registry.npm.taobao.org/@types/codemirror/download/@types/codemirror-0.0.71.tgz", - "integrity": "sha1-hh8byzEAwKBkVnxUAPKYHPSujKc=", - "requires": { - "@types/tern": "*" - } - } - } - }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npm.taobao.org/tunnel-agent/download/tunnel-agent-0.6.0.tgz", @@ -20979,11 +20849,6 @@ "integrity": "sha1-QJ64VE6gM1cRIFhp7EWKsQnuEGE=", "dev": true }, - "uc.micro": { - "version": "1.0.6", - "resolved": "https://registry.npm.taobao.org/uc.micro/download/uc.micro-1.0.6.tgz", - "integrity": "sha1-nEEagCpAmpH8bPdAgbq6NLJEmaw=" - }, "uglify-js": { "version": "3.4.10", "resolved": "https://registry.npm.taobao.org/uglify-js/download/uglify-js-3.4.10.tgz?cache=0&sync_timestamp=1586950053979&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuglify-js%2Fdownload%2Fuglify-js-3.4.10.tgz", diff --git a/vueJs/package.json b/vueJs/package.json index 5102bccf9..4fc1f5916 100644 --- a/vueJs/package.json +++ b/vueJs/package.json @@ -15,7 +15,7 @@ "test:unit": "jest --clearCache && vue-cli-service test:unit" }, "dependencies": { - "@microsoft/signalr": "^3.1.4", + "@microsoft/signalr": "^5.0.7", "@tinymce/tinymce-vue": "^3.2.0", "axios": "^0.21.1", "clipboard": "^2.0.6", @@ -43,7 +43,6 @@ "simple-progress-webpack-plugin": "^1.1.2", "sortablejs": "^1.10.2", "tinymce": "^5.2.1", - "tui-editor": "^1.4.10", "view-design": "^4.2.0", "vue": "^2.6.11", "vue-class-component": "^7.2.3", diff --git a/vueJs/src/components/MarkdownEditor/default-options.ts b/vueJs/src/components/MarkdownEditor/default-options.ts deleted file mode 100644 index c774baaca..000000000 --- a/vueJs/src/components/MarkdownEditor/default-options.ts +++ /dev/null @@ -1,27 +0,0 @@ -// Doc: https://nhn.github.io/tui.editor/api/latest/ToastUIEditor.html#ToastUIEditor -export default { - previewStyle: 'vertical', - usageStatistics: false, - toolbarItems: [ - 'heading', - 'bold', - 'italic', - 'strike', - 'divider', - 'hr', - 'quote', - 'divider', - 'ul', - 'ol', - 'task', - 'indent', - 'outdent', - 'divider', - 'table', - 'image', - 'link', - 'divider', - 'code', - 'codeblock' - ] -} diff --git a/vueJs/src/components/MarkdownEditor/index.vue b/vueJs/src/components/MarkdownEditor/index.vue deleted file mode 100644 index f0fc7abab..000000000 --- a/vueJs/src/components/MarkdownEditor/index.vue +++ /dev/null @@ -1,128 +0,0 @@ - - - diff --git a/vueJs/src/router/modules/components.ts b/vueJs/src/router/modules/components.ts index 19ae70a9a..a56447aab 100644 --- a/vueJs/src/router/modules/components.ts +++ b/vueJs/src/router/modules/components.ts @@ -17,12 +17,6 @@ const componentsRouter: RouteConfig = { name: 'TinymceDemo', meta: { title: 'tinymce' } }, - { - path: 'markdown', - component: () => import(/* webpackChunkName: "markdown" */ '@/views/components-demo/markdown.vue'), - name: 'MarkdownDemo', - meta: { title: 'markdown' } - }, { path: 'json-editor', component: () => import(/* webpackChunkName: "json-editor" */ '@/views/components-demo/json-editor.vue'), diff --git a/vueJs/src/views/components-demo/markdown.vue b/vueJs/src/views/components-demo/markdown.vue deleted file mode 100644 index 76b29d2c6..000000000 --- a/vueJs/src/views/components-demo/markdown.vue +++ /dev/null @@ -1,135 +0,0 @@ - - - - -