diff --git a/src/JT808.DotNetty.Abstractions/JT808.DotNetty.Abstractions.csproj b/src/JT808.DotNetty.Abstractions/JT808.DotNetty.Abstractions.csproj index cc77864..359146f 100644 --- a/src/JT808.DotNetty.Abstractions/JT808.DotNetty.Abstractions.csproj +++ b/src/JT808.DotNetty.Abstractions/JT808.DotNetty.Abstractions.csproj @@ -14,7 +14,7 @@ https://github.com/SmallChi/JT808DotNetty https://github.com/SmallChi/JT808DotNetty/blob/master/LICENSE true - 1.1.0 + 1.1.1 diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/EmptyRequest.proto b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/EmptyRequest.proto deleted file mode 100644 index 503bbba..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/EmptyRequest.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -package JT808.GrpcDashbord.ServiceGrpcBase; - -// 空请求 -message EmptyRequest{ - -} \ No newline at end of file diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/Extensions/ErrorExtensions.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/Extensions/ErrorExtensions.cs deleted file mode 100644 index 69d94e5..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/Extensions/ErrorExtensions.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Grpc.Core; -using System; -using System.Collections.Generic; -using System.Text; - -namespace JT808.DotNetty.Dashbord.GrpcProtocol.Extensions -{ - public static class ErrorExtensions - { - public static void Unauthenticated(string msg= "Invalid Token") - { - throw new Grpc.Core.RpcException(new Status(StatusCode.Unauthenticated, msg)); - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/Extensions/ServerCallContextExtensions.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/Extensions/ServerCallContextExtensions.cs deleted file mode 100644 index 27ad2bf..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/Extensions/ServerCallContextExtensions.cs +++ /dev/null @@ -1,30 +0,0 @@ -using Grpc.Core; -using System; -using System.Collections.Generic; -using System.Text; - -namespace JT808.DotNetty.Dashbord.GrpcProtocol.Extensions -{ - public static class ServerCallContextExtensions - { - public static void SetResultStatus(this ServerCallContext serverCallContext, StatusCode statusCode, string detail) - { - serverCallContext.Status = new Status(statusCode, detail); - } - - public static void Ok(this ServerCallContext serverCallContext,string detail="") - { - serverCallContext.Status = new Status(StatusCode.OK, detail); - } - - public static void Auth(this ServerCallContext serverCallContext, string detail = "") - { - serverCallContext.Status = new Status(StatusCode.Unauthenticated, detail); - } - - public static void InternalError(this ServerCallContext serverCallContext, string detail = "") - { - serverCallContext.Status = new Status(StatusCode.Internal, detail); - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/JT808.DotNetty.Dashbord.GrpcProtocol.csproj b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/JT808.DotNetty.Dashbord.GrpcProtocol.csproj deleted file mode 100644 index 85c5312..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/JT808.DotNetty.Dashbord.GrpcProtocol.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - netstandard2.0 - - - - - - - all - runtime; build; native; contentfiles; analyzers - - - - - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/JT808AtomicCounterService.proto b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/JT808AtomicCounterService.proto deleted file mode 100644 index f840985..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/JT808AtomicCounterService.proto +++ /dev/null @@ -1,15 +0,0 @@ -syntax = "proto3"; - -package JT808.GrpcDashbord.AtomicCounterGrpcService; - -import "EmptyRequest.proto"; - -service AtomicCounterService{ - rpc GetTcpAtomicCounter(JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest) returns (AtomicCounterReply){} - rpc GetUdpAtomicCounter(JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest) returns (AtomicCounterReply){} -} - -message AtomicCounterReply{ - int32 MsgSuccessCount = 1; - int32 MsgFailCount = 2; -} \ No newline at end of file diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/JT808SessionService.proto b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/JT808SessionService.proto deleted file mode 100644 index 76c891e..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/JT808SessionService.proto +++ /dev/null @@ -1,32 +0,0 @@ -syntax = "proto3"; - -package JT808.GrpcDashbord.SessionGrpcService; - -import "ResultReply.proto"; -import "EmptyRequest.proto"; - -service SessionService{ - rpc GetTcpSessionAll(JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest) returns (TcpSessionReply){} - rpc GetUdpSessionAll(JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest) returns (UdpSessionReply){} -} - -message TcpSessionReply{ - repeated SessionInfo SessionInfos=1; - JT808.GrpcDashbord.ServiceGrpcBase.ResultReply ResultReply=2; -} - -message UdpSessionReply{ - repeated SessionInfo SessionInfos = 1; - JT808.GrpcDashbord.ServiceGrpcBase.ResultReply ResultReply=2; -} - -message SessionInfo{ - // 最后上线时间 - int64 LastActiveTime=1; - // 上线时间 - int64 StartTime=2; - // 终端手机号 - string TerminalPhoneNo=3; - // 远程ip地址 - string RemoteAddressIP=4; -} \ No newline at end of file diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/JT808UnificationSendService.proto b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/JT808UnificationSendService.proto deleted file mode 100644 index 89b6e3f..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/JT808UnificationSendService.proto +++ /dev/null @@ -1,18 +0,0 @@ -syntax = "proto3"; - -package JT808.GrpcDashbord.AtomicCounterGrpcService; - -import "ResultReply.proto"; - -service UnificationSendService{ - // 文本信息下发 - rpc SendText(SendTextRequest) returns (JT808.GrpcDashbord.ServiceGrpcBase.ResultReply){} -} - -//下发文本信息参数 -message SendTextRequest{ - //终端手机号 - string TerminalPhoneNo = 1; - //内容 - string Content = 2; -} \ No newline at end of file diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/PageReply.proto b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/PageReply.proto deleted file mode 100644 index 895cb1e..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/PageReply.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -package JT808.GrpcDashbord.ServiceGrpcBase; - -// 统一分页返回参数 -message PageOptionsRequest{ - int32 PageIndex=1; - int32 Total =2; -} \ No newline at end of file diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/PageRequest.proto b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/PageRequest.proto deleted file mode 100644 index 137fc3d..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/PageRequest.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; - -package JT808.GrpcDashbord.ServiceGrpcBase; - -// 统一分页参数 -message PageRequest{ - int32 PageIndex=1; - int32 PageSize=2; - int32 Total =3; - int32 Skip=4; - map Sort = 5; -} \ No newline at end of file diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/ResultReply.proto b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/ResultReply.proto deleted file mode 100644 index e8a0c7e..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/ResultReply.proto +++ /dev/null @@ -1,17 +0,0 @@ -syntax = "proto3"; - -package JT808.GrpcDashbord.ServiceGrpcBase; - -// 统一回复 -message ResultReply{ - // 状态码 - enum StatusCode{ - Success = 0; - NoContent = 1; - Failure = 2; - Unauthorized=3; - InnerError = 4; - } - StatusCode Code=1; - string Msg=2; -} \ No newline at end of file diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/EmptyRequest.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/EmptyRequest.cs deleted file mode 100644 index 5b03ea3..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/EmptyRequest.cs +++ /dev/null @@ -1,147 +0,0 @@ -// -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: EmptyRequest.proto -// -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.Protobuf; -using pbc = global::Google.Protobuf.Collections; -using pbr = global::Google.Protobuf.Reflection; -using scg = global::System.Collections.Generic; -namespace JT808.GrpcDashbord.ServiceGrpcBase { - - /// Holder for reflection information generated from EmptyRequest.proto - public static partial class EmptyRequestReflection { - - #region Descriptor - /// File descriptor for EmptyRequest.proto - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static EmptyRequestReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "ChJFbXB0eVJlcXVlc3QucHJvdG8SIkpUODA4LkdycGNEYXNoYm9yZC5TZXJ2", - "aWNlR3JwY0Jhc2UiDgoMRW1wdHlSZXF1ZXN0YgZwcm90bzM=")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { }, - new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest), global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest.Parser, null, null, null, null) - })); - } - #endregion - - } - #region Messages - /// - /// 空请求 - /// - public sealed partial class EmptyRequest : pb::IMessage { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new EmptyRequest()); - private pb::UnknownFieldSet _unknownFields; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequestReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public EmptyRequest() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public EmptyRequest(EmptyRequest other) : this() { - _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public EmptyRequest Clone() { - return new EmptyRequest(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as EmptyRequest); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(EmptyRequest other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - return Equals(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (_unknownFields != null) { - hash ^= _unknownFields.GetHashCode(); - } - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void WriteTo(pb::CodedOutputStream output) { - if (_unknownFields != null) { - _unknownFields.WriteTo(output); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (_unknownFields != null) { - size += _unknownFields.CalculateSize(); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(EmptyRequest other) { - if (other == null) { - return; - } - _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); - break; - } - } - } - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/JT808AtomicCounterService.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/JT808AtomicCounterService.cs deleted file mode 100644 index 84216f3..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/JT808AtomicCounterService.cs +++ /dev/null @@ -1,209 +0,0 @@ -// -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: JT808AtomicCounterService.proto -// -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.Protobuf; -using pbc = global::Google.Protobuf.Collections; -using pbr = global::Google.Protobuf.Reflection; -using scg = global::System.Collections.Generic; -namespace JT808.GrpcDashbord.AtomicCounterGrpcService { - - /// Holder for reflection information generated from JT808AtomicCounterService.proto - public static partial class JT808AtomicCounterServiceReflection { - - #region Descriptor - /// File descriptor for JT808AtomicCounterService.proto - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static JT808AtomicCounterServiceReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "Ch9KVDgwOEF0b21pY0NvdW50ZXJTZXJ2aWNlLnByb3RvEitKVDgwOC5HcnBj", - "RGFzaGJvcmQuQXRvbWljQ291bnRlckdycGNTZXJ2aWNlGhJFbXB0eVJlcXVl", - "c3QucHJvdG8iQwoSQXRvbWljQ291bnRlclJlcGx5EhcKD01zZ1N1Y2Nlc3ND", - "b3VudBgBIAEoBRIUCgxNc2dGYWlsQ291bnQYAiABKAUysAIKFEF0b21pY0Nv", - "dW50ZXJTZXJ2aWNlEooBChNHZXRUY3BBdG9taWNDb3VudGVyEjAuSlQ4MDgu", - "R3JwY0Rhc2hib3JkLlNlcnZpY2VHcnBjQmFzZS5FbXB0eVJlcXVlc3QaPy5K", - "VDgwOC5HcnBjRGFzaGJvcmQuQXRvbWljQ291bnRlckdycGNTZXJ2aWNlLkF0", - "b21pY0NvdW50ZXJSZXBseSIAEooBChNHZXRVZHBBdG9taWNDb3VudGVyEjAu", - "SlQ4MDguR3JwY0Rhc2hib3JkLlNlcnZpY2VHcnBjQmFzZS5FbXB0eVJlcXVl", - "c3QaPy5KVDgwOC5HcnBjRGFzaGJvcmQuQXRvbWljQ291bnRlckdycGNTZXJ2", - "aWNlLkF0b21pY0NvdW50ZXJSZXBseSIAYgZwcm90bzM=")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequestReflection.Descriptor, }, - new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply), global::JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply.Parser, new[]{ "MsgSuccessCount", "MsgFailCount" }, null, null, null) - })); - } - #endregion - - } - #region Messages - public sealed partial class AtomicCounterReply : pb::IMessage { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new AtomicCounterReply()); - private pb::UnknownFieldSet _unknownFields; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::JT808.GrpcDashbord.AtomicCounterGrpcService.JT808AtomicCounterServiceReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public AtomicCounterReply() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public AtomicCounterReply(AtomicCounterReply other) : this() { - msgSuccessCount_ = other.msgSuccessCount_; - msgFailCount_ = other.msgFailCount_; - _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public AtomicCounterReply Clone() { - return new AtomicCounterReply(this); - } - - /// Field number for the "MsgSuccessCount" field. - public const int MsgSuccessCountFieldNumber = 1; - private int msgSuccessCount_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int MsgSuccessCount { - get { return msgSuccessCount_; } - set { - msgSuccessCount_ = value; - } - } - - /// Field number for the "MsgFailCount" field. - public const int MsgFailCountFieldNumber = 2; - private int msgFailCount_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int MsgFailCount { - get { return msgFailCount_; } - set { - msgFailCount_ = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as AtomicCounterReply); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(AtomicCounterReply other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (MsgSuccessCount != other.MsgSuccessCount) return false; - if (MsgFailCount != other.MsgFailCount) return false; - return Equals(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (MsgSuccessCount != 0) hash ^= MsgSuccessCount.GetHashCode(); - if (MsgFailCount != 0) hash ^= MsgFailCount.GetHashCode(); - if (_unknownFields != null) { - hash ^= _unknownFields.GetHashCode(); - } - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void WriteTo(pb::CodedOutputStream output) { - if (MsgSuccessCount != 0) { - output.WriteRawTag(8); - output.WriteInt32(MsgSuccessCount); - } - if (MsgFailCount != 0) { - output.WriteRawTag(16); - output.WriteInt32(MsgFailCount); - } - if (_unknownFields != null) { - _unknownFields.WriteTo(output); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (MsgSuccessCount != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(MsgSuccessCount); - } - if (MsgFailCount != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(MsgFailCount); - } - if (_unknownFields != null) { - size += _unknownFields.CalculateSize(); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(AtomicCounterReply other) { - if (other == null) { - return; - } - if (other.MsgSuccessCount != 0) { - MsgSuccessCount = other.MsgSuccessCount; - } - if (other.MsgFailCount != 0) { - MsgFailCount = other.MsgFailCount; - } - _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); - break; - case 8: { - MsgSuccessCount = input.ReadInt32(); - break; - } - case 16: { - MsgFailCount = input.ReadInt32(); - break; - } - } - } - } - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/JT808AtomicCounterServiceGrpc.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/JT808AtomicCounterServiceGrpc.cs deleted file mode 100644 index 3ec013e..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/JT808AtomicCounterServiceGrpc.cs +++ /dev/null @@ -1,136 +0,0 @@ -// -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: JT808AtomicCounterService.proto -// -#pragma warning disable 0414, 1591 -#region Designer generated code - -using grpc = global::Grpc.Core; - -namespace JT808.GrpcDashbord.AtomicCounterGrpcService { - public static partial class AtomicCounterService - { - static readonly string __ServiceName = "JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterService"; - - static readonly grpc::Marshaller __Marshaller_JT808_GrpcDashbord_ServiceGrpcBase_EmptyRequest = grpc::Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest.Parser.ParseFrom); - static readonly grpc::Marshaller __Marshaller_JT808_GrpcDashbord_AtomicCounterGrpcService_AtomicCounterReply = grpc::Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply.Parser.ParseFrom); - - static readonly grpc::Method __Method_GetTcpAtomicCounter = new grpc::Method( - grpc::MethodType.Unary, - __ServiceName, - "GetTcpAtomicCounter", - __Marshaller_JT808_GrpcDashbord_ServiceGrpcBase_EmptyRequest, - __Marshaller_JT808_GrpcDashbord_AtomicCounterGrpcService_AtomicCounterReply); - - static readonly grpc::Method __Method_GetUdpAtomicCounter = new grpc::Method( - grpc::MethodType.Unary, - __ServiceName, - "GetUdpAtomicCounter", - __Marshaller_JT808_GrpcDashbord_ServiceGrpcBase_EmptyRequest, - __Marshaller_JT808_GrpcDashbord_AtomicCounterGrpcService_AtomicCounterReply); - - /// Service descriptor - public static global::Google.Protobuf.Reflection.ServiceDescriptor Descriptor - { - get { return global::JT808.GrpcDashbord.AtomicCounterGrpcService.JT808AtomicCounterServiceReflection.Descriptor.Services[0]; } - } - - /// Base class for server-side implementations of AtomicCounterService - public abstract partial class AtomicCounterServiceBase - { - public virtual global::System.Threading.Tasks.Task GetTcpAtomicCounter(global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest request, grpc::ServerCallContext context) - { - throw new grpc::RpcException(new grpc::Status(grpc::StatusCode.Unimplemented, "")); - } - - public virtual global::System.Threading.Tasks.Task GetUdpAtomicCounter(global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest request, grpc::ServerCallContext context) - { - throw new grpc::RpcException(new grpc::Status(grpc::StatusCode.Unimplemented, "")); - } - - } - - /// Client for AtomicCounterService - public partial class AtomicCounterServiceClient : grpc::ClientBase - { - /// Creates a new client for AtomicCounterService - /// The channel to use to make remote calls. - public AtomicCounterServiceClient(grpc::Channel channel) : base(channel) - { - } - /// Creates a new client for AtomicCounterService that uses a custom CallInvoker. - /// The callInvoker to use to make remote calls. - public AtomicCounterServiceClient(grpc::CallInvoker callInvoker) : base(callInvoker) - { - } - /// Protected parameterless constructor to allow creation of test doubles. - protected AtomicCounterServiceClient() : base() - { - } - /// Protected constructor to allow creation of configured clients. - /// The client configuration. - protected AtomicCounterServiceClient(ClientBaseConfiguration configuration) : base(configuration) - { - } - - public virtual global::JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply GetTcpAtomicCounter(global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) - { - return GetTcpAtomicCounter(request, new grpc::CallOptions(headers, deadline, cancellationToken)); - } - public virtual global::JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply GetTcpAtomicCounter(global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest request, grpc::CallOptions options) - { - return CallInvoker.BlockingUnaryCall(__Method_GetTcpAtomicCounter, null, options, request); - } - public virtual grpc::AsyncUnaryCall GetTcpAtomicCounterAsync(global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) - { - return GetTcpAtomicCounterAsync(request, new grpc::CallOptions(headers, deadline, cancellationToken)); - } - public virtual grpc::AsyncUnaryCall GetTcpAtomicCounterAsync(global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest request, grpc::CallOptions options) - { - return CallInvoker.AsyncUnaryCall(__Method_GetTcpAtomicCounter, null, options, request); - } - public virtual global::JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply GetUdpAtomicCounter(global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) - { - return GetUdpAtomicCounter(request, new grpc::CallOptions(headers, deadline, cancellationToken)); - } - public virtual global::JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply GetUdpAtomicCounter(global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest request, grpc::CallOptions options) - { - return CallInvoker.BlockingUnaryCall(__Method_GetUdpAtomicCounter, null, options, request); - } - public virtual grpc::AsyncUnaryCall GetUdpAtomicCounterAsync(global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) - { - return GetUdpAtomicCounterAsync(request, new grpc::CallOptions(headers, deadline, cancellationToken)); - } - public virtual grpc::AsyncUnaryCall GetUdpAtomicCounterAsync(global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest request, grpc::CallOptions options) - { - return CallInvoker.AsyncUnaryCall(__Method_GetUdpAtomicCounter, null, options, request); - } - /// Creates a new instance of client from given ClientBaseConfiguration. - protected override AtomicCounterServiceClient NewInstance(ClientBaseConfiguration configuration) - { - return new AtomicCounterServiceClient(configuration); - } - } - - /// Creates service definition that can be registered with a server - /// An object implementing the server-side handling logic. - public static grpc::ServerServiceDefinition BindService(AtomicCounterServiceBase serviceImpl) - { - return grpc::ServerServiceDefinition.CreateBuilder() - .AddMethod(__Method_GetTcpAtomicCounter, serviceImpl.GetTcpAtomicCounter) - .AddMethod(__Method_GetUdpAtomicCounter, serviceImpl.GetUdpAtomicCounter).Build(); - } - - /// Register service method implementations with a service binder. Useful when customizing the service binding logic. - /// Note: this method is part of an experimental API that can change or be removed without any prior notice. - /// Service methods will be bound by calling AddMethod on this object. - /// An object implementing the server-side handling logic. - public static void BindService(grpc::ServiceBinderBase serviceBinder, AtomicCounterServiceBase serviceImpl) - { - serviceBinder.AddMethod(__Method_GetTcpAtomicCounter, serviceImpl.GetTcpAtomicCounter); - serviceBinder.AddMethod(__Method_GetUdpAtomicCounter, serviceImpl.GetUdpAtomicCounter); - } - - } -} -#endregion diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/JT808SessionService.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/JT808SessionService.cs deleted file mode 100644 index e912bf1..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/JT808SessionService.cs +++ /dev/null @@ -1,597 +0,0 @@ -// -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: JT808SessionService.proto -// -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.Protobuf; -using pbc = global::Google.Protobuf.Collections; -using pbr = global::Google.Protobuf.Reflection; -using scg = global::System.Collections.Generic; -namespace JT808.GrpcDashbord.SessionGrpcService { - - /// Holder for reflection information generated from JT808SessionService.proto - public static partial class JT808SessionServiceReflection { - - #region Descriptor - /// File descriptor for JT808SessionService.proto - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static JT808SessionServiceReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "ChlKVDgwOFNlc3Npb25TZXJ2aWNlLnByb3RvEiVKVDgwOC5HcnBjRGFzaGJv", - "cmQuU2Vzc2lvbkdycGNTZXJ2aWNlGhFSZXN1bHRSZXBseS5wcm90bxoSRW1w", - "dHlSZXF1ZXN0LnByb3RvIqEBCg9UY3BTZXNzaW9uUmVwbHkSSAoMU2Vzc2lv", - "bkluZm9zGAEgAygLMjIuSlQ4MDguR3JwY0Rhc2hib3JkLlNlc3Npb25HcnBj", - "U2VydmljZS5TZXNzaW9uSW5mbxJECgtSZXN1bHRSZXBseRgCIAEoCzIvLkpU", - "ODA4LkdycGNEYXNoYm9yZC5TZXJ2aWNlR3JwY0Jhc2UuUmVzdWx0UmVwbHki", - "oQEKD1VkcFNlc3Npb25SZXBseRJICgxTZXNzaW9uSW5mb3MYASADKAsyMi5K", - "VDgwOC5HcnBjRGFzaGJvcmQuU2Vzc2lvbkdycGNTZXJ2aWNlLlNlc3Npb25J", - "bmZvEkQKC1Jlc3VsdFJlcGx5GAIgASgLMi8uSlQ4MDguR3JwY0Rhc2hib3Jk", - "LlNlcnZpY2VHcnBjQmFzZS5SZXN1bHRSZXBseSJqCgtTZXNzaW9uSW5mbxIW", - "Cg5MYXN0QWN0aXZlVGltZRgBIAEoAxIRCglTdGFydFRpbWUYAiABKAMSFwoP", - "VGVybWluYWxQaG9uZU5vGAMgASgJEhcKD1JlbW90ZUFkZHJlc3NJUBgEIAEo", - "CTKQAgoOU2Vzc2lvblNlcnZpY2USfgoQR2V0VGNwU2Vzc2lvbkFsbBIwLkpU", - "ODA4LkdycGNEYXNoYm9yZC5TZXJ2aWNlR3JwY0Jhc2UuRW1wdHlSZXF1ZXN0", - "GjYuSlQ4MDguR3JwY0Rhc2hib3JkLlNlc3Npb25HcnBjU2VydmljZS5UY3BT", - "ZXNzaW9uUmVwbHkiABJ+ChBHZXRVZHBTZXNzaW9uQWxsEjAuSlQ4MDguR3Jw", - "Y0Rhc2hib3JkLlNlcnZpY2VHcnBjQmFzZS5FbXB0eVJlcXVlc3QaNi5KVDgw", - "OC5HcnBjRGFzaGJvcmQuU2Vzc2lvbkdycGNTZXJ2aWNlLlVkcFNlc3Npb25S", - "ZXBseSIAYgZwcm90bzM=")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::JT808.GrpcDashbord.ServiceGrpcBase.ResultReplyReflection.Descriptor, global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequestReflection.Descriptor, }, - new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::JT808.GrpcDashbord.SessionGrpcService.TcpSessionReply), global::JT808.GrpcDashbord.SessionGrpcService.TcpSessionReply.Parser, new[]{ "SessionInfos", "ResultReply" }, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::JT808.GrpcDashbord.SessionGrpcService.UdpSessionReply), global::JT808.GrpcDashbord.SessionGrpcService.UdpSessionReply.Parser, new[]{ "SessionInfos", "ResultReply" }, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::JT808.GrpcDashbord.SessionGrpcService.SessionInfo), global::JT808.GrpcDashbord.SessionGrpcService.SessionInfo.Parser, new[]{ "LastActiveTime", "StartTime", "TerminalPhoneNo", "RemoteAddressIP" }, null, null, null) - })); - } - #endregion - - } - #region Messages - public sealed partial class TcpSessionReply : pb::IMessage { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new TcpSessionReply()); - private pb::UnknownFieldSet _unknownFields; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::JT808.GrpcDashbord.SessionGrpcService.JT808SessionServiceReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public TcpSessionReply() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public TcpSessionReply(TcpSessionReply other) : this() { - sessionInfos_ = other.sessionInfos_.Clone(); - resultReply_ = other.resultReply_ != null ? other.resultReply_.Clone() : null; - _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public TcpSessionReply Clone() { - return new TcpSessionReply(this); - } - - /// Field number for the "SessionInfos" field. - public const int SessionInfosFieldNumber = 1; - private static readonly pb::FieldCodec _repeated_sessionInfos_codec - = pb::FieldCodec.ForMessage(10, global::JT808.GrpcDashbord.SessionGrpcService.SessionInfo.Parser); - private readonly pbc::RepeatedField sessionInfos_ = new pbc::RepeatedField(); - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public pbc::RepeatedField SessionInfos { - get { return sessionInfos_; } - } - - /// Field number for the "ResultReply" field. - public const int ResultReplyFieldNumber = 2; - private global::JT808.GrpcDashbord.ServiceGrpcBase.ResultReply resultReply_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public global::JT808.GrpcDashbord.ServiceGrpcBase.ResultReply ResultReply { - get { return resultReply_; } - set { - resultReply_ = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as TcpSessionReply); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(TcpSessionReply other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if(!sessionInfos_.Equals(other.sessionInfos_)) return false; - if (!object.Equals(ResultReply, other.ResultReply)) return false; - return Equals(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - hash ^= sessionInfos_.GetHashCode(); - if (resultReply_ != null) hash ^= ResultReply.GetHashCode(); - if (_unknownFields != null) { - hash ^= _unknownFields.GetHashCode(); - } - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void WriteTo(pb::CodedOutputStream output) { - sessionInfos_.WriteTo(output, _repeated_sessionInfos_codec); - if (resultReply_ != null) { - output.WriteRawTag(18); - output.WriteMessage(ResultReply); - } - if (_unknownFields != null) { - _unknownFields.WriteTo(output); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - size += sessionInfos_.CalculateSize(_repeated_sessionInfos_codec); - if (resultReply_ != null) { - size += 1 + pb::CodedOutputStream.ComputeMessageSize(ResultReply); - } - if (_unknownFields != null) { - size += _unknownFields.CalculateSize(); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(TcpSessionReply other) { - if (other == null) { - return; - } - sessionInfos_.Add(other.sessionInfos_); - if (other.resultReply_ != null) { - if (resultReply_ == null) { - resultReply_ = new global::JT808.GrpcDashbord.ServiceGrpcBase.ResultReply(); - } - ResultReply.MergeFrom(other.ResultReply); - } - _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); - break; - case 10: { - sessionInfos_.AddEntriesFrom(input, _repeated_sessionInfos_codec); - break; - } - case 18: { - if (resultReply_ == null) { - resultReply_ = new global::JT808.GrpcDashbord.ServiceGrpcBase.ResultReply(); - } - input.ReadMessage(resultReply_); - break; - } - } - } - } - - } - - public sealed partial class UdpSessionReply : pb::IMessage { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new UdpSessionReply()); - private pb::UnknownFieldSet _unknownFields; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::JT808.GrpcDashbord.SessionGrpcService.JT808SessionServiceReflection.Descriptor.MessageTypes[1]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public UdpSessionReply() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public UdpSessionReply(UdpSessionReply other) : this() { - sessionInfos_ = other.sessionInfos_.Clone(); - resultReply_ = other.resultReply_ != null ? other.resultReply_.Clone() : null; - _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public UdpSessionReply Clone() { - return new UdpSessionReply(this); - } - - /// Field number for the "SessionInfos" field. - public const int SessionInfosFieldNumber = 1; - private static readonly pb::FieldCodec _repeated_sessionInfos_codec - = pb::FieldCodec.ForMessage(10, global::JT808.GrpcDashbord.SessionGrpcService.SessionInfo.Parser); - private readonly pbc::RepeatedField sessionInfos_ = new pbc::RepeatedField(); - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public pbc::RepeatedField SessionInfos { - get { return sessionInfos_; } - } - - /// Field number for the "ResultReply" field. - public const int ResultReplyFieldNumber = 2; - private global::JT808.GrpcDashbord.ServiceGrpcBase.ResultReply resultReply_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public global::JT808.GrpcDashbord.ServiceGrpcBase.ResultReply ResultReply { - get { return resultReply_; } - set { - resultReply_ = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as UdpSessionReply); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(UdpSessionReply other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if(!sessionInfos_.Equals(other.sessionInfos_)) return false; - if (!object.Equals(ResultReply, other.ResultReply)) return false; - return Equals(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - hash ^= sessionInfos_.GetHashCode(); - if (resultReply_ != null) hash ^= ResultReply.GetHashCode(); - if (_unknownFields != null) { - hash ^= _unknownFields.GetHashCode(); - } - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void WriteTo(pb::CodedOutputStream output) { - sessionInfos_.WriteTo(output, _repeated_sessionInfos_codec); - if (resultReply_ != null) { - output.WriteRawTag(18); - output.WriteMessage(ResultReply); - } - if (_unknownFields != null) { - _unknownFields.WriteTo(output); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - size += sessionInfos_.CalculateSize(_repeated_sessionInfos_codec); - if (resultReply_ != null) { - size += 1 + pb::CodedOutputStream.ComputeMessageSize(ResultReply); - } - if (_unknownFields != null) { - size += _unknownFields.CalculateSize(); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(UdpSessionReply other) { - if (other == null) { - return; - } - sessionInfos_.Add(other.sessionInfos_); - if (other.resultReply_ != null) { - if (resultReply_ == null) { - resultReply_ = new global::JT808.GrpcDashbord.ServiceGrpcBase.ResultReply(); - } - ResultReply.MergeFrom(other.ResultReply); - } - _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); - break; - case 10: { - sessionInfos_.AddEntriesFrom(input, _repeated_sessionInfos_codec); - break; - } - case 18: { - if (resultReply_ == null) { - resultReply_ = new global::JT808.GrpcDashbord.ServiceGrpcBase.ResultReply(); - } - input.ReadMessage(resultReply_); - break; - } - } - } - } - - } - - public sealed partial class SessionInfo : pb::IMessage { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new SessionInfo()); - private pb::UnknownFieldSet _unknownFields; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::JT808.GrpcDashbord.SessionGrpcService.JT808SessionServiceReflection.Descriptor.MessageTypes[2]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public SessionInfo() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public SessionInfo(SessionInfo other) : this() { - lastActiveTime_ = other.lastActiveTime_; - startTime_ = other.startTime_; - terminalPhoneNo_ = other.terminalPhoneNo_; - remoteAddressIP_ = other.remoteAddressIP_; - _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public SessionInfo Clone() { - return new SessionInfo(this); - } - - /// Field number for the "LastActiveTime" field. - public const int LastActiveTimeFieldNumber = 1; - private long lastActiveTime_; - /// - /// 最后上线时间 - /// - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public long LastActiveTime { - get { return lastActiveTime_; } - set { - lastActiveTime_ = value; - } - } - - /// Field number for the "StartTime" field. - public const int StartTimeFieldNumber = 2; - private long startTime_; - /// - /// 上线时间 - /// - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public long StartTime { - get { return startTime_; } - set { - startTime_ = value; - } - } - - /// Field number for the "TerminalPhoneNo" field. - public const int TerminalPhoneNoFieldNumber = 3; - private string terminalPhoneNo_ = ""; - /// - /// 终端手机号 - /// - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string TerminalPhoneNo { - get { return terminalPhoneNo_; } - set { - terminalPhoneNo_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - /// Field number for the "RemoteAddressIP" field. - public const int RemoteAddressIPFieldNumber = 4; - private string remoteAddressIP_ = ""; - /// - /// 远程ip地址 - /// - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string RemoteAddressIP { - get { return remoteAddressIP_; } - set { - remoteAddressIP_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as SessionInfo); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(SessionInfo other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (LastActiveTime != other.LastActiveTime) return false; - if (StartTime != other.StartTime) return false; - if (TerminalPhoneNo != other.TerminalPhoneNo) return false; - if (RemoteAddressIP != other.RemoteAddressIP) return false; - return Equals(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (LastActiveTime != 0L) hash ^= LastActiveTime.GetHashCode(); - if (StartTime != 0L) hash ^= StartTime.GetHashCode(); - if (TerminalPhoneNo.Length != 0) hash ^= TerminalPhoneNo.GetHashCode(); - if (RemoteAddressIP.Length != 0) hash ^= RemoteAddressIP.GetHashCode(); - if (_unknownFields != null) { - hash ^= _unknownFields.GetHashCode(); - } - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void WriteTo(pb::CodedOutputStream output) { - if (LastActiveTime != 0L) { - output.WriteRawTag(8); - output.WriteInt64(LastActiveTime); - } - if (StartTime != 0L) { - output.WriteRawTag(16); - output.WriteInt64(StartTime); - } - if (TerminalPhoneNo.Length != 0) { - output.WriteRawTag(26); - output.WriteString(TerminalPhoneNo); - } - if (RemoteAddressIP.Length != 0) { - output.WriteRawTag(34); - output.WriteString(RemoteAddressIP); - } - if (_unknownFields != null) { - _unknownFields.WriteTo(output); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (LastActiveTime != 0L) { - size += 1 + pb::CodedOutputStream.ComputeInt64Size(LastActiveTime); - } - if (StartTime != 0L) { - size += 1 + pb::CodedOutputStream.ComputeInt64Size(StartTime); - } - if (TerminalPhoneNo.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(TerminalPhoneNo); - } - if (RemoteAddressIP.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(RemoteAddressIP); - } - if (_unknownFields != null) { - size += _unknownFields.CalculateSize(); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(SessionInfo other) { - if (other == null) { - return; - } - if (other.LastActiveTime != 0L) { - LastActiveTime = other.LastActiveTime; - } - if (other.StartTime != 0L) { - StartTime = other.StartTime; - } - if (other.TerminalPhoneNo.Length != 0) { - TerminalPhoneNo = other.TerminalPhoneNo; - } - if (other.RemoteAddressIP.Length != 0) { - RemoteAddressIP = other.RemoteAddressIP; - } - _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); - break; - case 8: { - LastActiveTime = input.ReadInt64(); - break; - } - case 16: { - StartTime = input.ReadInt64(); - break; - } - case 26: { - TerminalPhoneNo = input.ReadString(); - break; - } - case 34: { - RemoteAddressIP = input.ReadString(); - break; - } - } - } - } - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/JT808SessionServiceGrpc.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/JT808SessionServiceGrpc.cs deleted file mode 100644 index 21fda00..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/JT808SessionServiceGrpc.cs +++ /dev/null @@ -1,137 +0,0 @@ -// -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: JT808SessionService.proto -// -#pragma warning disable 0414, 1591 -#region Designer generated code - -using grpc = global::Grpc.Core; - -namespace JT808.GrpcDashbord.SessionGrpcService { - public static partial class SessionService - { - static readonly string __ServiceName = "JT808.GrpcDashbord.SessionGrpcService.SessionService"; - - static readonly grpc::Marshaller __Marshaller_JT808_GrpcDashbord_ServiceGrpcBase_EmptyRequest = grpc::Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest.Parser.ParseFrom); - static readonly grpc::Marshaller __Marshaller_JT808_GrpcDashbord_SessionGrpcService_TcpSessionReply = grpc::Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::JT808.GrpcDashbord.SessionGrpcService.TcpSessionReply.Parser.ParseFrom); - static readonly grpc::Marshaller __Marshaller_JT808_GrpcDashbord_SessionGrpcService_UdpSessionReply = grpc::Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::JT808.GrpcDashbord.SessionGrpcService.UdpSessionReply.Parser.ParseFrom); - - static readonly grpc::Method __Method_GetTcpSessionAll = new grpc::Method( - grpc::MethodType.Unary, - __ServiceName, - "GetTcpSessionAll", - __Marshaller_JT808_GrpcDashbord_ServiceGrpcBase_EmptyRequest, - __Marshaller_JT808_GrpcDashbord_SessionGrpcService_TcpSessionReply); - - static readonly grpc::Method __Method_GetUdpSessionAll = new grpc::Method( - grpc::MethodType.Unary, - __ServiceName, - "GetUdpSessionAll", - __Marshaller_JT808_GrpcDashbord_ServiceGrpcBase_EmptyRequest, - __Marshaller_JT808_GrpcDashbord_SessionGrpcService_UdpSessionReply); - - /// Service descriptor - public static global::Google.Protobuf.Reflection.ServiceDescriptor Descriptor - { - get { return global::JT808.GrpcDashbord.SessionGrpcService.JT808SessionServiceReflection.Descriptor.Services[0]; } - } - - /// Base class for server-side implementations of SessionService - public abstract partial class SessionServiceBase - { - public virtual global::System.Threading.Tasks.Task GetTcpSessionAll(global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest request, grpc::ServerCallContext context) - { - throw new grpc::RpcException(new grpc::Status(grpc::StatusCode.Unimplemented, "")); - } - - public virtual global::System.Threading.Tasks.Task GetUdpSessionAll(global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest request, grpc::ServerCallContext context) - { - throw new grpc::RpcException(new grpc::Status(grpc::StatusCode.Unimplemented, "")); - } - - } - - /// Client for SessionService - public partial class SessionServiceClient : grpc::ClientBase - { - /// Creates a new client for SessionService - /// The channel to use to make remote calls. - public SessionServiceClient(grpc::Channel channel) : base(channel) - { - } - /// Creates a new client for SessionService that uses a custom CallInvoker. - /// The callInvoker to use to make remote calls. - public SessionServiceClient(grpc::CallInvoker callInvoker) : base(callInvoker) - { - } - /// Protected parameterless constructor to allow creation of test doubles. - protected SessionServiceClient() : base() - { - } - /// Protected constructor to allow creation of configured clients. - /// The client configuration. - protected SessionServiceClient(ClientBaseConfiguration configuration) : base(configuration) - { - } - - public virtual global::JT808.GrpcDashbord.SessionGrpcService.TcpSessionReply GetTcpSessionAll(global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) - { - return GetTcpSessionAll(request, new grpc::CallOptions(headers, deadline, cancellationToken)); - } - public virtual global::JT808.GrpcDashbord.SessionGrpcService.TcpSessionReply GetTcpSessionAll(global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest request, grpc::CallOptions options) - { - return CallInvoker.BlockingUnaryCall(__Method_GetTcpSessionAll, null, options, request); - } - public virtual grpc::AsyncUnaryCall GetTcpSessionAllAsync(global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) - { - return GetTcpSessionAllAsync(request, new grpc::CallOptions(headers, deadline, cancellationToken)); - } - public virtual grpc::AsyncUnaryCall GetTcpSessionAllAsync(global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest request, grpc::CallOptions options) - { - return CallInvoker.AsyncUnaryCall(__Method_GetTcpSessionAll, null, options, request); - } - public virtual global::JT808.GrpcDashbord.SessionGrpcService.UdpSessionReply GetUdpSessionAll(global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) - { - return GetUdpSessionAll(request, new grpc::CallOptions(headers, deadline, cancellationToken)); - } - public virtual global::JT808.GrpcDashbord.SessionGrpcService.UdpSessionReply GetUdpSessionAll(global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest request, grpc::CallOptions options) - { - return CallInvoker.BlockingUnaryCall(__Method_GetUdpSessionAll, null, options, request); - } - public virtual grpc::AsyncUnaryCall GetUdpSessionAllAsync(global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) - { - return GetUdpSessionAllAsync(request, new grpc::CallOptions(headers, deadline, cancellationToken)); - } - public virtual grpc::AsyncUnaryCall GetUdpSessionAllAsync(global::JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest request, grpc::CallOptions options) - { - return CallInvoker.AsyncUnaryCall(__Method_GetUdpSessionAll, null, options, request); - } - /// Creates a new instance of client from given ClientBaseConfiguration. - protected override SessionServiceClient NewInstance(ClientBaseConfiguration configuration) - { - return new SessionServiceClient(configuration); - } - } - - /// Creates service definition that can be registered with a server - /// An object implementing the server-side handling logic. - public static grpc::ServerServiceDefinition BindService(SessionServiceBase serviceImpl) - { - return grpc::ServerServiceDefinition.CreateBuilder() - .AddMethod(__Method_GetTcpSessionAll, serviceImpl.GetTcpSessionAll) - .AddMethod(__Method_GetUdpSessionAll, serviceImpl.GetUdpSessionAll).Build(); - } - - /// Register service method implementations with a service binder. Useful when customizing the service binding logic. - /// Note: this method is part of an experimental API that can change or be removed without any prior notice. - /// Service methods will be bound by calling AddMethod on this object. - /// An object implementing the server-side handling logic. - public static void BindService(grpc::ServiceBinderBase serviceBinder, SessionServiceBase serviceImpl) - { - serviceBinder.AddMethod(__Method_GetTcpSessionAll, serviceImpl.GetTcpSessionAll); - serviceBinder.AddMethod(__Method_GetUdpSessionAll, serviceImpl.GetUdpSessionAll); - } - - } -} -#endregion diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/JT808UnificationSendService.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/JT808UnificationSendService.cs deleted file mode 100644 index 17959c5..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/JT808UnificationSendService.cs +++ /dev/null @@ -1,215 +0,0 @@ -// -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: JT808UnificationSendService.proto -// -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.Protobuf; -using pbc = global::Google.Protobuf.Collections; -using pbr = global::Google.Protobuf.Reflection; -using scg = global::System.Collections.Generic; -namespace JT808.GrpcDashbord.AtomicCounterGrpcService { - - /// Holder for reflection information generated from JT808UnificationSendService.proto - public static partial class JT808UnificationSendServiceReflection { - - #region Descriptor - /// File descriptor for JT808UnificationSendService.proto - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static JT808UnificationSendServiceReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "CiFKVDgwOFVuaWZpY2F0aW9uU2VuZFNlcnZpY2UucHJvdG8SK0pUODA4Lkdy", - "cGNEYXNoYm9yZC5BdG9taWNDb3VudGVyR3JwY1NlcnZpY2UaEVJlc3VsdFJl", - "cGx5LnByb3RvIjsKD1NlbmRUZXh0UmVxdWVzdBIXCg9UZXJtaW5hbFBob25l", - "Tm8YASABKAkSDwoHQ29udGVudBgCIAEoCTKVAQoWVW5pZmljYXRpb25TZW5k", - "U2VydmljZRJ7CghTZW5kVGV4dBI8LkpUODA4LkdycGNEYXNoYm9yZC5BdG9t", - "aWNDb3VudGVyR3JwY1NlcnZpY2UuU2VuZFRleHRSZXF1ZXN0Gi8uSlQ4MDgu", - "R3JwY0Rhc2hib3JkLlNlcnZpY2VHcnBjQmFzZS5SZXN1bHRSZXBseSIAYgZw", - "cm90bzM=")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::JT808.GrpcDashbord.ServiceGrpcBase.ResultReplyReflection.Descriptor, }, - new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::JT808.GrpcDashbord.AtomicCounterGrpcService.SendTextRequest), global::JT808.GrpcDashbord.AtomicCounterGrpcService.SendTextRequest.Parser, new[]{ "TerminalPhoneNo", "Content" }, null, null, null) - })); - } - #endregion - - } - #region Messages - /// - ///下发文本信息参数 - /// - public sealed partial class SendTextRequest : pb::IMessage { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new SendTextRequest()); - private pb::UnknownFieldSet _unknownFields; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::JT808.GrpcDashbord.AtomicCounterGrpcService.JT808UnificationSendServiceReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public SendTextRequest() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public SendTextRequest(SendTextRequest other) : this() { - terminalPhoneNo_ = other.terminalPhoneNo_; - content_ = other.content_; - _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public SendTextRequest Clone() { - return new SendTextRequest(this); - } - - /// Field number for the "TerminalPhoneNo" field. - public const int TerminalPhoneNoFieldNumber = 1; - private string terminalPhoneNo_ = ""; - /// - ///终端手机号 - /// - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string TerminalPhoneNo { - get { return terminalPhoneNo_; } - set { - terminalPhoneNo_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - /// Field number for the "Content" field. - public const int ContentFieldNumber = 2; - private string content_ = ""; - /// - ///内容 - /// - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string Content { - get { return content_; } - set { - content_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as SendTextRequest); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(SendTextRequest other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (TerminalPhoneNo != other.TerminalPhoneNo) return false; - if (Content != other.Content) return false; - return Equals(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (TerminalPhoneNo.Length != 0) hash ^= TerminalPhoneNo.GetHashCode(); - if (Content.Length != 0) hash ^= Content.GetHashCode(); - if (_unknownFields != null) { - hash ^= _unknownFields.GetHashCode(); - } - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void WriteTo(pb::CodedOutputStream output) { - if (TerminalPhoneNo.Length != 0) { - output.WriteRawTag(10); - output.WriteString(TerminalPhoneNo); - } - if (Content.Length != 0) { - output.WriteRawTag(18); - output.WriteString(Content); - } - if (_unknownFields != null) { - _unknownFields.WriteTo(output); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (TerminalPhoneNo.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(TerminalPhoneNo); - } - if (Content.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(Content); - } - if (_unknownFields != null) { - size += _unknownFields.CalculateSize(); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(SendTextRequest other) { - if (other == null) { - return; - } - if (other.TerminalPhoneNo.Length != 0) { - TerminalPhoneNo = other.TerminalPhoneNo; - } - if (other.Content.Length != 0) { - Content = other.Content; - } - _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); - break; - case 10: { - TerminalPhoneNo = input.ReadString(); - break; - } - case 18: { - Content = input.ReadString(); - break; - } - } - } - } - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/JT808UnificationSendServiceGrpc.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/JT808UnificationSendServiceGrpc.cs deleted file mode 100644 index 89af2c5..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/JT808UnificationSendServiceGrpc.cs +++ /dev/null @@ -1,140 +0,0 @@ -// -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: JT808UnificationSendService.proto -// -#pragma warning disable 0414, 1591 -#region Designer generated code - -using grpc = global::Grpc.Core; - -namespace JT808.GrpcDashbord.AtomicCounterGrpcService { - public static partial class UnificationSendService - { - static readonly string __ServiceName = "JT808.GrpcDashbord.AtomicCounterGrpcService.UnificationSendService"; - - static readonly grpc::Marshaller __Marshaller_JT808_GrpcDashbord_AtomicCounterGrpcService_SendTextRequest = grpc::Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::JT808.GrpcDashbord.AtomicCounterGrpcService.SendTextRequest.Parser.ParseFrom); - static readonly grpc::Marshaller __Marshaller_JT808_GrpcDashbord_ServiceGrpcBase_ResultReply = grpc::Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::JT808.GrpcDashbord.ServiceGrpcBase.ResultReply.Parser.ParseFrom); - - static readonly grpc::Method __Method_SendText = new grpc::Method( - grpc::MethodType.Unary, - __ServiceName, - "SendText", - __Marshaller_JT808_GrpcDashbord_AtomicCounterGrpcService_SendTextRequest, - __Marshaller_JT808_GrpcDashbord_ServiceGrpcBase_ResultReply); - - /// Service descriptor - public static global::Google.Protobuf.Reflection.ServiceDescriptor Descriptor - { - get { return global::JT808.GrpcDashbord.AtomicCounterGrpcService.JT808UnificationSendServiceReflection.Descriptor.Services[0]; } - } - - /// Base class for server-side implementations of UnificationSendService - public abstract partial class UnificationSendServiceBase - { - /// - /// 文本信息下发 - /// - /// The request received from the client. - /// The context of the server-side call handler being invoked. - /// The response to send back to the client (wrapped by a task). - public virtual global::System.Threading.Tasks.Task SendText(global::JT808.GrpcDashbord.AtomicCounterGrpcService.SendTextRequest request, grpc::ServerCallContext context) - { - throw new grpc::RpcException(new grpc::Status(grpc::StatusCode.Unimplemented, "")); - } - - } - - /// Client for UnificationSendService - public partial class UnificationSendServiceClient : grpc::ClientBase - { - /// Creates a new client for UnificationSendService - /// The channel to use to make remote calls. - public UnificationSendServiceClient(grpc::Channel channel) : base(channel) - { - } - /// Creates a new client for UnificationSendService that uses a custom CallInvoker. - /// The callInvoker to use to make remote calls. - public UnificationSendServiceClient(grpc::CallInvoker callInvoker) : base(callInvoker) - { - } - /// Protected parameterless constructor to allow creation of test doubles. - protected UnificationSendServiceClient() : base() - { - } - /// Protected constructor to allow creation of configured clients. - /// The client configuration. - protected UnificationSendServiceClient(ClientBaseConfiguration configuration) : base(configuration) - { - } - - /// - /// 文本信息下发 - /// - /// The request to send to the server. - /// The initial metadata to send with the call. This parameter is optional. - /// An optional deadline for the call. The call will be cancelled if deadline is hit. - /// An optional token for canceling the call. - /// The response received from the server. - public virtual global::JT808.GrpcDashbord.ServiceGrpcBase.ResultReply SendText(global::JT808.GrpcDashbord.AtomicCounterGrpcService.SendTextRequest request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) - { - return SendText(request, new grpc::CallOptions(headers, deadline, cancellationToken)); - } - /// - /// 文本信息下发 - /// - /// The request to send to the server. - /// The options for the call. - /// The response received from the server. - public virtual global::JT808.GrpcDashbord.ServiceGrpcBase.ResultReply SendText(global::JT808.GrpcDashbord.AtomicCounterGrpcService.SendTextRequest request, grpc::CallOptions options) - { - return CallInvoker.BlockingUnaryCall(__Method_SendText, null, options, request); - } - /// - /// 文本信息下发 - /// - /// The request to send to the server. - /// The initial metadata to send with the call. This parameter is optional. - /// An optional deadline for the call. The call will be cancelled if deadline is hit. - /// An optional token for canceling the call. - /// The call object. - public virtual grpc::AsyncUnaryCall SendTextAsync(global::JT808.GrpcDashbord.AtomicCounterGrpcService.SendTextRequest request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken)) - { - return SendTextAsync(request, new grpc::CallOptions(headers, deadline, cancellationToken)); - } - /// - /// 文本信息下发 - /// - /// The request to send to the server. - /// The options for the call. - /// The call object. - public virtual grpc::AsyncUnaryCall SendTextAsync(global::JT808.GrpcDashbord.AtomicCounterGrpcService.SendTextRequest request, grpc::CallOptions options) - { - return CallInvoker.AsyncUnaryCall(__Method_SendText, null, options, request); - } - /// Creates a new instance of client from given ClientBaseConfiguration. - protected override UnificationSendServiceClient NewInstance(ClientBaseConfiguration configuration) - { - return new UnificationSendServiceClient(configuration); - } - } - - /// Creates service definition that can be registered with a server - /// An object implementing the server-side handling logic. - public static grpc::ServerServiceDefinition BindService(UnificationSendServiceBase serviceImpl) - { - return grpc::ServerServiceDefinition.CreateBuilder() - .AddMethod(__Method_SendText, serviceImpl.SendText).Build(); - } - - /// Register service method implementations with a service binder. Useful when customizing the service binding logic. - /// Note: this method is part of an experimental API that can change or be removed without any prior notice. - /// Service methods will be bound by calling AddMethod on this object. - /// An object implementing the server-side handling logic. - public static void BindService(grpc::ServiceBinderBase serviceBinder, UnificationSendServiceBase serviceImpl) - { - serviceBinder.AddMethod(__Method_SendText, serviceImpl.SendText); - } - - } -} -#endregion diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/PageReply.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/PageReply.cs deleted file mode 100644 index 033d875..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/PageReply.cs +++ /dev/null @@ -1,204 +0,0 @@ -// -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: PageReply.proto -// -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.Protobuf; -using pbc = global::Google.Protobuf.Collections; -using pbr = global::Google.Protobuf.Reflection; -using scg = global::System.Collections.Generic; -namespace JT808.GrpcDashbord.ServiceGrpcBase { - - /// Holder for reflection information generated from PageReply.proto - public static partial class PageReplyReflection { - - #region Descriptor - /// File descriptor for PageReply.proto - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static PageReplyReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "Cg9QYWdlUmVwbHkucHJvdG8SIkpUODA4LkdycGNEYXNoYm9yZC5TZXJ2aWNl", - "R3JwY0Jhc2UiNgoSUGFnZU9wdGlvbnNSZXF1ZXN0EhEKCVBhZ2VJbmRleBgB", - "IAEoBRINCgVUb3RhbBgCIAEoBWIGcHJvdG8z")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { }, - new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::JT808.GrpcDashbord.ServiceGrpcBase.PageOptionsRequest), global::JT808.GrpcDashbord.ServiceGrpcBase.PageOptionsRequest.Parser, new[]{ "PageIndex", "Total" }, null, null, null) - })); - } - #endregion - - } - #region Messages - /// - /// 统一分页返回参数 - /// - public sealed partial class PageOptionsRequest : pb::IMessage { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new PageOptionsRequest()); - private pb::UnknownFieldSet _unknownFields; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::JT808.GrpcDashbord.ServiceGrpcBase.PageReplyReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public PageOptionsRequest() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public PageOptionsRequest(PageOptionsRequest other) : this() { - pageIndex_ = other.pageIndex_; - total_ = other.total_; - _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public PageOptionsRequest Clone() { - return new PageOptionsRequest(this); - } - - /// Field number for the "PageIndex" field. - public const int PageIndexFieldNumber = 1; - private int pageIndex_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int PageIndex { - get { return pageIndex_; } - set { - pageIndex_ = value; - } - } - - /// Field number for the "Total" field. - public const int TotalFieldNumber = 2; - private int total_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int Total { - get { return total_; } - set { - total_ = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as PageOptionsRequest); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(PageOptionsRequest other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (PageIndex != other.PageIndex) return false; - if (Total != other.Total) return false; - return Equals(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (PageIndex != 0) hash ^= PageIndex.GetHashCode(); - if (Total != 0) hash ^= Total.GetHashCode(); - if (_unknownFields != null) { - hash ^= _unknownFields.GetHashCode(); - } - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void WriteTo(pb::CodedOutputStream output) { - if (PageIndex != 0) { - output.WriteRawTag(8); - output.WriteInt32(PageIndex); - } - if (Total != 0) { - output.WriteRawTag(16); - output.WriteInt32(Total); - } - if (_unknownFields != null) { - _unknownFields.WriteTo(output); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (PageIndex != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(PageIndex); - } - if (Total != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(Total); - } - if (_unknownFields != null) { - size += _unknownFields.CalculateSize(); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(PageOptionsRequest other) { - if (other == null) { - return; - } - if (other.PageIndex != 0) { - PageIndex = other.PageIndex; - } - if (other.Total != 0) { - Total = other.Total; - } - _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); - break; - case 8: { - PageIndex = input.ReadInt32(); - break; - } - case 16: { - Total = input.ReadInt32(); - break; - } - } - } - } - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/PageRequest.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/PageRequest.cs deleted file mode 100644 index 825a291..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/PageRequest.cs +++ /dev/null @@ -1,283 +0,0 @@ -// -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: PageRequest.proto -// -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.Protobuf; -using pbc = global::Google.Protobuf.Collections; -using pbr = global::Google.Protobuf.Reflection; -using scg = global::System.Collections.Generic; -namespace JT808.GrpcDashbord.ServiceGrpcBase { - - /// Holder for reflection information generated from PageRequest.proto - public static partial class PageRequestReflection { - - #region Descriptor - /// File descriptor for PageRequest.proto - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static PageRequestReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "ChFQYWdlUmVxdWVzdC5wcm90bxIiSlQ4MDguR3JwY0Rhc2hib3JkLlNlcnZp", - "Y2VHcnBjQmFzZSLFAQoLUGFnZVJlcXVlc3QSEQoJUGFnZUluZGV4GAEgASgF", - "EhAKCFBhZ2VTaXplGAIgASgFEg0KBVRvdGFsGAMgASgFEgwKBFNraXAYBCAB", - "KAUSRwoEU29ydBgFIAMoCzI5LkpUODA4LkdycGNEYXNoYm9yZC5TZXJ2aWNl", - "R3JwY0Jhc2UuUGFnZVJlcXVlc3QuU29ydEVudHJ5GisKCVNvcnRFbnRyeRIL", - "CgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBYgZwcm90bzM=")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { }, - new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::JT808.GrpcDashbord.ServiceGrpcBase.PageRequest), global::JT808.GrpcDashbord.ServiceGrpcBase.PageRequest.Parser, new[]{ "PageIndex", "PageSize", "Total", "Skip", "Sort" }, null, null, new pbr::GeneratedClrTypeInfo[] { null, }) - })); - } - #endregion - - } - #region Messages - /// - /// 统一分页参数 - /// - public sealed partial class PageRequest : pb::IMessage { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new PageRequest()); - private pb::UnknownFieldSet _unknownFields; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::JT808.GrpcDashbord.ServiceGrpcBase.PageRequestReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public PageRequest() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public PageRequest(PageRequest other) : this() { - pageIndex_ = other.pageIndex_; - pageSize_ = other.pageSize_; - total_ = other.total_; - skip_ = other.skip_; - sort_ = other.sort_.Clone(); - _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public PageRequest Clone() { - return new PageRequest(this); - } - - /// Field number for the "PageIndex" field. - public const int PageIndexFieldNumber = 1; - private int pageIndex_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int PageIndex { - get { return pageIndex_; } - set { - pageIndex_ = value; - } - } - - /// Field number for the "PageSize" field. - public const int PageSizeFieldNumber = 2; - private int pageSize_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int PageSize { - get { return pageSize_; } - set { - pageSize_ = value; - } - } - - /// Field number for the "Total" field. - public const int TotalFieldNumber = 3; - private int total_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int Total { - get { return total_; } - set { - total_ = value; - } - } - - /// Field number for the "Skip" field. - public const int SkipFieldNumber = 4; - private int skip_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int Skip { - get { return skip_; } - set { - skip_ = value; - } - } - - /// Field number for the "Sort" field. - public const int SortFieldNumber = 5; - private static readonly pbc::MapField.Codec _map_sort_codec - = new pbc::MapField.Codec(pb::FieldCodec.ForString(10), pb::FieldCodec.ForString(18), 42); - private readonly pbc::MapField sort_ = new pbc::MapField(); - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public pbc::MapField Sort { - get { return sort_; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as PageRequest); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(PageRequest other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (PageIndex != other.PageIndex) return false; - if (PageSize != other.PageSize) return false; - if (Total != other.Total) return false; - if (Skip != other.Skip) return false; - if (!Sort.Equals(other.Sort)) return false; - return Equals(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (PageIndex != 0) hash ^= PageIndex.GetHashCode(); - if (PageSize != 0) hash ^= PageSize.GetHashCode(); - if (Total != 0) hash ^= Total.GetHashCode(); - if (Skip != 0) hash ^= Skip.GetHashCode(); - hash ^= Sort.GetHashCode(); - if (_unknownFields != null) { - hash ^= _unknownFields.GetHashCode(); - } - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void WriteTo(pb::CodedOutputStream output) { - if (PageIndex != 0) { - output.WriteRawTag(8); - output.WriteInt32(PageIndex); - } - if (PageSize != 0) { - output.WriteRawTag(16); - output.WriteInt32(PageSize); - } - if (Total != 0) { - output.WriteRawTag(24); - output.WriteInt32(Total); - } - if (Skip != 0) { - output.WriteRawTag(32); - output.WriteInt32(Skip); - } - sort_.WriteTo(output, _map_sort_codec); - if (_unknownFields != null) { - _unknownFields.WriteTo(output); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (PageIndex != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(PageIndex); - } - if (PageSize != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(PageSize); - } - if (Total != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(Total); - } - if (Skip != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(Skip); - } - size += sort_.CalculateSize(_map_sort_codec); - if (_unknownFields != null) { - size += _unknownFields.CalculateSize(); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(PageRequest other) { - if (other == null) { - return; - } - if (other.PageIndex != 0) { - PageIndex = other.PageIndex; - } - if (other.PageSize != 0) { - PageSize = other.PageSize; - } - if (other.Total != 0) { - Total = other.Total; - } - if (other.Skip != 0) { - Skip = other.Skip; - } - sort_.Add(other.sort_); - _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); - break; - case 8: { - PageIndex = input.ReadInt32(); - break; - } - case 16: { - PageSize = input.ReadInt32(); - break; - } - case 24: { - Total = input.ReadInt32(); - break; - } - case 32: { - Skip = input.ReadInt32(); - break; - } - case 42: { - sort_.AddEntriesFrom(input, _map_sort_codec); - break; - } - } - } - } - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/ResultReply.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/ResultReply.cs deleted file mode 100644 index f9808b9..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/csharp/ResultReply.cs +++ /dev/null @@ -1,225 +0,0 @@ -// -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: ResultReply.proto -// -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.Protobuf; -using pbc = global::Google.Protobuf.Collections; -using pbr = global::Google.Protobuf.Reflection; -using scg = global::System.Collections.Generic; -namespace JT808.GrpcDashbord.ServiceGrpcBase { - - /// Holder for reflection information generated from ResultReply.proto - public static partial class ResultReplyReflection { - - #region Descriptor - /// File descriptor for ResultReply.proto - public static pbr::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbr::FileDescriptor descriptor; - - static ResultReplyReflection() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "ChFSZXN1bHRSZXBseS5wcm90bxIiSlQ4MDguR3JwY0Rhc2hib3JkLlNlcnZp", - "Y2VHcnBjQmFzZSK9AQoLUmVzdWx0UmVwbHkSSAoEQ29kZRgBIAEoDjI6LkpU", - "ODA4LkdycGNEYXNoYm9yZC5TZXJ2aWNlR3JwY0Jhc2UuUmVzdWx0UmVwbHku", - "U3RhdHVzQ29kZRILCgNNc2cYAiABKAkiVwoKU3RhdHVzQ29kZRILCgdTdWNj", - "ZXNzEAASDQoJTm9Db250ZW50EAESCwoHRmFpbHVyZRACEhAKDFVuYXV0aG9y", - "aXplZBADEg4KCklubmVyRXJyb3IQBGIGcHJvdG8z")); - descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { }, - new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::JT808.GrpcDashbord.ServiceGrpcBase.ResultReply), global::JT808.GrpcDashbord.ServiceGrpcBase.ResultReply.Parser, new[]{ "Code", "Msg" }, null, new[]{ typeof(global::JT808.GrpcDashbord.ServiceGrpcBase.ResultReply.Types.StatusCode) }, null) - })); - } - #endregion - - } - #region Messages - /// - /// 统一回复 - /// - public sealed partial class ResultReply : pb::IMessage { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new ResultReply()); - private pb::UnknownFieldSet _unknownFields; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pb::MessageParser Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static pbr::MessageDescriptor Descriptor { - get { return global::JT808.GrpcDashbord.ServiceGrpcBase.ResultReplyReflection.Descriptor.MessageTypes[0]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public ResultReply() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public ResultReply(ResultReply other) : this() { - code_ = other.code_; - msg_ = other.msg_; - _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public ResultReply Clone() { - return new ResultReply(this); - } - - /// Field number for the "Code" field. - public const int CodeFieldNumber = 1; - private global::JT808.GrpcDashbord.ServiceGrpcBase.ResultReply.Types.StatusCode code_ = 0; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public global::JT808.GrpcDashbord.ServiceGrpcBase.ResultReply.Types.StatusCode Code { - get { return code_; } - set { - code_ = value; - } - } - - /// Field number for the "Msg" field. - public const int MsgFieldNumber = 2; - private string msg_ = ""; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string Msg { - get { return msg_; } - set { - msg_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override bool Equals(object other) { - return Equals(other as ResultReply); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool Equals(ResultReply other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (Code != other.Code) return false; - if (Msg != other.Msg) return false; - return Equals(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override int GetHashCode() { - int hash = 1; - if (Code != 0) hash ^= Code.GetHashCode(); - if (Msg.Length != 0) hash ^= Msg.GetHashCode(); - if (_unknownFields != null) { - hash ^= _unknownFields.GetHashCode(); - } - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void WriteTo(pb::CodedOutputStream output) { - if (Code != 0) { - output.WriteRawTag(8); - output.WriteEnum((int) Code); - } - if (Msg.Length != 0) { - output.WriteRawTag(18); - output.WriteString(Msg); - } - if (_unknownFields != null) { - _unknownFields.WriteTo(output); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CalculateSize() { - int size = 0; - if (Code != 0) { - size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Code); - } - if (Msg.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(Msg); - } - if (_unknownFields != null) { - size += _unknownFields.CalculateSize(); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(ResultReply other) { - if (other == null) { - return; - } - if (other.Code != 0) { - Code = other.Code; - } - if (other.Msg.Length != 0) { - Msg = other.Msg; - } - _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public void MergeFrom(pb::CodedInputStream input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); - break; - case 8: { - code_ = (global::JT808.GrpcDashbord.ServiceGrpcBase.ResultReply.Types.StatusCode) input.ReadEnum(); - break; - } - case 18: { - Msg = input.ReadString(); - break; - } - } - } - } - - #region Nested types - /// Container for nested types declared in the ResultReply message type. - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public static partial class Types { - /// - /// 状态码 - /// - public enum StatusCode { - [pbr::OriginalName("Success")] Success = 0, - [pbr::OriginalName("NoContent")] NoContent = 1, - [pbr::OriginalName("Failure")] Failure = 2, - [pbr::OriginalName("Unauthorized")] Unauthorized = 3, - [pbr::OriginalName("InnerError")] InnerError = 4, - } - - } - #endregion - - } - - #endregion - -} - -#endregion Designer generated code diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/generate.txt b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/generate.txt deleted file mode 100644 index 29f2ed0..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/generate.txt +++ /dev/null @@ -1,16 +0,0 @@ -csharp - -C:\Users\Administrator\.nuget\packages\grpc.tools\1.17.1\tools\windows_x64\protoc.exe -I "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol" --csharp_out "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\csharp" "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\ResultReply.proto" --grpc_out "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\csharp" --plugin=protoc-gen-grpc=C:\Users\Administrator\.nuget\packages\grpc.tools\1.17.1\tools\windows_x64\grpc_csharp_plugin.exe; -C:\Users\Administrator\.nuget\packages\grpc.tools\1.17.1\tools\windows_x64\protoc.exe -I "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol" --csharp_out "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\csharp" "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\PageReply.proto" --grpc_out "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\csharp" --plugin=protoc-gen-grpc=C:\Users\Administrator\.nuget\packages\grpc.tools\1.17.1\tools\windows_x64\grpc_csharp_plugin.exe; -C:\Users\Administrator\.nuget\packages\grpc.tools\1.17.1\tools\windows_x64\protoc.exe -I "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol" --csharp_out "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\csharp" "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\PageRequest.proto" --grpc_out "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\csharp" --plugin=protoc-gen-grpc=C:\Users\Administrator\.nuget\packages\grpc.tools\1.17.1\tools\windows_x64\grpc_csharp_plugin.exe; -C:\Users\Administrator\.nuget\packages\grpc.tools\1.17.1\tools\windows_x64\protoc.exe -I "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol" --csharp_out "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\csharp" "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\JT808UnificationSendService.proto" --grpc_out "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\csharp" --plugin=protoc-gen-grpc=C:\Users\Administrator\.nuget\packages\grpc.tools\1.17.1\tools\windows_x64\grpc_csharp_plugin.exe; -C:\Users\Administrator\.nuget\packages\grpc.tools\1.17.1\tools\windows_x64\protoc.exe -I "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol" --csharp_out "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\csharp" "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\JT808SessionService.proto" --grpc_out "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\csharp" --plugin=protoc-gen-grpc=C:\Users\Administrator\.nuget\packages\grpc.tools\1.17.1\tools\windows_x64\grpc_csharp_plugin.exe; -C:\Users\Administrator\.nuget\packages\grpc.tools\1.17.1\tools\windows_x64\protoc.exe -I "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol" --csharp_out "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\csharp" "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\JT808AtomicCounterService.proto" --grpc_out "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\csharp" --plugin=protoc-gen-grpc=C:\Users\Administrator\.nuget\packages\grpc.tools\1.17.1\tools\windows_x64\grpc_csharp_plugin.exe; -C:\Users\Administrator\.nuget\packages\grpc.tools\1.17.1\tools\windows_x64\protoc.exe -I "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol" --csharp_out "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\csharp" "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\EmptyRequest.proto" --grpc_out "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\csharp" --plugin=protoc-gen-grpc=C:\Users\Administrator\.nuget\packages\grpc.tools\1.17.1\tools\windows_x64\grpc_csharp_plugin.exe; - -js - -C:\Users\Administrator\.nuget\packages\grpc.tools\1.17.1\tools\windows_x64\protoc.exe -I "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol" --js_out=import_style=commonjs:"D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\js" "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\EmptyRequest.proto" --grpc_out=import_style=commonjs,mode=grpcwebtext:"D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\js" --plugin=protoc-gen-grpc="D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\tools\protoc-gen-grpc-web-1.0.3-windows-x86_64.exe"; -C:\Users\Administrator\.nuget\packages\grpc.tools\1.17.1\tools\windows_x64\protoc.exe -I "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol" --js_out=import_style=commonjs:"D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\js" "D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\JT808AtomicCounterService.proto" --grpc_out=import_style=commonjs,mode=grpcwebtext:"D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\js" --plugin=protoc-gen-grpc="D:\My Project\JT808DotNetty\src\JT808.DotNetty.Admin\tools\protoc-gen-grpc-web-1.0.3-windows-x86_64.exe"; - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/js/EmptyRequest_pb.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/js/EmptyRequest_pb.js deleted file mode 100644 index 82ffd98..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/js/EmptyRequest_pb.js +++ /dev/null @@ -1,131 +0,0 @@ -/** - * @fileoverview - * @enhanceable - * @suppress {messageConventions} JS Compiler reports an error if a variable or - * field starts with 'MSG_' and isn't a translatable message. - * @public - */ -// GENERATED CODE -- DO NOT EDIT! - -var jspb = require('google-protobuf'); -var goog = jspb; -var global = Function('return this')(); - -goog.exportSymbol('proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest', null, global); - -/** - * Generated by JsPbCodeGenerator. - * @param {Array=} opt_data Optional initial data array, typically from a - * server response, or constructed directly in Javascript. The array is used - * in place and becomes part of the constructed object. It is not cloned. - * If no data is provided, the constructed object will be empty, but still - * valid. - * @extends {jspb.Message} - * @constructor - */ -proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest = function(opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, null, null); -}; -goog.inherits(proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest, jspb.Message); -if (goog.DEBUG && !COMPILED) { - proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest.displayName = 'proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest'; -} - - -if (jspb.Message.GENERATE_TO_OBJECT) { -/** - * Creates an object representation of this proto suitable for use in Soy templates. - * Field names that are reserved in JavaScript and will be renamed to pb_name. - * To access a reserved field use, foo.pb_, eg, foo.pb_default. - * For the list of reserved names please see: - * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. - * @param {boolean=} opt_includeInstance Whether to include the JSPB instance - * for transitional soy proto support: http://goto/soy-param-migration - * @return {!Object} - */ -proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest.prototype.toObject = function(opt_includeInstance) { - return proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest.toObject(opt_includeInstance, this); -}; - - -/** - * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Whether to include the JSPB - * instance for transitional soy proto support: - * http://goto/soy-param-migration - * @param {!proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest} msg The msg instance to transform. - * @return {!Object} - * @suppress {unusedLocalVariables} f is only used for nested messages - */ -proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest.toObject = function(includeInstance, msg) { - var f, obj = { - - }; - - if (includeInstance) { - obj.$jspbMessageInstance = msg; - } - return obj; -}; -} - - -/** - * Deserializes binary data (in protobuf wire format). - * @param {jspb.ByteSource} bytes The bytes to deserialize. - * @return {!proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest} - */ -proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest.deserializeBinary = function(bytes) { - var reader = new jspb.BinaryReader(bytes); - var msg = new proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest; - return proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest.deserializeBinaryFromReader(msg, reader); -}; - - -/** - * Deserializes binary data (in protobuf wire format) from the - * given reader into the given message object. - * @param {!proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest} msg The message object to deserialize into. - * @param {!jspb.BinaryReader} reader The BinaryReader to use. - * @return {!proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest} - */ -proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest.deserializeBinaryFromReader = function(msg, reader) { - while (reader.nextField()) { - if (reader.isEndGroup()) { - break; - } - var field = reader.getFieldNumber(); - switch (field) { - default: - reader.skipField(); - break; - } - } - return msg; -}; - - -/** - * Serializes the message to binary data (in protobuf wire format). - * @return {!Uint8Array} - */ -proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest.prototype.serializeBinary = function() { - var writer = new jspb.BinaryWriter(); - proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest.serializeBinaryToWriter(this, writer); - return writer.getResultBuffer(); -}; - - -/** - * Serializes the given message to binary data (in protobuf wire - * format), writing to the given BinaryWriter. - * @param {!proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest} message - * @param {!jspb.BinaryWriter} writer - * @suppress {unusedLocalVariables} f is only used for nested messages - */ -proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest.serializeBinaryToWriter = function(message, writer) { - var f = undefined; -}; - - -goog.object.extend(exports, proto.JT808.GrpcDashbord.ServiceGrpcBase); diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/js/JT808AtomicCounterService_grpc_web_pb.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/js/JT808AtomicCounterService_grpc_web_pb.js deleted file mode 100644 index f4547ee..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/js/JT808AtomicCounterService_grpc_web_pb.js +++ /dev/null @@ -1,194 +0,0 @@ -/** - * @fileoverview gRPC-Web generated client stub for JT808.GrpcDashbord.AtomicCounterGrpcService - * @enhanceable - * @public - */ - -// GENERATED CODE -- DO NOT EDIT! - - - -const grpc = {}; -grpc.web = require('grpc-web'); - - -var ResultReply_pb = require('./ResultReply_pb.js') - -var EmptyRequest_pb = require('./EmptyRequest_pb.js') -const proto = {}; -proto.JT808 = {}; -proto.JT808.GrpcDashbord = {}; -proto.JT808.GrpcDashbord.AtomicCounterGrpcService = require('./JT808AtomicCounterService_pb.js'); - -/** - * @param {string} hostname - * @param {?Object} credentials - * @param {?Object} options - * @constructor - * @struct - * @final - */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterServiceClient = - function(hostname, credentials, options) { - if (!options) options = {}; - options['format'] = 'text'; - - /** - * @private @const {!grpc.web.GrpcWebClientBase} The client - */ - this.client_ = new grpc.web.GrpcWebClientBase(options); - - /** - * @private @const {string} The hostname - */ - this.hostname_ = hostname; - - /** - * @private @const {?Object} The credentials to be used to connect - * to the server - */ - this.credentials_ = credentials; - - /** - * @private @const {?Object} Options for the client - */ - this.options_ = options; -}; - - -/** - * @param {string} hostname - * @param {?Object} credentials - * @param {?Object} options - * @constructor - * @struct - * @final - */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterServicePromiseClient = - function(hostname, credentials, options) { - if (!options) options = {}; - options['format'] = 'text'; - - /** - * @private @const {!proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterServiceClient} The delegate callback based client - */ - this.delegateClient_ = new proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterServiceClient( - hostname, credentials, options); - -}; - - -/** - * @const - * @type {!grpc.web.AbstractClientBase.MethodInfo< - * !proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest, - * !proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply>} - */ -const methodInfo_AtomicCounterService_GetTcpAtomicCounter = new grpc.web.AbstractClientBase.MethodInfo( - proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply, - /** @param {!proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest} request */ - function(request) { - return request.serializeBinary(); - }, - proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply.deserializeBinary -); - - -/** - * @param {!proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest} request The - * request proto - * @param {!Object} metadata User defined - * call metadata - * @param {function(?grpc.web.Error, ?proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply)} - * callback The callback function(error, response) - * @return {!grpc.web.ClientReadableStream|undefined} - * The XHR Node Readable Stream - */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterServiceClient.prototype.getTcpAtomicCounter = - function(request, metadata, callback) { - return this.client_.rpcCall(this.hostname_ + - '/JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterService/GetTcpAtomicCounter', - request, - metadata, - methodInfo_AtomicCounterService_GetTcpAtomicCounter, - callback); -}; - - -/** - * @param {!proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest} request The - * request proto - * @param {!Object} metadata User defined - * call metadata - * @return {!Promise} - * The XHR Node Readable Stream - */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterServicePromiseClient.prototype.getTcpAtomicCounter = - function(request, metadata) { - return new Promise((resolve, reject) => { - this.delegateClient_.getTcpAtomicCounter( - request, metadata, (error, response) => { - error ? reject(error) : resolve(response); - }); - }); -}; - - -/** - * @const - * @type {!grpc.web.AbstractClientBase.MethodInfo< - * !proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest, - * !proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply>} - */ -const methodInfo_AtomicCounterService_GetUdpAtomicCounter = new grpc.web.AbstractClientBase.MethodInfo( - proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply, - /** @param {!proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest} request */ - function(request) { - return request.serializeBinary(); - }, - proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply.deserializeBinary -); - - -/** - * @param {!proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest} request The - * request proto - * @param {!Object} metadata User defined - * call metadata - * @param {function(?grpc.web.Error, ?proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply)} - * callback The callback function(error, response) - * @return {!grpc.web.ClientReadableStream|undefined} - * The XHR Node Readable Stream - */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterServiceClient.prototype.getUdpAtomicCounter = - function(request, metadata, callback) { - return this.client_.rpcCall(this.hostname_ + - '/JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterService/GetUdpAtomicCounter', - request, - metadata, - methodInfo_AtomicCounterService_GetUdpAtomicCounter, - callback); -}; - - -/** - * @param {!proto.JT808.GrpcDashbord.ServiceGrpcBase.EmptyRequest} request The - * request proto - * @param {!Object} metadata User defined - * call metadata - * @return {!Promise} - * The XHR Node Readable Stream - */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterServicePromiseClient.prototype.getUdpAtomicCounter = - function(request, metadata) { - return new Promise((resolve, reject) => { - this.delegateClient_.getUdpAtomicCounter( - request, metadata, (error, response) => { - error ? reject(error) : resolve(response); - }); - }); -}; - - -module.exports = proto.JT808.GrpcDashbord.AtomicCounterGrpcService; - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/js/JT808AtomicCounterService_pb.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/js/JT808AtomicCounterService_pb.js deleted file mode 100644 index 0ed6952..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcProtocol/js/JT808AtomicCounterService_pb.js +++ /dev/null @@ -1,390 +0,0 @@ -/** - * @fileoverview - * @enhanceable - * @suppress {messageConventions} JS Compiler reports an error if a variable or - * field starts with 'MSG_' and isn't a translatable message. - * @public - */ -// GENERATED CODE -- DO NOT EDIT! - -var jspb = require('google-protobuf'); -var goog = jspb; -var global = Function('return this')(); - -var ResultReply_pb = require('./ResultReply_pb.js'); -var EmptyRequest_pb = require('./EmptyRequest_pb.js'); -goog.exportSymbol('proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo', null, global); -goog.exportSymbol('proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply', null, global); - -/** - * Generated by JsPbCodeGenerator. - * @param {Array=} opt_data Optional initial data array, typically from a - * server response, or constructed directly in Javascript. The array is used - * in place and becomes part of the constructed object. It is not cloned. - * If no data is provided, the constructed object will be empty, but still - * valid. - * @extends {jspb.Message} - * @constructor - */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply = function(opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, null, null); -}; -goog.inherits(proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply, jspb.Message); -if (goog.DEBUG && !COMPILED) { - proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply.displayName = 'proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply'; -} - - -if (jspb.Message.GENERATE_TO_OBJECT) { -/** - * Creates an object representation of this proto suitable for use in Soy templates. - * Field names that are reserved in JavaScript and will be renamed to pb_name. - * To access a reserved field use, foo.pb_, eg, foo.pb_default. - * For the list of reserved names please see: - * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. - * @param {boolean=} opt_includeInstance Whether to include the JSPB instance - * for transitional soy proto support: http://goto/soy-param-migration - * @return {!Object} - */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply.prototype.toObject = function(opt_includeInstance) { - return proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply.toObject(opt_includeInstance, this); -}; - - -/** - * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Whether to include the JSPB - * instance for transitional soy proto support: - * http://goto/soy-param-migration - * @param {!proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply} msg The msg instance to transform. - * @return {!Object} - * @suppress {unusedLocalVariables} f is only used for nested messages - */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply.toObject = function(includeInstance, msg) { - var f, obj = { - atomiccounterinfo: (f = msg.getAtomiccounterinfo()) && proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo.toObject(includeInstance, f), - resultreply: (f = msg.getResultreply()) && ResultReply_pb.ResultReply.toObject(includeInstance, f) - }; - - if (includeInstance) { - obj.$jspbMessageInstance = msg; - } - return obj; -}; -} - - -/** - * Deserializes binary data (in protobuf wire format). - * @param {jspb.ByteSource} bytes The bytes to deserialize. - * @return {!proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply} - */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply.deserializeBinary = function(bytes) { - var reader = new jspb.BinaryReader(bytes); - var msg = new proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply; - return proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply.deserializeBinaryFromReader(msg, reader); -}; - - -/** - * Deserializes binary data (in protobuf wire format) from the - * given reader into the given message object. - * @param {!proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply} msg The message object to deserialize into. - * @param {!jspb.BinaryReader} reader The BinaryReader to use. - * @return {!proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply} - */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply.deserializeBinaryFromReader = function(msg, reader) { - while (reader.nextField()) { - if (reader.isEndGroup()) { - break; - } - var field = reader.getFieldNumber(); - switch (field) { - case 1: - var value = new proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo; - reader.readMessage(value,proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo.deserializeBinaryFromReader); - msg.setAtomiccounterinfo(value); - break; - case 2: - var value = new ResultReply_pb.ResultReply; - reader.readMessage(value,ResultReply_pb.ResultReply.deserializeBinaryFromReader); - msg.setResultreply(value); - break; - default: - reader.skipField(); - break; - } - } - return msg; -}; - - -/** - * Serializes the message to binary data (in protobuf wire format). - * @return {!Uint8Array} - */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply.prototype.serializeBinary = function() { - var writer = new jspb.BinaryWriter(); - proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply.serializeBinaryToWriter(this, writer); - return writer.getResultBuffer(); -}; - - -/** - * Serializes the given message to binary data (in protobuf wire - * format), writing to the given BinaryWriter. - * @param {!proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply} message - * @param {!jspb.BinaryWriter} writer - * @suppress {unusedLocalVariables} f is only used for nested messages - */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply.serializeBinaryToWriter = function(message, writer) { - var f = undefined; - f = message.getAtomiccounterinfo(); - if (f != null) { - writer.writeMessage( - 1, - f, - proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo.serializeBinaryToWriter - ); - } - f = message.getResultreply(); - if (f != null) { - writer.writeMessage( - 2, - f, - ResultReply_pb.ResultReply.serializeBinaryToWriter - ); - } -}; - - -/** - * optional AtomicCounterInfo AtomicCounterInfo = 1; - * @return {?proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo} - */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply.prototype.getAtomiccounterinfo = function() { - return /** @type{?proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo} */ ( - jspb.Message.getWrapperField(this, proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo, 1)); -}; - - -/** @param {?proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo|undefined} value */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply.prototype.setAtomiccounterinfo = function(value) { - jspb.Message.setWrapperField(this, 1, value); -}; - - -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply.prototype.clearAtomiccounterinfo = function() { - this.setAtomiccounterinfo(undefined); -}; - - -/** - * Returns whether this field is set. - * @return {!boolean} - */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply.prototype.hasAtomiccounterinfo = function() { - return jspb.Message.getField(this, 1) != null; -}; - - -/** - * optional JT808.GrpcDashbord.ServiceGrpcBase.ResultReply ResultReply = 2; - * @return {?proto.JT808.GrpcDashbord.ServiceGrpcBase.ResultReply} - */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply.prototype.getResultreply = function() { - return /** @type{?proto.JT808.GrpcDashbord.ServiceGrpcBase.ResultReply} */ ( - jspb.Message.getWrapperField(this, ResultReply_pb.ResultReply, 2)); -}; - - -/** @param {?proto.JT808.GrpcDashbord.ServiceGrpcBase.ResultReply|undefined} value */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply.prototype.setResultreply = function(value) { - jspb.Message.setWrapperField(this, 2, value); -}; - - -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply.prototype.clearResultreply = function() { - this.setResultreply(undefined); -}; - - -/** - * Returns whether this field is set. - * @return {!boolean} - */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterReply.prototype.hasResultreply = function() { - return jspb.Message.getField(this, 2) != null; -}; - - - -/** - * Generated by JsPbCodeGenerator. - * @param {Array=} opt_data Optional initial data array, typically from a - * server response, or constructed directly in Javascript. The array is used - * in place and becomes part of the constructed object. It is not cloned. - * If no data is provided, the constructed object will be empty, but still - * valid. - * @extends {jspb.Message} - * @constructor - */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo = function(opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, null, null); -}; -goog.inherits(proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo, jspb.Message); -if (goog.DEBUG && !COMPILED) { - proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo.displayName = 'proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo'; -} - - -if (jspb.Message.GENERATE_TO_OBJECT) { -/** - * Creates an object representation of this proto suitable for use in Soy templates. - * Field names that are reserved in JavaScript and will be renamed to pb_name. - * To access a reserved field use, foo.pb_, eg, foo.pb_default. - * For the list of reserved names please see: - * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. - * @param {boolean=} opt_includeInstance Whether to include the JSPB instance - * for transitional soy proto support: http://goto/soy-param-migration - * @return {!Object} - */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo.prototype.toObject = function(opt_includeInstance) { - return proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo.toObject(opt_includeInstance, this); -}; - - -/** - * Static version of the {@see toObject} method. - * @param {boolean|undefined} includeInstance Whether to include the JSPB - * instance for transitional soy proto support: - * http://goto/soy-param-migration - * @param {!proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo} msg The msg instance to transform. - * @return {!Object} - * @suppress {unusedLocalVariables} f is only used for nested messages - */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo.toObject = function(includeInstance, msg) { - var f, obj = { - msgsuccesscount: jspb.Message.getFieldWithDefault(msg, 1, 0), - msgfailcount: jspb.Message.getFieldWithDefault(msg, 2, 0) - }; - - if (includeInstance) { - obj.$jspbMessageInstance = msg; - } - return obj; -}; -} - - -/** - * Deserializes binary data (in protobuf wire format). - * @param {jspb.ByteSource} bytes The bytes to deserialize. - * @return {!proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo} - */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo.deserializeBinary = function(bytes) { - var reader = new jspb.BinaryReader(bytes); - var msg = new proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo; - return proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo.deserializeBinaryFromReader(msg, reader); -}; - - -/** - * Deserializes binary data (in protobuf wire format) from the - * given reader into the given message object. - * @param {!proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo} msg The message object to deserialize into. - * @param {!jspb.BinaryReader} reader The BinaryReader to use. - * @return {!proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo} - */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo.deserializeBinaryFromReader = function(msg, reader) { - while (reader.nextField()) { - if (reader.isEndGroup()) { - break; - } - var field = reader.getFieldNumber(); - switch (field) { - case 1: - var value = /** @type {number} */ (reader.readInt32()); - msg.setMsgsuccesscount(value); - break; - case 2: - var value = /** @type {number} */ (reader.readInt32()); - msg.setMsgfailcount(value); - break; - default: - reader.skipField(); - break; - } - } - return msg; -}; - - -/** - * Serializes the message to binary data (in protobuf wire format). - * @return {!Uint8Array} - */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo.prototype.serializeBinary = function() { - var writer = new jspb.BinaryWriter(); - proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo.serializeBinaryToWriter(this, writer); - return writer.getResultBuffer(); -}; - - -/** - * Serializes the given message to binary data (in protobuf wire - * format), writing to the given BinaryWriter. - * @param {!proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo} message - * @param {!jspb.BinaryWriter} writer - * @suppress {unusedLocalVariables} f is only used for nested messages - */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo.serializeBinaryToWriter = function(message, writer) { - var f = undefined; - f = message.getMsgsuccesscount(); - if (f !== 0) { - writer.writeInt32( - 1, - f - ); - } - f = message.getMsgfailcount(); - if (f !== 0) { - writer.writeInt32( - 2, - f - ); - } -}; - - -/** - * optional int32 MsgSuccessCount = 1; - * @return {number} - */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo.prototype.getMsgsuccesscount = function() { - return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 1, 0)); -}; - - -/** @param {number} value */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo.prototype.setMsgsuccesscount = function(value) { - jspb.Message.setProto3IntField(this, 1, value); -}; - - -/** - * optional int32 MsgFailCount = 2; - * @return {number} - */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo.prototype.getMsgfailcount = function() { - return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 2, 0)); -}; - - -/** @param {number} value */ -proto.JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterInfo.prototype.setMsgfailcount = function(value) { - jspb.Message.setProto3IntField(this, 2, value); -}; - - -goog.object.extend(exports, proto.JT808.GrpcDashbord.AtomicCounterGrpcService); diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcServer/GrpcImpls/JT808AtomicCounterServiceGrpcImpl.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcServer/GrpcImpls/JT808AtomicCounterServiceGrpcImpl.cs deleted file mode 100644 index e4ed823..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcServer/GrpcImpls/JT808AtomicCounterServiceGrpcImpl.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading.Tasks; -using Grpc.Core; -using JT808.GrpcDashbord.AtomicCounterGrpcService; -using JT808.GrpcDashbord.ServiceGrpcBase; -using static JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterService; - -namespace JT808.DotNetty.Dashbord.GrpcServer.GrpcImpls -{ - public class JT808AtomicCounterServiceGrpcImpl: AtomicCounterServiceBase - { - public override Task GetTcpAtomicCounter(EmptyRequest request, ServerCallContext context) - { - AtomicCounterReply atomicCounterReply = new AtomicCounterReply(); - atomicCounterReply.MsgFailCount = 10; - atomicCounterReply.MsgSuccessCount = 1111; - return Task.FromResult(atomicCounterReply); - } - - public override Task GetUdpAtomicCounter(EmptyRequest request, ServerCallContext context) - { - AtomicCounterReply atomicCounterReply = new AtomicCounterReply(); - atomicCounterReply.MsgFailCount = 50; - atomicCounterReply.MsgSuccessCount = 1111; - return Task.FromResult(atomicCounterReply); - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcServer/Handlers/DemoServerHandler.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcServer/Handlers/DemoServerHandler.cs deleted file mode 100644 index a11d92e..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcServer/Handlers/DemoServerHandler.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; -using System.Linq; -using System.Threading.Tasks; -using Grpc.Core; - -namespace JT808.DotNetty.Dashbord.GrpcServer -{ - public class DemoServerHandler - where TRequest : class - where TResponse : class - { - private readonly ServerCallContext _context; - - public DemoServerHandler(ServerCallContext context) - { - _context = context; - } - - public async Task UnaryServerHandler(TRequest request, UnaryServerMethod continuation) - { - var response = await continuation(request, _context).ConfigureAwait(false); - return response; - } - - public async Task ClientStreamingServerHandler(IAsyncStreamReader requestStream, ClientStreamingServerMethod continuation) - { - var response = await continuation(requestStream, _context).ConfigureAwait(false); - return response; - } - - public async Task ServerStreamingServerHandler(TRequest request, IServerStreamWriter responseStream, ServerStreamingServerMethod continuation) - { - await continuation(request, responseStream, _context).ConfigureAwait(false); - } - - public async Task DuplexStreamingServerHandler(IAsyncStreamReader requestStream, IServerStreamWriter responseStream, DuplexStreamingServerMethod continuation) - { - await continuation(requestStream, responseStream, _context).ConfigureAwait(false); - } - } -} \ No newline at end of file diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcServer/Interceptors/DemoInterceptor.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcServer/Interceptors/DemoInterceptor.cs deleted file mode 100644 index dd7d3d9..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcServer/Interceptors/DemoInterceptor.cs +++ /dev/null @@ -1,47 +0,0 @@ -using Grpc.Core; -using Grpc.Core.Interceptors; -using JT808.DotNetty.Dashbord.GrpcProtocol.Extensions; -using JT808.GrpcDashbord.ServiceGrpcBase; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading.Tasks; - -namespace JT808.DotNetty.Dashbord.GrpcServer.Interceptors -{ - /// - /// - /// https://github.com/grpc/grpc/blob/master/doc/server_side_auth.md - /// https://github.com/Falco20019/grpc-opentracing - /// https://github.com/grpc/proposal/blob/master/L12-csharp-interceptors.md - /// https://stackoverflow.com/questions/52950210/populate-authcontext-in-grpc-c-sharp-from-jwt-authentication - /// https://github.com/grpc/grpc/tree/master/doc - /// - class DemoInterceptor : Interceptor - { - public override Task UnaryServerHandler(TRequest request, ServerCallContext context, UnaryServerMethod continuation) - { - if(TryGetValue(context.RequestHeaders,"token",out var str)) - { - //ErrorExtensions.Unauthenticated(); - } - return continuation(request, context); - //return Task.FromResult(default(TResponse)); - //return await continuation(request, context); - } - - private bool TryGetValue(Metadata metadata,string key,out string value) - { - foreach(var item in metadata) - { - if(item.Key== key) - { - value = item.Value; - return true; - } - } - value = ""; - return false; - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcServer/JT808.DotNetty.Dashbord.GrpcServer.csproj b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcServer/JT808.DotNetty.Dashbord.GrpcServer.csproj deleted file mode 100644 index 007d2c7..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcServer/JT808.DotNetty.Dashbord.GrpcServer.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - Exe - netcoreapp2.2 - - - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcServer/Program.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcServer/Program.cs deleted file mode 100644 index f5cc394..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.GrpcServer/Program.cs +++ /dev/null @@ -1,49 +0,0 @@ -using Grpc.Core; -using Grpc.Core.Interceptors; -using JT808.DotNetty.Dashbord.GrpcServer.GrpcImpls; -using JT808.DotNetty.Dashbord.GrpcServer.Interceptors; -using JT808.GrpcDashbord.AtomicCounterGrpcService; -using System; -using System.Threading; -using static JT808.GrpcDashbord.AtomicCounterGrpcService.AtomicCounterService; - -namespace JT808.DotNetty.Dashbord.GrpcServer -{ - class Program - { - static void Main(string[] args) - { - var server = new Server - { - Services = { - BindService(new JT808AtomicCounterServiceGrpcImpl()) - .Intercept(new DemoInterceptor()), - }, - Ports = { - new ServerPort("0.0.0.0", 14000,ServerCredentials.Insecure) - } - }; - Console.WriteLine("Google Grpc Starting"); - foreach (var item in server.Ports) - { - Console.WriteLine(string.Format("RPC server {0} listening on port {1}", item.Host, item.Port)); - } - server.Start(); - AtomicCounterServiceClient client = new AtomicCounterServiceClient(new Channel("127.0.0.1:14000", ChannelCredentials.Insecure)); - Metadata metadata = new Metadata(); - metadata.Add("token", "test"); - metadata.Add("request", "web"); - - try - { - var result = client.GetTcpAtomicCounter(new GrpcDashbord.ServiceGrpcBase.EmptyRequest(), metadata); - } - catch (RpcException ex) - { - - } - Console.ReadKey(); - server.ShutdownAsync().Wait(); - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/.babelrc b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/.babelrc deleted file mode 100644 index 2a81884..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/.babelrc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "presets": [ - "@vue/app" - ] -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/.editorconfig b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/.editorconfig deleted file mode 100644 index 9d08a1a..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/.editorconfig +++ /dev/null @@ -1,9 +0,0 @@ -root = true - -[*] -charset = utf-8 -indent_style = space -indent_size = 2 -end_of_line = lf -insert_final_newline = true -trim_trailing_whitespace = true diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/.eslintignore b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/.eslintignore deleted file mode 100644 index e69de29..0000000 diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/.eslintrc.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/.eslintrc.js deleted file mode 100644 index 2005c1a..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/.eslintrc.js +++ /dev/null @@ -1,19 +0,0 @@ -module.exports = { - root: true, - 'extends': [ - 'plugin:vue/essential', - '@vue/standard' - ], - rules: { - // allow async-await - 'generator-star-spacing': 'off', - // allow debugger during development - 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off', - 'vue/no-parsing-error': [2, { 'x-invalid-end-tag': false }], - 'no-undef': 'off', - 'camelcase': 'off' - }, - parserOptions: { - parser: 'babel-eslint' - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/.gitignore b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/.gitignore deleted file mode 100644 index 2056a84..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/.gitignore +++ /dev/null @@ -1,26 +0,0 @@ -.DS_Store -node_modules -/dist - -/tests/e2e/videos/ -/tests/e2e/screenshots/ - -# local env files -.env.local -.env.*.local - -# Log files -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -# Editor directories and files -.idea -.vscode -*.suo -*.ntvs* -*.njsproj -*.sln -*.sw* - -build/env.js diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/.postcssrc.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/.postcssrc.js deleted file mode 100644 index 961986e..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/.postcssrc.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - plugins: { - autoprefixer: {} - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/LICENSE b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/LICENSE deleted file mode 100644 index 7ec88ac..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 iView - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/README.md b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/README.md deleted file mode 100644 index 9c1c4d8..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/README.md +++ /dev/null @@ -1,20 +0,0 @@ -# Install - -```bush -// install dependencies -npm install -``` - -## Run - -### Development - -```bush -npm run dev -``` - -### Production(Build) - -```bush -npm run build -``` \ No newline at end of file diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/public/favicon.ico b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/public/favicon.ico deleted file mode 100644 index 97131e9..0000000 Binary files a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/public/favicon.ico and /dev/null differ diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/public/index.html b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/public/index.html deleted file mode 100644 index 8e8eeaf..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/public/index.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - -
- - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/App.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/App.vue deleted file mode 100644 index 01c4743..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/App.vue +++ /dev/null @@ -1,27 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/api/atomicCounter.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/api/atomicCounter.js deleted file mode 100644 index b77eadc..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/api/atomicCounter.js +++ /dev/null @@ -1,8 +0,0 @@ -import axios from '@/libs/api.request' - -export const GetAtomicCounter = () => { - return axios.request({ - url: 'AtomicCounter/GetAtomicCounter', - method: 'get' - }) -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/api/data.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/api/data.js deleted file mode 100644 index ca4286a..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/api/data.js +++ /dev/null @@ -1,37 +0,0 @@ -import axios from '@/libs/api.request' - -export const getTableData = () => { - return axios.request({ - url: 'get_table_data', - method: 'get' - }) -} - -export const getDragList = () => { - return axios.request({ - url: 'get_drag_list', - method: 'get' - }) -} - -export const errorReq = () => { - return axios.request({ - url: 'error_url', - method: 'post' - }) -} - -export const saveErrorLogger = info => { - return axios.request({ - url: 'save_error_logger', - data: info, - method: 'post' - }) -} - -export const uploadImg = formData => { - return axios.request({ - url: 'image/upload', - data: formData - }) -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/api/routers.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/api/routers.js deleted file mode 100644 index 04a03a9..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/api/routers.js +++ /dev/null @@ -1,11 +0,0 @@ -import axios from '@/libs/api.request' - -export const getRouterReq = (access) => { - return axios.request({ - url: 'get_router', - params: { - access - }, - method: 'get' - }) -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/api/session.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/api/session.js deleted file mode 100644 index a6003b6..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/api/session.js +++ /dev/null @@ -1,22 +0,0 @@ -import axios from '@/libs/api.request' - -export const RemoveByTerminalPhoneNo = (terminalPhoneN) => { - return axios.request({ - url: 'Session/RemoveByTerminalPhoneNo/' + terminalPhoneN, - method: 'get' - }) -} - -export const RemoveByChannelId = (channelId) => { - return axios.request({ - url: 'Session/RemoveByChannelId/' + channelId, - method: 'get' - }) -} - -export const GetAll = () => { - return axios.request({ - url: 'Session/GetAll', - method: 'get' - }) -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/api/sourcePackage.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/api/sourcePackage.js deleted file mode 100644 index fb449b5..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/api/sourcePackage.js +++ /dev/null @@ -1,32 +0,0 @@ -import axios from '@/libs/api.request' - -export const Add = ({ Host, Port }) => { - const data = { - Host, - Port - } - return axios.request({ - url: 'SourcePackage/Add', - data, - method: 'post' - }) -} - -export const Remove = ({ Host, Port }) => { - const data = { - Host, - Port - } - return axios.request({ - url: 'SourcePackage/Remove', - data, - method: 'post' - }) -} - -export const GetAll = () => { - return axios.request({ - url: 'SourcePackage/GetAll', - method: 'get' - }) -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/api/transmit.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/api/transmit.js deleted file mode 100644 index dc75362..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/api/transmit.js +++ /dev/null @@ -1,32 +0,0 @@ -import axios from '@/libs/api.request' - -export const Add = ({ Host, Port }) => { - const data = { - Host, - Port - } - return axios.request({ - url: 'Transmit/Add', - data, - method: 'post' - }) -} - -export const Remove = ({ Host, Port }) => { - const data = { - Host, - Port - } - return axios.request({ - url: 'Transmit/Remove', - data, - method: 'post' - }) -} - -export const GetAll = () => { - return axios.request({ - url: 'Transmit/GetAll', - method: 'get' - }) -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/api/unificationSend.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/api/unificationSend.js deleted file mode 100644 index ea95d65..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/api/unificationSend.js +++ /dev/null @@ -1,8 +0,0 @@ -import axios from '@/libs/api.request' - -export const SendText = ({ terminalPhoneNo, text }) => { - return axios.request({ - url: 'UnificationSend/SendText/' + terminalPhoneNo + '/' + text, - method: 'get' - }) -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/api/user.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/api/user.js deleted file mode 100644 index 2d6d4d1..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/api/user.js +++ /dev/null @@ -1,84 +0,0 @@ -import axios from '@/libs/api.request' - -export const login = ({ userName, password }) => { - const data = { - userName, - password - } - return axios.request({ - url: 'login', - data, - method: 'post' - }) -} - -export const getUserInfo = (token) => { - return axios.request({ - url: 'get_info', - params: { - token - }, - method: 'get' - }) -} - -export const logout = (token) => { - return axios.request({ - url: 'logout', - method: 'post' - }) -} - -export const getUnreadCount = () => { - return axios.request({ - url: 'message/count', - method: 'get' - }) -} - -export const getMessage = () => { - return axios.request({ - url: 'message/init', - method: 'get' - }) -} - -export const getContentByMsgId = msg_id => { - return axios.request({ - url: 'message/content', - method: 'get', - params: { - msg_id - } - }) -} - -export const hasRead = msg_id => { - return axios.request({ - url: 'message/has_read', - method: 'post', - data: { - msg_id - } - }) -} - -export const removeReaded = msg_id => { - return axios.request({ - url: 'message/remove_readed', - method: 'post', - data: { - msg_id - } - }) -} - -export const restoreTrash = msg_id => { - return axios.request({ - url: 'message/restore', - method: 'post', - data: { - msg_id - } - }) -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/icons/iconfont.css b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/icons/iconfont.css deleted file mode 100644 index 80a476c..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/icons/iconfont.css +++ /dev/null @@ -1,37 +0,0 @@ - -@font-face {font-family: "iconfont"; - src: url('iconfont.eot?t=1541579316141'); /* IE9*/ - src: url('iconfont.eot?t=1541579316141#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('data:application/x-font-woff;charset=utf-8;base64,d09GRgABAAAAAAiEAAsAAAAADmgAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABHU1VCAAABCAAAADMAAABCsP6z7U9TLzIAAAE8AAAARAAAAFY8eUnXY21hcAAAAYAAAACjAAACLi+YJuBnbHlmAAACJAAABAgAAAcg4dRWHmhlYWQAAAYsAAAAMQAAADYTL8piaGhlYQAABmAAAAAgAAAAJAfdA4xobXR4AAAGgAAAABQAAAAsLAD//2xvY2EAAAaUAAAAGAAAABgImgpGbWF4cAAABqwAAAAfAAAAIAEcAG5uYW1lAAAGzAAAAUUAAAJtPlT+fXBvc3QAAAgUAAAAbgAAAI54roygeJxjYGRgYOBikGPQYWB0cfMJYeBgYGGAAJAMY05meiJQDMoDyrGAaQ4gZoOIAgCKIwNPAHicY2BkYWCcwMDKwMHUyXSGgYGhH0IzvmYwYuRgYGBiYGVmwAoC0lxTGByeMTx/ytzwv4EhhrmBoRkozAiSAwDuUwzMeJzlkUEKwkAMRd/YabXFhQvxFF6qPYPrUujGY7jyIr1JoZNjtMnEhag3MOEN5MMk8D9QAoVyVSKEJwGrh6oh6wVN1iM3nc+cVImJVKdOehlklElmWdYVstp+ql8VdIv15a1NLW0zFXsO7Kjz3erH/3+rY37vr6kxnx1LKNWOJZlaxxJNnWOpSu+ot8jgqMvI6KjfyOSo88jsaAbI4tBsig89rQB4nLVUTWwbRRSeNzO767i2g7N/FP9s7MRrE5ON4/V6rSZyU0PiINSSNImES4IUoapWz6hEiqiMBDQqEojkAkiFStyKRC+9VSoFCeUEyqESVUAqEkcu3OAQb3hrJxAXwSGI3X0/szPz5vvm2x0i7O/vf8IJe5VkSJnUyUtklRBQJE1VIjRtUafkmk6pSu2ipleh4+xikkKxSksWTUeo8m8NoagpYtoslTmxrLl37z64e33esuJjU8P5Wd262LxoPVnPZ06Pxfe+C0YjkhSJygPhQCA8ABPOykwuN7NyuRvgUnAgLEnhATkaCQQiUe/7XKUyV6nQz+t2o7l66+rs7NVbq82GXTdrdjxjRGU5amTids2bUDMFtzCsqsMYMqr3IDY6OT05GjsI8Exv/6CSkOWEQigh+y3clxY5QVTcEZFIGtHLxDUJs6WsHR1y9SFKdr1HggCp3V1ICYL36OOpVmvKN9bC1u6R3vZ0qwWtVovgJfqOfUvfIYxIWL+fyETHNVJqSkIT1JTjW8ZWh3yDJDz0ctvsyt51etvrg9/QHhqGlzMM+vbmizPnDWPLMNbW19e7tffvsBzL99aWEfBRY46t+tbe3PypXv/IMDYN43WsQBe9HL2NC33RuxABrPsG+xH3o4bVRE2KgCRqulbWNf8W/UYVHM129aKra24VshZkq+CWD/Oy6Xt8cGYEthgHVlVliCfynAlqjo6oysTKlYUAD4docMI5/1ZioN+GwZNBcTwWUmTdBUqhTwX29QebXzF4An4JJMzwfMl+WQ01+IlQZVR4yhie53ycA16pOI/ODiYNGK4MChdCgXNnX5gIJXPCSYnf2OF850aQ+zJIyOs+u8+mMO8jQdwtg1TIWVRjKAnFcslMi8KfGUPoSUCergUyUk77dMyS69Ms6tijKZKYwUGKbpfdzu+iYeZYAHMFiOVi+MD7h9mb99qC0L7X8c+XatMfTj97KZ5IxJt/pd43tYYQKEjAnXMOB6kQEBrwg+LPjindAPOHNdC3q3ait0I3/ZIunZEARLNYNEUA6czSP3N/7j9wz6ZESdX0VNl1zGNS/szbQaQSIGk4DtVPcZf8AgXpf9A2OyTit5s2syZmand46bhEe2WtodLHkvaoqtTXuXN2/c42WADP9HGfbUcUW7JgqHss4xHtlMys679FqUomdP9VJBQBdnlPABBubpuNwqnmQj6/0HwNQzKxDUJFgKiXurBG6dqFjmeBzsvtRPJgGIZThYa5fdOvsReOticPh6JHHXxsv7ItJpOniYPYsmZ/x0QD/o5P105DeQwF6MH33ogoLi+KQp7zpY3HQV5bFMURzheXeds7gpP+jKNXljjHuYvXHke7cdCxLLZf6YX7B63UcCV4nGNgZGBgAOKAN2ZR8fw2Xxm4WRhA4AbHYRMY/f///1oWBuYGIJeDgQkkCgAvWgs2AAAAeJxjYGRgYG7438AQw8Lw/z8DAwsDA1AEBXADAHXiBHJ4nGNhYGBgYfj/nwVM48cATwECKwAAAAAAjAC6AOgBFAGAAf4CbgLqAzgDkHicY2BkYGDgZkhiYGcAASYg5gJCBob/YD4DABOmAYsAeJxlj01OwzAQhV/6B6QSqqhgh+QFYgEo/RGrblhUavdddN+mTpsqiSPHrdQDcB6OwAk4AtyAO/BIJ5s2lsffvHljTwDc4Acejt8t95E9XDI7cg0XuBeuU38QbpBfhJto41W4Rf1N2MczpsJtdGF5g9e4YvaEd2EPHXwI13CNT+E69S/hBvlbuIk7/Aq30PHqwj7mXle4jUcv9sdWL5xeqeVBxaHJIpM5v4KZXu+Sha3S6pxrW8QmU4OgX0lTnWlb3VPs10PnIhVZk6oJqzpJjMqt2erQBRvn8lGvF4kehCblWGP+tsYCjnEFhSUOjDFCGGSIyujoO1Vm9K+xQ8Jee1Y9zed0WxTU/3OFAQL0z1xTurLSeTpPgT1fG1J1dCtuy56UNJFezUkSskJe1rZUQuoBNmVXjhF6XNGJPyhnSP8ACVpuyAAAAHicbYhdDoIwEAb3a6k/YIIX8VArWewmdJFWJOnpJTG+OQ+TzJCjLy39p4ODR4OAA4444YwWHS7U3IVzn6Voldtb8ksHnvohrlqjjmw1rmzXsvdT7fEbblnCmOfNfJIYStJJfGIL27yb6AOCGR89AAA=') format('woff'), - url('iconfont.ttf?t=1541579316141') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('iconfont.svg?t=1541579316141#iconfont') format('svg'); /* iOS 4.1- */ -} - -.iconfont { - font-family:"iconfont" !important; - font-size:16px; - font-style:normal; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -.icon-bear:before { content: "\e600"; } - -.icon-resize-vertical:before { content: "\e7c3"; } - -.icon-chuizhifanzhuan:before { content: "\e661"; } - -.icon-shuipingfanzhuan:before { content: "\e662"; } - -.icon-qq:before { content: "\e609"; } - -.icon-frown:before { content: "\e77e"; } - -.icon-meh:before { content: "\e780"; } - -.icon-smile:before { content: "\e783"; } - -.icon-man:before { content: "\e7e2"; } - -.icon-woman:before { content: "\e7e5"; } - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/icons/iconfont.eot b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/icons/iconfont.eot deleted file mode 100644 index 045499d..0000000 Binary files a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/icons/iconfont.eot and /dev/null differ diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/icons/iconfont.svg b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/icons/iconfont.svg deleted file mode 100644 index 6aa3270..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/icons/iconfont.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - -Created by iconfont - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/icons/iconfont.ttf b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/icons/iconfont.ttf deleted file mode 100644 index 0c557de..0000000 Binary files a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/icons/iconfont.ttf and /dev/null differ diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/icons/iconfont.woff b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/icons/iconfont.woff deleted file mode 100644 index 105adab..0000000 Binary files a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/icons/iconfont.woff and /dev/null differ diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/error-page/error-401.svg b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/error-page/error-401.svg deleted file mode 100644 index 19e2f9f..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/error-page/error-401.svg +++ /dev/null @@ -1 +0,0 @@ -tasting \ No newline at end of file diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/error-page/error-404.svg b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/error-page/error-404.svg deleted file mode 100644 index 77d97f7..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/error-page/error-404.svg +++ /dev/null @@ -1 +0,0 @@ -drone_delivery \ No newline at end of file diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/error-page/error-500.svg b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/error-page/error-500.svg deleted file mode 100644 index ef72fd3..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/error-page/error-500.svg +++ /dev/null @@ -1 +0,0 @@ -co-working \ No newline at end of file diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/login-bg.jpg b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/login-bg.jpg deleted file mode 100644 index 94b8f51..0000000 Binary files a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/login-bg.jpg and /dev/null differ diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/logo-min.jpg b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/logo-min.jpg deleted file mode 100644 index 18abf21..0000000 Binary files a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/logo-min.jpg and /dev/null differ diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/logo.jpg b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/logo.jpg deleted file mode 100644 index 11638b3..0000000 Binary files a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/logo.jpg and /dev/null differ diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/qq-group1.jpg b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/qq-group1.jpg deleted file mode 100644 index 3e6dd60..0000000 Binary files a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/qq-group1.jpg and /dev/null differ diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/qq-group2.jpg b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/qq-group2.jpg deleted file mode 100644 index 526b081..0000000 Binary files a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/qq-group2.jpg and /dev/null differ diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/talkingdata.png b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/talkingdata.png deleted file mode 100644 index 87ad50e..0000000 Binary files a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/assets/images/talkingdata.png and /dev/null differ diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/charts/bar.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/charts/bar.vue deleted file mode 100644 index b0a2709..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/charts/bar.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/charts/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/charts/index.js deleted file mode 100644 index 2ca3c91..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/charts/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import ChartPie from './pie.vue' -import ChartBar from './bar.vue' -export { ChartPie, ChartBar } diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/charts/pie.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/charts/pie.vue deleted file mode 100644 index c86d68c..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/charts/pie.vue +++ /dev/null @@ -1,70 +0,0 @@ - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/common-icon/common-icon.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/common-icon/common-icon.vue deleted file mode 100644 index 768fa1b..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/common-icon/common-icon.vue +++ /dev/null @@ -1,42 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/common-icon/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/common-icon/index.js deleted file mode 100644 index 1207d15..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/common-icon/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import CommonIcon from './common-icon.vue' -export default CommonIcon diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/common/common.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/common/common.less deleted file mode 100644 index 3c3e5b1..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/common/common.less +++ /dev/null @@ -1,8 +0,0 @@ -.no-select{ - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/common/util.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/common/util.js deleted file mode 100644 index 2129e7a..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/common/util.js +++ /dev/null @@ -1,3 +0,0 @@ -export const showTitle = (item, vm) => { - return vm.$config.useI18n ? vm.$t(item.name) : ((item.meta && item.meta.title) || item.name) -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/count-to/count-to.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/count-to/count-to.vue deleted file mode 100644 index a10e3ff..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/count-to/count-to.vue +++ /dev/null @@ -1,174 +0,0 @@ - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/count-to/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/count-to/index.js deleted file mode 100644 index 17b3332..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/count-to/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import countTo from './count-to.vue' -export default countTo diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/count-to/index.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/count-to/index.less deleted file mode 100644 index e17d7c6..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/count-to/index.less +++ /dev/null @@ -1,10 +0,0 @@ -@prefix: ~"count-to"; - -.@{prefix}-wrapper{ - .content-outer{ - display: inline-block; - .@{prefix}-unit-text{ - font-style: normal; - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/cropper/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/cropper/index.js deleted file mode 100644 index e7db5ea..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/cropper/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import Cropper from './index.vue' -export default Cropper diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/cropper/index.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/cropper/index.less deleted file mode 100644 index cdf431d..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/cropper/index.less +++ /dev/null @@ -1,35 +0,0 @@ -.bg{ - background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAAA3NCSVQICAjb4U/gAAAABlBMVEXMzMz////TjRV2AAAACXBIWXMAAArrAAAK6wGCiw1aAAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAABFJREFUCJlj+M/AgBVhF/0PAH6/D/HkDxOGAAAAAElFTkSuQmCC") -} -.cropper-wrapper{ - width: 600px; - height: 340px; - .img-box{ - height: 340px; - width: 430px; - border: 1px solid #ebebeb; - display: inline-block; - .bg; - img{ - max-width: 100%; - display: block; - } - } - .right-con{ - display: inline-block; - width: 170px; - vertical-align: top; - box-sizing: border-box; - padding: 0 10px; - .preview-box{ - height: 150px !important; - width: 100% !important; - overflow: hidden; - border: 1px solid #ebebeb; - .bg; - } - .button-box{ - padding: 10px 0 0; - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/cropper/index.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/cropper/index.vue deleted file mode 100644 index 7bb664f..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/cropper/index.vue +++ /dev/null @@ -1,139 +0,0 @@ - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/icons/icons.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/icons/icons.vue deleted file mode 100644 index 50b7183..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/icons/icons.vue +++ /dev/null @@ -1,35 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/icons/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/icons/index.js deleted file mode 100644 index bdc38b2..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/icons/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import Icons from './icons.vue' -export default Icons diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/info-card/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/info-card/index.js deleted file mode 100644 index 354419b..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/info-card/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import InforCard from './infor-card.vue' -export default InforCard diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/info-card/infor-card.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/info-card/infor-card.vue deleted file mode 100644 index 6240d0e..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/info-card/infor-card.vue +++ /dev/null @@ -1,94 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/login-form/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/login-form/index.js deleted file mode 100644 index d480c28..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/login-form/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import LoginForm from './login-form.vue' -export default LoginForm diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/login-form/login-form.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/login-form/login-form.vue deleted file mode 100644 index 497c08c..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/login-form/login-form.vue +++ /dev/null @@ -1,72 +0,0 @@ - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/a-back-top/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/a-back-top/index.js deleted file mode 100644 index 4da0014..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/a-back-top/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import ABackTop from './index.vue' -export default ABackTop diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/a-back-top/index.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/a-back-top/index.vue deleted file mode 100644 index f26f95c..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/a-back-top/index.vue +++ /dev/null @@ -1,90 +0,0 @@ - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/error-store/error-store.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/error-store/error-store.vue deleted file mode 100644 index 9941677..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/error-store/error-store.vue +++ /dev/null @@ -1,49 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/error-store/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/error-store/index.js deleted file mode 100644 index a777df1..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/error-store/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import ErrorStore from './error-store.vue' -export default ErrorStore diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/fullscreen/fullscreen.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/fullscreen/fullscreen.vue deleted file mode 100644 index d5213fa..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/fullscreen/fullscreen.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/fullscreen/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/fullscreen/index.js deleted file mode 100644 index 422c7c1..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/fullscreen/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import Fullscreen from './fullscreen.vue' -export default Fullscreen diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.less deleted file mode 100644 index 1ace1eb..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.less +++ /dev/null @@ -1,4 +0,0 @@ -.custom-bread-crumb{ - display: inline-block; - vertical-align: top; -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue deleted file mode 100644 index 51b121d..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue +++ /dev/null @@ -1,46 +0,0 @@ - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/custom-bread-crumb/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/custom-bread-crumb/index.js deleted file mode 100644 index a590fe0..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/custom-bread-crumb/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import customBreadCrumb from './custom-bread-crumb.vue' -export default customBreadCrumb diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/header-bar.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/header-bar.less deleted file mode 100644 index c245d19..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/header-bar.less +++ /dev/null @@ -1,14 +0,0 @@ -.header-bar{ - width: 100%; - height: 100%; - position: relative; - .custom-content-con{ - float: right; - height: auto; - padding-right: 20px; - line-height: 64px; - & > *{ - float: right; - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/header-bar.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/header-bar.vue deleted file mode 100644 index 1452146..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/header-bar.vue +++ /dev/null @@ -1,34 +0,0 @@ - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/index.js deleted file mode 100644 index 3d4a170..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import HeaderBar from './header-bar' -export default HeaderBar diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/sider-trigger/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/sider-trigger/index.js deleted file mode 100644 index 15853f4..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/sider-trigger/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import siderTrigger from './sider-trigger.vue' -export default siderTrigger diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/sider-trigger/sider-trigger.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/sider-trigger/sider-trigger.less deleted file mode 100644 index eb50999..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/sider-trigger/sider-trigger.less +++ /dev/null @@ -1,21 +0,0 @@ -.trans{ - transition: transform .2s ease; -} -@size: 40px; -.sider-trigger-a{ - padding: 6px; - width: @size; - height: @size; - display: inline-block; - text-align: center; - color: #5c6b77; - margin-top: 12px; - i{ - .trans; - vertical-align: top; - } - &.collapsed i{ - transform: rotateZ(90deg); - .trans; - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/sider-trigger/sider-trigger.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/sider-trigger/sider-trigger.vue deleted file mode 100644 index 200e18f..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/header-bar/sider-trigger/sider-trigger.vue +++ /dev/null @@ -1,27 +0,0 @@ - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/language/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/language/index.js deleted file mode 100644 index de2a90a..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/language/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import Language from './language.vue' -export default Language diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/language/language.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/language/language.vue deleted file mode 100644 index b1d92ec..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/language/language.vue +++ /dev/null @@ -1,51 +0,0 @@ - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/side-menu/collapsed-menu.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/side-menu/collapsed-menu.vue deleted file mode 100644 index 73ac93e..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/side-menu/collapsed-menu.vue +++ /dev/null @@ -1,51 +0,0 @@ - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/side-menu/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/side-menu/index.js deleted file mode 100644 index 5b36868..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/side-menu/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import SideMenu from './side-menu.vue' -export default SideMenu diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/side-menu/item-mixin.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/side-menu/item-mixin.js deleted file mode 100644 index 8b807af..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/side-menu/item-mixin.js +++ /dev/null @@ -1,21 +0,0 @@ -export default { - props: { - parentItem: { - type: Object, - default: () => {} - }, - theme: String, - iconSize: Number - }, - computed: { - parentName () { - return this.parentItem.name - }, - children () { - return this.parentItem.children - }, - textColor () { - return this.theme === 'dark' ? '#fff' : '#495060' - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/side-menu/mixin.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/side-menu/mixin.js deleted file mode 100644 index 21b618b..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/side-menu/mixin.js +++ /dev/null @@ -1,18 +0,0 @@ -import CommonIcon from '_c/common-icon' -import { showTitle } from '@/libs/util' -export default { - components: { - CommonIcon - }, - methods: { - showTitle (item) { - return showTitle(item, this) - }, - showChildren (item) { - return item.children && (item.children.length > 1 || (item.meta && item.meta.showAlways)) - }, - getNameOrHref (item, children0) { - return item.href ? `isTurnByHref_${item.href}` : (children0 ? item.children[0].name : item.name) - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/side-menu/side-menu-item.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/side-menu/side-menu-item.vue deleted file mode 100644 index 12338a6..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/side-menu/side-menu-item.vue +++ /dev/null @@ -1,26 +0,0 @@ - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/side-menu/side-menu.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/side-menu/side-menu.less deleted file mode 100644 index 4716d82..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/side-menu/side-menu.less +++ /dev/null @@ -1,40 +0,0 @@ -.side-menu-wrapper{ - user-select: none; - .menu-collapsed{ - padding-top: 10px; - - .ivu-dropdown{ - width: 100%; - .ivu-dropdown-rel a{ - width: 100%; - } - } - .ivu-tooltip{ - width: 100%; - .ivu-tooltip-rel{ - width: 100%; - } - .ivu-tooltip-popper .ivu-tooltip-content{ - .ivu-tooltip-arrow{ - border-right-color: #fff; - } - .ivu-tooltip-inner{ - background: #fff; - color: #495060; - } - } - } - - - } - a.drop-menu-a{ - display: inline-block; - padding: 6px 15px; - width: 100%; - text-align: center; - color: #495060; - } -} -.menu-title{ - padding-left: 6px; -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/side-menu/side-menu.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/side-menu/side-menu.vue deleted file mode 100644 index ee18e86..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/side-menu/side-menu.vue +++ /dev/null @@ -1,114 +0,0 @@ - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/tags-nav/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/tags-nav/index.js deleted file mode 100644 index 585792a..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/tags-nav/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import TagsNav from './tags-nav.vue' -export default TagsNav diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/tags-nav/tags-nav.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/tags-nav/tags-nav.less deleted file mode 100644 index a4c8c5d..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/tags-nav/tags-nav.less +++ /dev/null @@ -1,87 +0,0 @@ -.no-select{ - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} -.size{ - width: 100%; - height: 100%; -} -.tags-nav{ - position: relative; - border-top: 1px solid #F0F0F0; - border-bottom: 1px solid #F0F0F0; - .no-select; - .size; - .close-con{ - position: absolute; - right: 0; - top: 0; - height: 100%; - width: 32px; - background: #fff; - text-align: center; - z-index: 10; - } - .btn-con{ - position: absolute; - top: 0px; - height: 100%; - background: #fff; - padding-top: 3px; - z-index: 10; - button{ - padding: 6px 4px; - line-height: 14px; - text-align: center; - } - &.left-btn{ - left: 0px; - } - &.right-btn{ - right: 32px; - border-right: 1px solid #F0F0F0; - } - } - .scroll-outer{ - position: absolute; - left: 28px; - right: 61px; - top: 0; - bottom: 0; - box-shadow: 0px 0 3px 2px rgba(100,100,100,.1) inset; - .scroll-body{ - height: ~"calc(100% - 1px)"; - display: inline-block; - padding: 1px 4px 0; - position: absolute; - overflow: visible; - white-space: nowrap; - transition: left .3s ease; - .ivu-tag-dot-inner{ - transition: background .2s ease; - } - } - } - .contextmenu { - position: absolute; - margin: 0; - padding: 5px 0; - background: #fff; - z-index: 100; - list-style-type: none; - border-radius: 4px; - box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3); - li { - margin: 0; - padding: 5px 15px; - cursor: pointer; - &:hover { - background: #eee; - } - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/tags-nav/tags-nav.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/tags-nav/tags-nav.vue deleted file mode 100644 index 2dbca44..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/tags-nav/tags-nav.vue +++ /dev/null @@ -1,209 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/user/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/user/index.js deleted file mode 100644 index 3d04a5c..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/user/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import User from './user.vue' -export default User diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/user/user.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/user/user.less deleted file mode 100644 index a3c95af..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/user/user.less +++ /dev/null @@ -1,12 +0,0 @@ -.user{ - &-avator-dropdown{ - cursor: pointer; - display: inline-block; - // height: 64px; - vertical-align: middle; - // line-height: 64px; - .ivu-badge-dot{ - top: 16px; - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/user/user.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/user/user.vue deleted file mode 100644 index 3d4689d..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/components/user/user.vue +++ /dev/null @@ -1,59 +0,0 @@ - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/index.js deleted file mode 100644 index 7df2a08..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import Main from './main.vue' -export default Main diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/main.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/main.less deleted file mode 100644 index fd0cd41..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/main.less +++ /dev/null @@ -1,75 +0,0 @@ -.main{ - .logo-con{ - height: 64px; - padding: 10px; - img{ - height: 44px; - width: auto; - display: block; - margin: 0 auto; - } - } - .header-con{ - background: #fff; - padding: 0 20px; - width: 100%; - } - .main-layout-con{ - height: 100%; - overflow: hidden; - } - .main-content-con{ - height: ~"calc(100% - 60px)"; - overflow: hidden; - } - .tag-nav-wrapper{ - padding: 0; - height:40px; - background:#F0F0F0; - } - .content-wrapper{ - padding: 18px; - height: ~"calc(100% - 80px)"; - overflow: auto; - } - .left-sider{ - .ivu-layout-sider-children{ - overflow-y: scroll; - margin-right: -18px; - } - } -} -.ivu-menu-item > i{ - margin-right: 12px !important; -} -.ivu-menu-submenu > .ivu-menu > .ivu-menu-item > i { - margin-right: 8px !important; -} -.collased-menu-dropdown{ - width: 100%; - margin: 0; - line-height: normal; - padding: 7px 0 6px 16px; - clear: both; - font-size: 12px !important; - white-space: nowrap; - list-style: none; - cursor: pointer; - transition: background 0.2s ease-in-out; - &:hover{ - background: rgba(100, 100, 100, 0.1); - } - & * { - color: #515a6e; - } - .ivu-menu-item > i{ - margin-right: 12px !important; - } - .ivu-menu-submenu > .ivu-menu > .ivu-menu-item > i { - margin-right: 8px !important; - } -} - -.ivu-select-dropdown.ivu-dropdown-transfer{ - max-height: 400px; -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/main.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/main.vue deleted file mode 100644 index 3c1603f..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/main/main.vue +++ /dev/null @@ -1,183 +0,0 @@ - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/parent-view/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/parent-view/index.js deleted file mode 100644 index a959c65..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/parent-view/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import ParentView from './parent-view.vue' -export default ParentView diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/parent-view/parent-view.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/parent-view/parent-view.vue deleted file mode 100644 index 84259f3..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/parent-view/parent-view.vue +++ /dev/null @@ -1,20 +0,0 @@ - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/split-pane/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/split-pane/index.js deleted file mode 100644 index f5ed60e..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/split-pane/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import Split from './split.vue' -export default Split diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/split-pane/index.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/split-pane/index.less deleted file mode 100644 index 2583d90..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/split-pane/index.less +++ /dev/null @@ -1,114 +0,0 @@ -@split-prefix-cls: ~"ivu-split"; -@box-shadow: 0 0 4px 0 rgba(28, 36, 56, 0.4); -@trigger-bar-background: rgba(23, 35, 61, 0.25); -@trigger-background: #F8F8F9; -@trigger-width: 6px; -@trigger-bar-width: 4px; -@trigger-bar-offset: (@trigger-width - @trigger-bar-width) / 2; -@trigger-bar-interval: 3px; -@trigger-bar-weight: 1px; -@trigger-bar-con-height: (@trigger-bar-weight + @trigger-bar-interval) * 8; - -.@{split-prefix-cls}{ - &-wrapper{ - position: relative; - width: 100%; - height: 100%; - } - &-pane{ - position: absolute; - &.left-pane, &.right-pane{ - top: 0px; - bottom: 0px; - } - &.left-pane{ - left: 0px; - } - &.right-pane{ - right: 0px; - } - &.top-pane, &.bottom-pane{ - left: 0px; - right: 0px; - } - &.top-pane{ - top: 0px; - } - &.bottom-pane{ - bottom: 0px; - } - } - &-trigger{ - &-con{ - position: absolute; - transform: translate(-50%, -50%); - z-index: 10; - } - &-bar-con{ - position: absolute; - overflow: hidden; - &.vertical{ - left: @trigger-bar-offset; - top: 50%; - height: @trigger-bar-con-height; - transform: translate(0, -50%); - } - &.horizontal{ - left: 50%; - top: @trigger-bar-offset; - width: @trigger-bar-con-height; - transform: translate(-50%, 0); - } - } - &-vertical{ - width: @trigger-width; - height: 100%; - background: @trigger-background; - box-shadow: @box-shadow; - cursor: col-resize; - .@{split-prefix-cls}-trigger-bar{ - width: @trigger-bar-width; - height: 1px; - background: @trigger-bar-background; - float: left; - margin-top: @trigger-bar-interval; - } - } - &-horizontal{ - height: @trigger-width; - width: 100%; - background: @trigger-background; - box-shadow: @box-shadow; - cursor: row-resize; - .@{split-prefix-cls}-trigger-bar{ - height: @trigger-bar-width; - width: 1px; - background: @trigger-bar-background; - float: left; - margin-right: @trigger-bar-interval; - } - } - } - &-horizontal{ - .@{split-prefix-cls}-trigger-con{ - top: 50%; - height: 100%; - width: 0; - } - } - &-vertical{ - .@{split-prefix-cls}-trigger-con{ - left: 50%; - height: 0; - width: 100%; - } - } - .no-select{ - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/split-pane/split.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/split-pane/split.vue deleted file mode 100644 index 409982e..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/split-pane/split.vue +++ /dev/null @@ -1,158 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/split-pane/trigger.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/split-pane/trigger.vue deleted file mode 100644 index 9abdf03..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/split-pane/trigger.vue +++ /dev/null @@ -1,43 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/tables/edit.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/tables/edit.vue deleted file mode 100644 index e1066ef..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/tables/edit.vue +++ /dev/null @@ -1,73 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/tables/handle-btns.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/tables/handle-btns.js deleted file mode 100644 index 551b2e3..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/tables/handle-btns.js +++ /dev/null @@ -1,33 +0,0 @@ -const btns = { - delete: (h, params, vm) => { - return h('Poptip', { - props: { - confirm: true, - title: '你确定要删除吗?' - }, - on: { - 'on-ok': () => { - vm.$emit('on-delete', params) - vm.$emit('input', params.tableData.filter((item, index) => index !== params.row.initRowIndex)) - } - } - }, [ - h('Button', { - props: { - type: 'text', - ghost: true - } - }, [ - h('Icon', { - props: { - type: 'md-trash', - size: 18, - color: '#000000' - } - }) - ]) - ]) - } -} - -export default btns diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/tables/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/tables/index.js deleted file mode 100644 index 4dabfab..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/tables/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import Tables from './tables.vue' -export default Tables diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/tables/index.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/tables/index.less deleted file mode 100644 index 3c352e1..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/tables/index.less +++ /dev/null @@ -1,17 +0,0 @@ -.search-con{ - padding: 10px 0; - .search{ - &-col{ - display: inline-block; - width: 200px; - } - &-input{ - display: inline-block; - width: 200px; - margin-left: 2px; - } - &-btn{ - margin-left: 2px; - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/tables/tables.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/tables/tables.vue deleted file mode 100644 index fa2c235..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/components/tables/tables.vue +++ /dev/null @@ -1,277 +0,0 @@ - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/config/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/config/index.js deleted file mode 100644 index 6739a85..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/config/index.js +++ /dev/null @@ -1,36 +0,0 @@ -export default { - /** - * @description 配置显示在浏览器标签的title - */ - title: 'iView-admin', - /** - * @description token在Cookie中存储的天数，默认1天 - */ - cookieExpires: 1, - /** - * @description 是否使用国际化，默认为false - * 如果不使用，则需要在路由中给需要在菜单中展示的路由设置meta: {title: 'xxx'} - * 用来在菜单中显示文字 - */ - useI18n: true, - /** - * @description api请求基础路径 - */ - baseUrl: { - dev: 'https://www.easy-mock.com/mock/5add9213ce4d0e69998a6f51/iview-admin/', - pro: 'https://produce.com' - }, - /** - * @description 默认打开的首页的路由name值，默认为home - */ - homeName: 'home', - /** - * @description 需要加载的插件 - */ - plugin: { - 'error-store': { - showInHeader: true, // 设为false后不会在顶部显示错误日志徽标 - developmentOff: true // 设为true后在开发环境不会收集错误信息，方便开发中排查错误 - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/directive/directives.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/directive/directives.js deleted file mode 100644 index fffd62c..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/directive/directives.js +++ /dev/null @@ -1,9 +0,0 @@ -import draggable from './module/draggable' -import clipboard from './module/clipboard' - -const directives = { - draggable, - clipboard -} - -export default directives diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/directive/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/directive/index.js deleted file mode 100644 index aa98c10..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/directive/index.js +++ /dev/null @@ -1,24 +0,0 @@ -import directive from './directives' - -const importDirective = Vue => { - /** - * 拖拽指令 v-draggable="options" - * options = { - * trigger: /这里传入作为拖拽触发器的CSS选择器/, - * body: /这里传入需要移动容器的CSS选择器/, - * recover: /拖动结束之后是否恢复到原来的位置/ - * } - */ - Vue.directive('draggable', directive.draggable) - /** - * clipboard指令 v-draggable="options" - * options = { - * value: /在输入框中使用v-model绑定的值/, - * success: /复制成功后的回调/, - * error: /复制失败后的回调/ - * } - */ - Vue.directive('clipboard', directive.clipboard) -} - -export default importDirective diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/directive/module/clipboard.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/directive/module/clipboard.js deleted file mode 100644 index 655bdf8..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/directive/module/clipboard.js +++ /dev/null @@ -1,30 +0,0 @@ -import Clipboard from 'clipboard' -export default { - bind: (el, binding) => { - const clipboard = new Clipboard(el, { - text: () => binding.value.value - }) - el.__success_callback__ = binding.value.success - el.__error_callback__ = binding.value.error - clipboard.on('success', e => { - const callback = el.__success_callback__ - callback && callback(e) - }) - clipboard.on('error', e => { - const callback = el.__error_callback__ - callback && callback(e) - }) - el.__clipboard__ = clipboard - }, - update: (el, binding) => { - el.__clipboard__.text = () => binding.value.value - el.__success_callback__ = binding.value.success - el.__error_callback__ = binding.value.error - }, - unbind: (el, binding) => { - delete el.__success_callback__ - delete el.__error_callback__ - el.__clipboard__.destroy() - delete el.__clipboard__ - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/directive/module/draggable.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/directive/module/draggable.js deleted file mode 100644 index b609e50..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/directive/module/draggable.js +++ /dev/null @@ -1,41 +0,0 @@ -import { on } from '@/libs/tools' -export default { - inserted: (el, binding, vnode) => { - let triggerDom = document.querySelector(binding.value.trigger) - triggerDom.style.cursor = 'move' - let bodyDom = document.querySelector(binding.value.body) - let pageX = 0 - let pageY = 0 - let transformX = 0 - let transformY = 0 - let canMove = false - const handleMousedown = e => { - let transform = /\(.*\)/.exec(bodyDom.style.transform) - if (transform) { - transform = transform[0].slice(1, transform[0].length - 1) - let splitxy = transform.split('px, ') - transformX = parseFloat(splitxy[0]) - transformY = parseFloat(splitxy[1].split('px')[0]) - } - pageX = e.pageX - pageY = e.pageY - canMove = true - } - const handleMousemove = e => { - let xOffset = e.pageX - pageX + transformX - let yOffset = e.pageY - pageY + transformY - if (canMove) bodyDom.style.transform = `translate(${xOffset}px, ${yOffset}px)` - } - const handleMouseup = e => { - canMove = false - } - on(triggerDom, 'mousedown', handleMousedown) - on(document, 'mousemove', handleMousemove) - on(document, 'mouseup', handleMouseup) - }, - update: (el, binding, vnode) => { - if (!binding.value.recover) return - let bodyDom = document.querySelector(binding.value.body) - bodyDom.style.transform = '' - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/index.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/index.less deleted file mode 100644 index 2f8be69..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/index.less +++ /dev/null @@ -1,5 +0,0 @@ -@import '~iview/src/styles/index.less'; - -@menu-dark-title: #001529; -@menu-dark-active-bg: #000c17; -@layout-sider-background: #001529; diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/libs/api.request.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/libs/api.request.js deleted file mode 100644 index 01cb87b..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/libs/api.request.js +++ /dev/null @@ -1,6 +0,0 @@ -import HttpRequest from '@/libs/axios' -import config from '@/config' -const baseUrl = process.env.NODE_ENV === 'development' ? config.baseUrl.dev : config.baseUrl.pro - -const axios = new HttpRequest(baseUrl) -export default axios diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/libs/axios.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/libs/axios.js deleted file mode 100644 index 4c06b4c..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/libs/axios.js +++ /dev/null @@ -1,74 +0,0 @@ -import axios from 'axios' -import store from '@/store' -// import { Spin } from 'iview' -const addErrorLog = errorInfo => { - const { statusText, status, request: { responseURL } } = errorInfo - let info = { - type: 'ajax', - code: status, - mes: statusText, - url: responseURL - } - if (!responseURL.includes('save_error_logger')) store.dispatch('addErrorLog', info) -} - -class HttpRequest { - constructor (baseUrl = baseURL) { - this.baseUrl = baseUrl - this.queue = {} - } - getInsideConfig () { - const config = { - baseURL: this.baseUrl, - headers: { - // - } - } - return config - } - destroy (url) { - delete this.queue[url] - if (!Object.keys(this.queue).length) { - // Spin.hide() - } - } - interceptors (instance, url) { - // 请求拦截 - instance.interceptors.request.use(config => { - // 添加全局的loading... - if (!Object.keys(this.queue).length) { - // Spin.show() // 不建议开启，因为界面不友好 - } - this.queue[url] = true - return config - }, error => { - return Promise.reject(error) - }) - // 响应拦截 - instance.interceptors.response.use(res => { - this.destroy(url) - const { data, status } = res - return { data, status } - }, error => { - this.destroy(url) - let errorInfo = error.response - if (!errorInfo) { - const { request: { statusText, status }, config } = JSON.parse(JSON.stringify(error)) - errorInfo = { - statusText, - status, - request: { responseURL: config.url } - } - } - addErrorLog(errorInfo) - return Promise.reject(error) - }) - } - request (options) { - const instance = axios.create() - options = Object.assign(this.getInsideConfig(), options) - this.interceptors(instance, options.url) - return instance(options) - } -} -export default HttpRequest diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/libs/excel.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/libs/excel.js deleted file mode 100644 index ba9d406..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/libs/excel.js +++ /dev/null @@ -1,113 +0,0 @@ -/* eslint-disable */ -import XLSX from 'xlsx'; - -function auto_width(ws, data){ - /*set worksheet max width per col*/ - const colWidth = data.map(row => row.map(val => { - /*if null/undefined*/ - if (val == null) { - return {'wch': 10}; - } - /*if chinese*/ - else if (val.toString().charCodeAt(0) > 255) { - return {'wch': val.toString().length * 2}; - } else { - return {'wch': val.toString().length}; - } - })) - /*start in the first row*/ - let result = colWidth[0]; - for (let i = 1; i < colWidth.length; i++) { - for (let j = 0; j < colWidth[i].length; j++) { - if (result[j]['wch'] < colWidth[i][j]['wch']) { - result[j]['wch'] = colWidth[i][j]['wch']; - } - } - } - ws['!cols'] = result; -} - -function json_to_array(key, jsonData){ - return jsonData.map(v => key.map(j => { return v[j] })); -} - -// fix data,return string -function fixdata(data) { - let o = '' - let l = 0 - const w = 10240 - for (; l < data.byteLength / w; ++l) o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w, l * w + w))) - o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w))) - return o -} - -// get head from excel file,return array -function get_header_row(sheet) { - const headers = [] - const range = XLSX.utils.decode_range(sheet['!ref']) - let C - const R = range.s.r /* start in the first row */ - for (C = range.s.c; C <= range.e.c; ++C) { /* walk every column in the range */ - var cell = sheet[XLSX.utils.encode_cell({ c: C, r: R })] /* find the cell in the first row */ - var hdr = 'UNKNOWN ' + C // <-- replace with your desired default - if (cell && cell.t) hdr = XLSX.utils.format_cell(cell) - headers.push(hdr) - } - return headers -} - -export const export_table_to_excel= (id, filename) => { - const table = document.getElementById(id); - const wb = XLSX.utils.table_to_book(table); - XLSX.writeFile(wb, filename); - - /* the second way */ - // const table = document.getElementById(id); - // const wb = XLSX.utils.book_new(); - // const ws = XLSX.utils.table_to_sheet(table); - // XLSX.utils.book_append_sheet(wb, ws, filename); - // XLSX.writeFile(wb, filename); -} - -export const export_json_to_excel = ({data, key, title, filename, autoWidth}) => { - const wb = XLSX.utils.book_new(); - data.unshift(title); - const ws = XLSX.utils.json_to_sheet(data, {header: key, skipHeader: true}); - if(autoWidth){ - const arr = json_to_array(key, data); - auto_width(ws, arr); - } - XLSX.utils.book_append_sheet(wb, ws, filename); - XLSX.writeFile(wb, filename + '.xlsx'); -} - -export const export_array_to_excel = ({key, data, title, filename, autoWidth}) => { - const wb = XLSX.utils.book_new(); - const arr = json_to_array(key, data); - arr.unshift(title); - const ws = XLSX.utils.aoa_to_sheet(arr); - if(autoWidth){ - auto_width(ws, arr); - } - XLSX.utils.book_append_sheet(wb, ws, filename); - XLSX.writeFile(wb, filename + '.xlsx'); -} - -export const read = (data, type) => { - /* if type == 'base64' must fix data first */ - // const fixedData = fixdata(data) - // const workbook = XLSX.read(btoa(fixedData), { type: 'base64' }) - const workbook = XLSX.read(data, { type: type }); - const firstSheetName = workbook.SheetNames[0]; - const worksheet = workbook.Sheets[firstSheetName]; - const header = get_header_row(worksheet); - const results = XLSX.utils.sheet_to_json(worksheet); - return {header, results}; -} - -export default { - export_table_to_excel, - export_array_to_excel, - export_json_to_excel, - read -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/libs/tools.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/libs/tools.js deleted file mode 100644 index 0ca81d6..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/libs/tools.js +++ /dev/null @@ -1,215 +0,0 @@ -export const forEach = (arr, fn) => { - if (!arr.length || !fn) return - let i = -1 - let len = arr.length - while (++i < len) { - let item = arr[i] - fn(item, i, arr) - } -} - -/** - * @param {Array} arr1 - * @param {Array} arr2 - * @description 得到两个数组的交集, 两个数组的元素为数值或字符串 - */ -export const getIntersection = (arr1, arr2) => { - let len = Math.min(arr1.length, arr2.length) - let i = -1 - let res = [] - while (++i < len) { - const item = arr2[i] - if (arr1.indexOf(item) > -1) res.push(item) - } - return res -} - -/** - * @param {Array} arr1 - * @param {Array} arr2 - * @description 得到两个数组的并集, 两个数组的元素为数值或字符串 - */ -export const getUnion = (arr1, arr2) => { - return Array.from(new Set([...arr1, ...arr2])) -} - -/** - * @param {Array} target 目标数组 - * @param {Array} arr 需要查询的数组 - * @description 判断要查询的数组是否至少有一个元素包含在目标数组中 - */ -export const hasOneOf = (targetarr, arr) => { - return targetarr.some(_ => arr.indexOf(_) > -1) -} - -/** - * @param {String|Number} value 要验证的字符串或数值 - * @param {*} validList 用来验证的列表 - */ -export function oneOf (value, validList) { - for (let i = 0; i < validList.length; i++) { - if (value === validList[i]) { - return true - } - } - return false -} - -/** - * @param {Number} timeStamp 判断时间戳格式是否是毫秒 - * @returns {Boolean} - */ -const isMillisecond = timeStamp => { - const timeStr = String(timeStamp) - return timeStr.length > 10 -} - -/** - * @param {Number} timeStamp 传入的时间戳 - * @param {Number} currentTime 当前时间时间戳 - * @returns {Boolean} 传入的时间戳是否早于当前时间戳 - */ -const isEarly = (timeStamp, currentTime) => { - return timeStamp < currentTime -} - -/** - * @param {Number} num 数值 - * @returns {String} 处理后的字符串 - * @description 如果传入的数值小于10，即位数只有1位，则在前面补充0 - */ -const getHandledValue = num => { - return num < 10 ? '0' + num : num -} - -/** - * @param {Number} timeStamp 传入的时间戳 - * @param {Number} startType 要返回的时间字符串的格式类型，传入'year'则返回年开头的完整时间 - */ -const getDate = (timeStamp, startType) => { - const d = new Date(timeStamp * 1000) - const year = d.getFullYear() - const month = getHandledValue(d.getMonth() + 1) - const date = getHandledValue(d.getDate()) - const hours = getHandledValue(d.getHours()) - const minutes = getHandledValue(d.getMinutes()) - const second = getHandledValue(d.getSeconds()) - let resStr = '' - if (startType === 'year') resStr = year + '-' + month + '-' + date + ' ' + hours + ':' + minutes + ':' + second - else resStr = month + '-' + date + ' ' + hours + ':' + minutes - return resStr -} - -/** - * @param {String|Number} timeStamp 时间戳 - * @returns {String} 相对时间字符串 - */ -export const getRelativeTime = timeStamp => { - // 判断当前传入的时间戳是秒格式还是毫秒 - const IS_MILLISECOND = isMillisecond(timeStamp) - // 如果是毫秒格式则转为秒格式 - if (IS_MILLISECOND) Math.floor(timeStamp /= 1000) - // 传入的时间戳可以是数值或字符串类型，这里统一转为数值类型 - timeStamp = Number(timeStamp) - // 获取当前时间时间戳 - const currentTime = Math.floor(Date.parse(new Date()) / 1000) - // 判断传入时间戳是否早于当前时间戳 - const IS_EARLY = isEarly(timeStamp, currentTime) - // 获取两个时间戳差值 - let diff = currentTime - timeStamp - // 如果IS_EARLY为false则差值取反 - if (!IS_EARLY) diff = -diff - let resStr = '' - const dirStr = IS_EARLY ? '前' : '后' - // 少于等于59秒 - if (diff <= 59) resStr = diff + '秒' + dirStr - // 多于59秒，少于等于59分钟59秒 - else if (diff > 59 && diff <= 3599) resStr = Math.floor(diff / 60) + '分钟' + dirStr - // 多于59分钟59秒，少于等于23小时59分钟59秒 - else if (diff > 3599 && diff <= 86399) resStr = Math.floor(diff / 3600) + '小时' + dirStr - // 多于23小时59分钟59秒，少于等于29天59分钟59秒 - else if (diff > 86399 && diff <= 2623859) resStr = Math.floor(diff / 86400) + '天' + dirStr - // 多于29天59分钟59秒，少于364天23小时59分钟59秒，且传入的时间戳早于当前 - else if (diff > 2623859 && diff <= 31567859 && IS_EARLY) resStr = getDate(timeStamp) - else resStr = getDate(timeStamp, 'year') - return resStr -} - -/** - * @returns {String} 当前浏览器名称 - */ -export const getExplorer = () => { - const ua = window.navigator.userAgent - const isExplorer = (exp) => { - return ua.indexOf(exp) > -1 - } - if (isExplorer('MSIE')) return 'IE' - else if (isExplorer('Firefox')) return 'Firefox' - else if (isExplorer('Chrome')) return 'Chrome' - else if (isExplorer('Opera')) return 'Opera' - else if (isExplorer('Safari')) return 'Safari' -} - -/** - * @description 绑定事件 on(element, event, handler) - */ -export const on = (function () { - if (document.addEventListener) { - return function (element, event, handler) { - if (element && event && handler) { - element.addEventListener(event, handler, false) - } - } - } else { - return function (element, event, handler) { - if (element && event && handler) { - element.attachEvent('on' + event, handler) - } - } - } -})() - -/** - * @description 解绑事件 off(element, event, handler) - */ -export const off = (function () { - if (document.removeEventListener) { - return function (element, event, handler) { - if (element && event) { - element.removeEventListener(event, handler, false) - } - } - } else { - return function (element, event, handler) { - if (element && event) { - element.detachEvent('on' + event, handler) - } - } - } -})() - -/** - * 判断一个对象是否存在key，如果传入第二个参数key，则是判断这个obj对象是否存在key这个属性 - * 如果没有传入key这个参数，则判断obj对象是否有键值对 - */ -export const hasKey = (obj, key) => { - if (key) return key in obj - else { - let keysArr = Object.keys(obj) - return keysArr.length - } -} - -/** - * @param {*} obj1 对象 - * @param {*} obj2 对象 - * @description 判断两个对象是否相等，这两个对象的值只能是数字或字符串 - */ -export const objEqual = (obj1, obj2) => { - const keysArr1 = Object.keys(obj1) - const keysArr2 = Object.keys(obj2) - if (keysArr1.length !== keysArr2.length) return false - else if (keysArr1.length === 0 && keysArr2.length === 0) return true - /* eslint-disable-next-line */ - else return !keysArr1.some(key => obj1[key] != obj2[key]) -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/libs/util.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/libs/util.js deleted file mode 100644 index 1457b20..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/libs/util.js +++ /dev/null @@ -1,399 +0,0 @@ -import Cookies from 'js-cookie' -// cookie保存的天数 -import config from '@/config' -import { forEach, hasOneOf, objEqual } from '@/libs/tools' -const { title, cookieExpires, useI18n } = config - -export const TOKEN_KEY = 'token' - -export const setToken = (token) => { - Cookies.set(TOKEN_KEY, token, {expires: cookieExpires || 1}) -} - -export const getToken = () => { - const token = Cookies.get(TOKEN_KEY) - if (token) return token - else return false -} - -export const hasChild = (item) => { - return item.children && item.children.length !== 0 -} - -const showThisMenuEle = (item, access) => { - if (item.meta && item.meta.access && item.meta.access.length) { - if (hasOneOf(item.meta.access, access)) return true - else return false - } else return true -} -/** - * @param {Array} list 通过路由列表得到菜单列表 - * @returns {Array} - */ -export const getMenuByRouter = (list, access) => { - let res = [] - forEach(list, item => { - if (!item.meta || (item.meta && !item.meta.hideInMenu)) { - let obj = { - icon: (item.meta && item.meta.icon) || '', - name: item.name, - meta: item.meta - } - if ((hasChild(item) || (item.meta && item.meta.showAlways)) && showThisMenuEle(item, access)) { - obj.children = getMenuByRouter(item.children, access) - } - if (item.meta && item.meta.href) obj.href = item.meta.href - if (showThisMenuEle(item, access)) res.push(obj) - } - }) - return res -} - -/** - * @param {Array} routeMetched 当前路由metched - * @returns {Array} - */ -export const getBreadCrumbList = (route, homeRoute) => { - let homeItem = { ...homeRoute, icon: homeRoute.meta.icon } - let routeMetched = route.matched - if (routeMetched.some(item => item.name === homeRoute.name)) return [homeItem] - let res = routeMetched.filter(item => { - return item.meta === undefined || !item.meta.hideInBread - }).map(item => { - let meta = {...item.meta} - if (meta.title && typeof meta.title === 'function') { - meta.__titleIsFunction__ = true - meta.title = meta.title(route) - } - let obj = { - icon: (item.meta && item.meta.icon) || '', - name: item.name, - meta: meta - } - return obj - }) - res = res.filter(item => { - return !item.meta.hideInMenu - }) - return [{...homeItem, to: homeRoute.path}, ...res] -} - -export const getRouteTitleHandled = (route) => { - let router = {...route} - let meta = {...route.meta} - let title = '' - if (meta.title) { - if (typeof meta.title === 'function') { - meta.__titleIsFunction__ = true - title = meta.title(router) - } else title = meta.title - } - meta.title = title - router.meta = meta - return router -} - -export const showTitle = (item, vm) => { - let { title, __titleIsFunction__ } = item.meta - if (!title) return - if (useI18n) { - if (title.includes('{{') && title.includes('}}') && useI18n) title = title.replace(/({{[\s\S]+?}})/, (m, str) => str.replace(/{{([\s\S]*)}}/, (m, _) => vm.$t(_.trim()))) - else if (__titleIsFunction__) title = item.meta.title - else title = vm.$t(item.name) - } else title = (item.meta && item.meta.title) || item.name - return title -} - -/** - * @description 本地存储和获取标签导航列表 - */ -export const setTagNavListInLocalstorage = list => { - localStorage.tagNaveList = JSON.stringify(list) -} -/** - * @returns {Array} 其中的每个元素只包含路由原信息中的name, path, meta三项 - */ -export const getTagNavListFromLocalstorage = () => { - const list = localStorage.tagNaveList - return list ? JSON.parse(list) : [] -} - -/** - * @param {Array} routers 路由列表数组 - * @description 用于找到路由列表中name为home的对象 - */ -export const getHomeRoute = (routers, homeName = 'home') => { - let i = -1 - let len = routers.length - let homeRoute = {} - while (++i < len) { - let item = routers[i] - if (item.children && item.children.length) { - let res = getHomeRoute(item.children, homeName) - if (res.name) return res - } else { - if (item.name === homeName) homeRoute = item - } - } - return homeRoute -} - -/** - * @param {*} list 现有标签导航列表 - * @param {*} newRoute 新添加的路由原信息对象 - * @description 如果该newRoute已经存在则不再添加 - */ -export const getNewTagList = (list, newRoute) => { - const { name, path, meta } = newRoute - let newList = [...list] - if (newList.findIndex(item => item.name === name) >= 0) return newList - else newList.push({ name, path, meta }) - return newList -} - -/** - * @param {*} access 用户权限数组，如 ['super_admin', 'admin'] - * @param {*} route 路由列表 - */ -const hasAccess = (access, route) => { - if (route.meta && route.meta.access) return hasOneOf(access, route.meta.access) - else return true -} - -/** - * 权鉴 - * @param {*} name 即将跳转的路由name - * @param {*} access 用户权限数组 - * @param {*} routes 路由列表 - * @description 用户是否可跳转到该页 - */ -export const canTurnTo = (name, access, routes) => { - const routePermissionJudge = (list) => { - return list.some(item => { - if (item.children && item.children.length) { - return routePermissionJudge(item.children) - } else if (item.name === name) { - return hasAccess(access, item) - } - }) - } - - return routePermissionJudge(routes) -} - -/** - * @param {String} url - * @description 从URL中解析参数 - */ -export const getParams = url => { - const keyValueArr = url.split('?')[1].split('&') - let paramObj = {} - keyValueArr.forEach(item => { - const keyValue = item.split('=') - paramObj[keyValue[0]] = keyValue[1] - }) - return paramObj -} - -/** - * @param {Array} list 标签列表 - * @param {String} name 当前关闭的标签的name - */ -export const getNextRoute = (list, route) => { - let res = {} - if (list.length === 2) { - res = getHomeRoute(list) - } else { - const index = list.findIndex(item => routeEqual(item, route)) - if (index === list.length - 1) res = list[list.length - 2] - else res = list[index + 1] - } - return res -} - -/** - * @param {Number} times 回调函数需要执行的次数 - * @param {Function} callback 回调函数 - */ -export const doCustomTimes = (times, callback) => { - let i = -1 - while (++i < times) { - callback(i) - } -} - -/** - * @param {Object} file 从上传组件得到的文件对象 - * @returns {Promise} resolve参数是解析后的二维数组 - * @description 从Csv文件中解析出表格，解析成二维数组 - */ -export const getArrayFromFile = (file) => { - let nameSplit = file.name.split('.') - let format = nameSplit[nameSplit.length - 1] - return new Promise((resolve, reject) => { - let reader = new FileReader() - reader.readAsText(file) // 以文本格式读取 - let arr = [] - reader.onload = function (evt) { - let data = evt.target.result // 读到的数据 - let pasteData = data.trim() - arr = pasteData.split((/[\n\u0085\u2028\u2029]|\r\n?/g)).map(row => { - return row.split('\t') - }).map(item => { - return item[0].split(',') - }) - if (format === 'csv') resolve(arr) - else reject(new Error('[Format Error]:你上传的不是Csv文件')) - } - }) -} - -/** - * @param {Array} array 表格数据二维数组 - * @returns {Object} { columns, tableData } - * @description 从二维数组中获取表头和表格数据，将第一行作为表头，用于在iView的表格中展示数据 - */ -export const getTableDataFromArray = (array) => { - let columns = [] - let tableData = [] - if (array.length > 1) { - let titles = array.shift() - columns = titles.map(item => { - return { - title: item, - key: item - } - }) - tableData = array.map(item => { - let res = {} - item.forEach((col, i) => { - res[titles[i]] = col - }) - return res - }) - } - return { - columns, - tableData - } -} - -export const findNodeUpper = (ele, tag) => { - if (ele.parentNode) { - if (ele.parentNode.tagName === tag.toUpperCase()) { - return ele.parentNode - } else { - return findNodeUpper(ele.parentNode, tag) - } - } -} - -export const findNodeUpperByClasses = (ele, classes) => { - let parentNode = ele.parentNode - if (parentNode) { - let classList = parentNode.classList - if (classList && classes.every(className => classList.contains(className))) { - return parentNode - } else { - return findNodeUpperByClasses(parentNode, classes) - } - } -} - -export const findNodeDownward = (ele, tag) => { - const tagName = tag.toUpperCase() - if (ele.childNodes.length) { - let i = -1 - let len = ele.childNodes.length - while (++i < len) { - let child = ele.childNodes[i] - if (child.tagName === tagName) return child - else return findNodeDownward(child, tag) - } - } -} - -export const showByAccess = (access, canViewAccess) => { - return hasOneOf(canViewAccess, access) -} - -/** - * @description 根据name/params/query判断两个路由对象是否相等 - * @param {*} route1 路由对象 - * @param {*} route2 路由对象 - */ -export const routeEqual = (route1, route2) => { - const params1 = route1.params || {} - const params2 = route2.params || {} - const query1 = route1.query || {} - const query2 = route2.query || {} - return (route1.name === route2.name) && objEqual(params1, params2) && objEqual(query1, query2) -} - -/** - * 判断打开的标签列表里是否已存在这个新添加的路由对象 - */ -export const routeHasExist = (tagNavList, routeItem) => { - let len = tagNavList.length - let res = false - doCustomTimes(len, (index) => { - if (routeEqual(tagNavList[index], routeItem)) res = true - }) - return res -} - -export const localSave = (key, value) => { - localStorage.setItem(key, value) -} - -export const localRead = (key) => { - return localStorage.getItem(key) || '' -} - -// scrollTop animation -export const scrollTop = (el, from = 0, to, duration = 500, endCallback) => { - if (!window.requestAnimationFrame) { - window.requestAnimationFrame = ( - window.webkitRequestAnimationFrame || - window.mozRequestAnimationFrame || - window.msRequestAnimationFrame || - function (callback) { - return window.setTimeout(callback, 1000 / 60) - } - ) - } - const difference = Math.abs(from - to) - const step = Math.ceil(difference / duration * 50) - - const scroll = (start, end, step) => { - if (start === end) { - endCallback && endCallback() - return - } - - let d = (start + step > end) ? end : start + step - if (start > end) { - d = (start - step < end) ? end : start - step - } - - if (el === window) { - window.scrollTo(d, d) - } else { - el.scrollTop = d - } - window.requestAnimationFrame(() => scroll(d, end, step)) - } - scroll(from, to, step) -} - -/** - * @description 根据当前跳转的路由设置显示在浏览器标签的title - * @param {Object} routeItem 路由对象 - * @param {Object} vm Vue实例 - */ -export const setTitle = (routeItem, vm) => { - const handledRoute = getRouteTitleHandled(routeItem) - const pageTitle = showTitle(handledRoute, vm) - const resTitle = pageTitle ? `${title} - ${pageTitle}` : title - window.document.title = resTitle -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/locale/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/locale/index.js deleted file mode 100644 index 75dc39e..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/locale/index.js +++ /dev/null @@ -1,37 +0,0 @@ -import Vue from 'vue' -import VueI18n from 'vue-i18n' -import { localRead } from '@/libs/util' -import customZhCn from './lang/zh-CN' -// import customZhTw from './lang/zh-TW' -// import customEnUs from './lang/en-US' -import zhCnLocale from 'iview/src/locale/lang/zh-CN' -// import enUsLocale from 'iview/src/locale/lang/en-US' -// import zhTwLocale from 'iview/src/locale/lang/zh-TW' - -Vue.use(VueI18n) - -// 自动根据浏览器系统语言设置语言 -const navLang = navigator.language -const localLang = (navLang === 'zh-CN' || navLang === 'en-US') ? navLang : false -let lang = localLang || localRead('local') || 'zh-CN' - -Vue.config.lang = lang - -// vue-i18n 6.x+写法 -Vue.locale = () => {} -const messages = { - 'zh-CN': Object.assign(zhCnLocale, customZhCn) - // 'zh-TW': Object.assign(zhTwLocale, customZhTw), - // 'en-US': Object.assign(enUsLocale, customEnUs) -} -const i18n = new VueI18n({ - locale: lang, - messages -}) - -export default i18n - -// vue-i18n 5.x写法 -// Vue.locale('zh-CN', Object.assign(zhCnLocale, customZhCn)) -// Vue.locale('en-US', Object.assign(zhTwLocale, customZhTw)) -// Vue.locale('zh-TW', Object.assign(enUsLocale, customEnUs)) diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/locale/lang/en-US.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/locale/lang/en-US.js deleted file mode 100644 index b7247ed..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/locale/lang/en-US.js +++ /dev/null @@ -1,32 +0,0 @@ -export default { - home: 'Home', - components: 'Components', - count_to_page: 'Count-to', - tables_page: 'Table', - split_pane_page: 'Split-pane', - markdown_page: 'Markdown-editor', - editor_page: 'Rich-Text-Editor', - icons_page: 'Custom-icon', - img_cropper_page: 'Image-editor', - update: 'Update', - doc: 'Document', - update_table_page: 'Update .CSV', - update_paste_page: 'Paste Table Data', - excel: 'Excel', - 'upload-excel': 'Upload Excel', - 'export-excel': 'Export Excel', - tools_methods_page: 'Tools Methods', - drag_list_page: 'Drag-list', - i18n_page: 'Internationalization', - modalTitle: 'Modal Title', - content: 'This is the modal box content.', - buttonText: 'Show Modal', - 'i18n-tip': 'Note: Only this page is multi-language, other pages do not add language content to the multi-language package.', - error_store_page: 'Error Collection', - error_logger_page: 'Error Logger', - query: 'Query', - params: 'Params', - cropper_page: 'Cropper', - message_page: 'Message Center', - tree_table_page: 'Tree Table' -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/locale/lang/zh-CN.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/locale/lang/zh-CN.js deleted file mode 100644 index 125b9a9..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/locale/lang/zh-CN.js +++ /dev/null @@ -1,40 +0,0 @@ -export default { - home: '首页', - components: '组件', - count_to_page: '数字渐变', - tables_page: '多功能表格', - split_pane_page: '分割窗口', - markdown_page: 'Markdown编辑器', - editor_page: '富文本编辑器', - icons_page: '自定义图标', - img_cropper_page: '图片编辑器', - update: '上传数据', - update_table_page: '上传CSV文件', - update_paste_page: '粘贴表格数据', - multilevel: '多级菜单', - directive_page: '指令', - excel: 'Excel', - 'upload-excel': '上传excel', - 'export-excel': '导出excel', - tools_methods_page: '工具函数', - drag_list_page: '拖拽列表', - i18n_page: '多语言', - modalTitle: '模态框题目', - content: '这是模态框内容', - buttonText: '显示模态框', - 'i18n-tip': '注：仅此页做了多语言，其他页面没有在多语言包中添加语言内容', - error_store_page: '错误收集', - error_logger_page: '错误日志', - query: '带参路由', - params: '动态路由', - cropper_page: '图片裁剪', - message_page: '消息中心', - tree_table_page: '树状表格', - _session: '会话管理', - _sourcepackage: '原包管理', - _transmit: '转发管理', - session: '会话管理', - sourcepackage: '原包管理', - transmit: '转发管理', - login: '登录' -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/locale/lang/zh-TW.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/locale/lang/zh-TW.js deleted file mode 100644 index 7763cd9..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/locale/lang/zh-TW.js +++ /dev/null @@ -1,33 +0,0 @@ -export default { - home: '首頁', - components: '组件', - count_to_page: '数字渐变', - tables_page: '多功能表格', - split_pane_page: '分割窗口', - markdown_page: 'Markdown編輯器', - editor_page: '富文本編輯器', - icons_page: '自定義圖標', - img_cropper_page: '圖片編輯器', - update: '上傳數據', - update_table_page: '上傳CSV文件', - update_paste_page: '粘貼表格數據', - multilevel: '多级菜单', - directive_page: '指令', - excel: 'Excel', - 'upload-excel': '上傳excel', - 'export-excel': '導出excel', - tools_methods_page: '工具函數', - drag_list_page: '拖拽列表', - i18n_page: '多語言', - modalTitle: '模態框題目', - content: '這是模態框內容', - buttonText: '顯示模態框', - 'i18n-tip': '注：僅此頁做了多語言，其他頁面沒有在多語言包中添加語言內容', - error_store_page: '錯誤收集', - error_logger_page: '錯誤日誌', - query: '帶參路由', - params: '動態路由', - cropper_page: '圖片裁剪', - message_page: '消息中心', - tree_table_page: '樹狀表格' -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/main.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/main.js deleted file mode 100644 index 37180aa..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/main.js +++ /dev/null @@ -1,47 +0,0 @@ -// The Vue build version to load with the `import` command -// (runtime-only or standalone) has been set in webpack.base.conf with an alias. -import Vue from 'vue' -import App from './App' -import router from './router' -import store from './store' -import iView from 'iview' -import i18n from '@/locale' -import config from '@/config' -import importDirective from '@/directive' -import installPlugin from '@/plugin' -import './index.less' -import '@/assets/icons/iconfont.css' -import TreeTable from 'tree-table-vue' -// 实际打包时应该不引入mock -/* eslint-disable */ -if (process.env.NODE_ENV !== 'production') require('@/mock') - -Vue.use(iView, { - i18n: (key, value) => i18n.t(key, value) -}) -Vue.use(TreeTable) -/** - * @description 注册admin内置插件 - */ -installPlugin(Vue) -/** - * @description 生产环境关掉提示 - */ -Vue.config.productionTip = false -/** - * @description 全局注册应用配置 - */ -Vue.prototype.$config = config -/** - * 注册指令 - */ -importDirective(Vue) - -/* eslint-disable no-new */ -new Vue({ - el: '#app', - router, - i18n, - store, - render: h => h(App) -}) diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/atomicCounter.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/atomicCounter.js deleted file mode 100644 index 53d103f..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/atomicCounter.js +++ /dev/null @@ -1,9 +0,0 @@ -import Mock from 'mockjs' -import { setData } from '@/mock/commonResultData' - -export const GetAtomicCounter = () => { - return setData(Mock.mock({ - 'MsgSuccessCount|1-10000000': 100, - 'MsgFailCount|1-10000000': 100 - })) -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/commonResultData.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/commonResultData.js deleted file mode 100644 index 50e076b..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/commonResultData.js +++ /dev/null @@ -1,7 +0,0 @@ -export const setData = (data, code = 200) => { - return { - 'Code': code, - 'Message': '', - 'Data': data - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/data.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/data.js deleted file mode 100644 index e0d36ae..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/data.js +++ /dev/null @@ -1,30 +0,0 @@ -import Mock from 'mockjs' -import { doCustomTimes } from '@/libs/util' -const Random = Mock.Random - -export const getTableData = req => { - let tableData = [] - doCustomTimes(5, () => { - tableData.push(Mock.mock({ - name: '@name', - email: '@email', - createTime: '@date' - })) - }) - return tableData -} - -export const getDragList = req => { - let dragList = [] - doCustomTimes(5, () => { - dragList.push(Mock.mock({ - name: Random.csentence(10, 13), - id: Random.increment(10) - })) - }) - return dragList -} - -export const uploadImage = req => { - return Promise.resolve() -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/index.js deleted file mode 100644 index e8da037..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/index.js +++ /dev/null @@ -1,47 +0,0 @@ -import Mock from 'mockjs' -import { login, logout, getUserInfo } from './login' -import { getTableData, getDragList, uploadImage } from './data' -import { getMessageInit, getContentByMsgId, hasRead, removeReaded, restoreTrash, messageCount } from './user' -import { GetAtomicCounter } from './atomicCounter' -import sourcePackage from './sourcePackage' -import session from './session' -import transmit from './transmit' -import unificationSend from './unificationSend' - -// 配置Ajax请求延时，可用来测试网络延迟大时项目中一些效果 -Mock.setup({ - timeout: 1000 -}) - -// 登录相关和获取用户信息 -Mock.mock(/\/login/, login) -Mock.mock(/\/get_info/, getUserInfo) -Mock.mock(/\/logout/, logout) -Mock.mock(/\/get_table_data/, getTableData) -Mock.mock(/\/get_drag_list/, getDragList) -Mock.mock(/\/save_error_logger/, 'success') -Mock.mock(/\/image\/upload/, uploadImage) -Mock.mock(/\/message\/init/, getMessageInit) -Mock.mock(/\/message\/content/, getContentByMsgId) -Mock.mock(/\/message\/has_read/, hasRead) -Mock.mock(/\/message\/remove_readed/, removeReaded) -Mock.mock(/\/message\/restore/, restoreTrash) -Mock.mock(/\/message\/count/, messageCount) - -Mock.mock(/\/AtomicCounter\/GetAtomicCounter/, GetAtomicCounter) - -Mock.mock(/\/SourcePackage\/Add/, sourcePackage.Add) -Mock.mock(/\/SourcePackage\/Remove/, sourcePackage.Remove) -Mock.mock(/\/SourcePackage\/GetAll/, sourcePackage.GetAll) - -Mock.mock(/\/Session\/RemoveByTerminalPhoneNo/, session.RemoveByTerminalPhoneNo) -Mock.mock(/\/Session\/RemoveByChannelId/, session.RemoveByChannelId) -Mock.mock(/\/Session\/GetAll/, session.GetAll) - -Mock.mock(/\/Transmit\/Add/, transmit.Add) -Mock.mock(/\/Transmit\/Remove/, transmit.Remove) -Mock.mock(/\/Transmit\/GetAll/, transmit.GetAll) - -Mock.mock(/\/UnificationSend\/SendText/, unificationSend.SendText) - -export default Mock diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/login.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/login.js deleted file mode 100644 index 9e84a55..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/login.js +++ /dev/null @@ -1,31 +0,0 @@ -import { getParams } from '@/libs/util' -const USER_MAP = { - super_admin: { - name: 'super_admin', - user_id: '1', - access: ['super_admin', 'admin'], - token: 'super_admin', - avator: 'https://file.iviewui.com/dist/a0e88e83800f138b94d2414621bd9704.png' - }, - admin: { - name: 'admin', - user_id: '2', - access: ['admin'], - token: 'admin', - avator: 'https://avatars0.githubusercontent.com/u/20942571?s=460&v=4' - } -} - -export const login = req => { - req = JSON.parse(req.body) - return {token: USER_MAP[req.userName].token} -} - -export const getUserInfo = req => { - const params = getParams(req.url) - return USER_MAP[params.token] -} - -export const logout = req => { - return null -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/session.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/session.js deleted file mode 100644 index 9a68057..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/session.js +++ /dev/null @@ -1,32 +0,0 @@ -import Mock from 'mockjs' -import { setData } from '@/mock/commonResultData' - -export default { - RemoveByTerminalPhoneNo () { - return setData(Mock.mock({ - 'boolean|1': true - })) - }, - RemoveByChannelId () { - return setData(Mock.mock({ - 'boolean|1': true - })) - }, - GetAll () { - return setData([{ - 'ChannelId': 'eadad24', - 'LastActiveTime': '2018-11-27 20:00:00', - 'StartTime': '2018-11-25 20:00:00', - 'TerminalPhoneNo': '123456789012', - 'WebApiPort': 828, - 'RemoteAddressIP': '127.0.0.1:11808' - }, { - 'ChannelId': 'eadad23', - 'LastActiveTime': '2018-11-27 20:00:00', - 'StartTime': '2018-11-25 20:00:00', - 'TerminalPhoneNo': '123456789013', - 'WebApiPort': 828, - 'RemoteAddressIP': '127.0.0.1:11808' - }]) - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/sourcePackage.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/sourcePackage.js deleted file mode 100644 index af7b68a..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/sourcePackage.js +++ /dev/null @@ -1,28 +0,0 @@ -import Mock from 'mockjs' -import { setData } from '@/mock/commonResultData' - -export default { - Add () { - return setData(Mock.mock({ - 'boolean|1': true - })) - }, - Remove () { - return setData(Mock.mock({ - 'boolean|1': true - })) - }, - GetAll () { - return setData([{ - 'RemoteAddress': '127.0.0.1:6665', - 'Registered': true, - 'Active': true, - 'Open': true - }, { - 'RemoteAddress': '127.0.0.1:6667', - 'Registered': true, - 'Active': true, - 'Open': true - }]) - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/transmit.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/transmit.js deleted file mode 100644 index 1e2ef03..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/transmit.js +++ /dev/null @@ -1,34 +0,0 @@ -import Mock from 'mockjs' -import { setData } from '@/mock/commonResultData' - -export default { - Add () { - return setData(Mock.mock({ - 'boolean|1': true - })) - }, - Remove () { - return setData(Mock.mock({ - 'boolean|1': true - })) - }, - GetAll () { - return setData([{ - IP: '127.0.0.1', - Port: 6667 - }, - { - IP: '127.0.0.1', - Port: 6668 - }, - { - IP: '127.0.0.1', - Port: 6669 - }, - { - IP: '127.0.0.1', - Port: 6670 - } - ]) - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/unificationSend.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/unificationSend.js deleted file mode 100644 index ab68c85..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/unificationSend.js +++ /dev/null @@ -1,10 +0,0 @@ -import Mock from 'mockjs' -import { setData } from '@/mock/commonResultData' - -export default { - SendText () { - return setData(Mock.mock({ - 'boolean|1': true - })) - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/user.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/user.js deleted file mode 100644 index 9b28641..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/mock/user.js +++ /dev/null @@ -1,55 +0,0 @@ -import Mock from 'mockjs' -import { doCustomTimes } from '@/libs/util' -const Random = Mock.Random - -export const getMessageInit = () => { - let unreadList = [] - doCustomTimes(3, () => { - unreadList.push(Mock.mock({ - title: Random.cword(10, 15), - create_time: '@date', - msg_id: Random.increment(100) - })) - }) - let readedList = [] - doCustomTimes(4, () => { - readedList.push(Mock.mock({ - title: Random.cword(10, 15), - create_time: '@date', - msg_id: Random.increment(100) - })) - }) - let trashList = [] - doCustomTimes(2, () => { - trashList.push(Mock.mock({ - title: Random.cword(10, 15), - create_time: '@date', - msg_id: Random.increment(100) - })) - }) - return { - unread: unreadList, - readed: readedList, - trash: trashList - } -} - -export const getContentByMsgId = () => { - return `
        这是消息内容，这个内容是使用富文本编辑器编辑的，所以你可以看到一些格式
  1. 你可以查看Mock返回的数据格式，和api请求的接口，来确定你的后端接口的开发
  2. 使用你的真实接口后，前端页面基本不需要修改即可满足基本需求
  3. 快来试试吧

${Random.csentence(100, 200)}

` -} - -export const hasRead = () => { - return true -} - -export const removeReaded = () => { - return true -} - -export const restoreTrash = () => { - return true -} - -export const messageCount = () => { - return 3 -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/plugin/error-store/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/plugin/error-store/index.js deleted file mode 100644 index 46b5941..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/plugin/error-store/index.js +++ /dev/null @@ -1,17 +0,0 @@ -import store from '@/store' -export default { - install (Vue, options) { - if (options.developmentOff && process.env.NODE_ENV === 'development') return - Vue.config.errorHandler = (error, vm, mes) => { - let info = { - type: 'script', - code: 0, - mes: error.message, - url: window.location.href - } - Vue.nextTick(() => { - store.dispatch('addErrorLog', info) - }) - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/plugin/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/plugin/index.js deleted file mode 100644 index c47165b..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/plugin/index.js +++ /dev/null @@ -1,9 +0,0 @@ -import config from '@/config' -const { plugin } = config - -export default (Vue) => { - for (let name in plugin) { - const value = plugin[name] - Vue.use(require(`./${name}`).default, typeof value === 'object' ? value : undefined) - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/router/before-close.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/router/before-close.js deleted file mode 100644 index 3320f1c..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/router/before-close.js +++ /dev/null @@ -1,17 +0,0 @@ -import { Modal } from 'iview' - -const beforeClose = { - before_close_normal: (resolve) => { - Modal.confirm({ - title: '确定要关闭这一页吗', - onOk: () => { - resolve(true) - }, - onCancel: () => { - resolve(false) - } - }) - } -} - -export default beforeClose diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/router/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/router/index.js deleted file mode 100644 index db0cb84..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/router/index.js +++ /dev/null @@ -1,61 +0,0 @@ -import Vue from 'vue' -import Router from 'vue-router' -import routes from './routers' -import store from '@/store' -import iView from 'iview' -import { setToken, getToken, canTurnTo, setTitle } from '@/libs/util' -import config from '@/config' -const { homeName } = config - -Vue.use(Router) -const router = new Router({ - routes, - mode: 'history' -}) -const LOGIN_PAGE_NAME = 'login' - -const turnTo = (to, access, next) => { - if (canTurnTo(to.name, access, routes)) next() // 有权限，可访问 - else next({ replace: true, name: 'error_401' }) // 无权限，重定向到401页面 -} - -router.beforeEach((to, from, next) => { - iView.LoadingBar.start() - const token = getToken() - if (!token && to.name !== LOGIN_PAGE_NAME) { - // 未登录且要跳转的页面不是登录页 - next({ - name: LOGIN_PAGE_NAME // 跳转到登录页 - }) - } else if (!token && to.name === LOGIN_PAGE_NAME) { - // 未登陆且要跳转的页面是登录页 - next() // 跳转 - } else if (token && to.name === LOGIN_PAGE_NAME) { - // 已登录且要跳转的页面是登录页 - next({ - name: homeName // 跳转到homeName页 - }) - } else { - if (store.state.user.hasGetInfo) { - turnTo(to, store.state.user.access, next) - } else { - store.dispatch('getUserInfo').then(user => { - // 拉取用户信息，通过用户权限和跳转的页面的name来判断是否有权限访问;access必须是一个数组，如：['super_admin'] ['super_admin', 'admin'] - turnTo(to, user.access, next) - }).catch(() => { - setToken('') - next({ - name: 'login' - }) - }) - } - } -}) - -router.afterEach(to => { - setTitle(to, router.app) - iView.LoadingBar.finish() - window.scrollTo(0, 0) -}) - -export default router diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/router/routers.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/router/routers.js deleted file mode 100644 index d88798d..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/router/routers.js +++ /dev/null @@ -1,194 +0,0 @@ -import Main from '@/components/main' - -/** - * iview-admin中meta除了原生参数外可配置的参数: - * meta: { - * title: { String|Number|Function } - * 显示在侧边栏、面包屑和标签栏的文字 - * 使用'{{ 多语言字段 }}'形式结合多语言使用，例子看多语言的路由配置; - * 可以传入一个回调函数，参数是当前路由对象，例子看动态路由和带参路由 - * hideInBread: (false) 设为true后此级路由将不会出现在面包屑中，示例看QQ群路由配置 - * hideInMenu: (false) 设为true后在左侧菜单不会显示该页面选项 - * notCache: (false) 设为true后页面在切换标签后不会缓存，如果需要缓存，无需设置这个字段，而且需要设置页面组件name属性和路由配置的name一致 - * access: (null) 可访问该页面的权限数组，当前路由设置的权限会影响子路由 - * icon: (-) 该页面在左侧菜单、面包屑和标签导航处显示的图标，如果是自定义图标，需要在图标名称前加下划线'_' - * beforeCloseName: (-) 设置该字段，则在关闭当前tab页时会去'@/router/before-close.js'里寻找该字段名对应的方法，作为关闭前的钩子函数 - * } - */ - -export default [ - { - path: '/login', - name: 'login', - meta: { - title: 'Login - 登录', - hideInMenu: true - }, - component: () => import('@/view/login/login.vue') - }, - { - path: '/', - name: '_home', - redirect: '/home', - component: Main, - meta: { - hideInMenu: true, - notCache: true - }, - children: [ - { - path: '/home', - name: 'home', - meta: { - hideInMenu: true, - title: '首页', - notCache: true, - icon: 'md-home' - }, - component: () => import('@/view/single-page/home') - } - ] - }, - { - path: '/message', - name: 'message', - component: Main, - meta: { - hideInBread: true, - hideInMenu: true - }, - children: [ - { - path: 'message_page', - name: 'message_page', - meta: { - icon: 'md-notifications', - title: '消息中心' - }, - component: () => import('@/view/single-page/message/index.vue') - } - ] - }, - { - path: '/_session', - name: '_session', - meta: { - hideInBread: true - }, - component: Main, - children: [ - { - path: '/session', - name: 'session', - meta: { - icon: 'ios-hammer', - title: '会话管理' - }, - component: () => import('@/view/session/session.vue') - } - ] - }, - { - path: '/_sourcePackage', - name: '_sourcePackage', - meta: { - hideInBread: true - }, - component: Main, - children: [ - { - path: '/sourcepackage', - name: 'sourcepackage', - meta: { - icon: 'ios-hammer', - title: '原包管理', - beforeCloseName: 'before_close_normal' - }, - component: () => import('@/view/sourcepackage/sourcepackage.vue') - } - ] - }, - { - path: '/_transmit', - name: '_transmit', - meta: { - hideInBread: true - }, - component: Main, - children: [ - { - path: '/transmit', - name: 'transmit', - meta: { - icon: 'ios-hammer', - title: '转发管理', - beforeCloseName: 'before_close_normal' - }, - component: () => import('@/view/transmit/transmit.vue') - } - ] - }, - { - path: '/error_store', - name: 'error_store', - meta: { - hideInBread: true - }, - component: Main, - children: [ - { - path: 'error_store_page', - name: 'error_store_page', - meta: { - icon: 'ios-bug', - title: '错误收集' - }, - component: () => import('@/view/error-store/error-store.vue') - } - ] - }, - { - path: '/error_logger', - name: 'error_logger', - meta: { - hideInBread: true, - hideInMenu: true - }, - component: Main, - children: [ - { - path: 'error_logger_page', - name: 'error_logger_page', - meta: { - icon: 'ios-bug', - title: '错误收集' - }, - component: () => import('@/view/single-page/error-logger.vue') - } - ] - }, - { - path: '/401', - name: 'error_401', - meta: { - hideInMenu: true - }, - component: () => import('@/view/error-page/401.vue') - }, - { - path: '/500', - name: 'error_500', - meta: { - hideInMenu: true - }, - component: () => import('@/view/error-page/500.vue') - }, - { - path: '*', - name: 'error_404', - meta: { - hideInMenu: true - }, - component: () => import('@/view/error-page/404.vue') - } -] diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/store/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/store/index.js deleted file mode 100644 index 2c8c77e..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/store/index.js +++ /dev/null @@ -1,23 +0,0 @@ -import Vue from 'vue' -import Vuex from 'vuex' - -import user from './module/user' -import app from './module/app' - -Vue.use(Vuex) - -export default new Vuex.Store({ - state: { - // - }, - mutations: { - // - }, - actions: { - // - }, - modules: { - user, - app - } -}) diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/store/module/app.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/store/module/app.js deleted file mode 100644 index 227c42e..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/store/module/app.js +++ /dev/null @@ -1,115 +0,0 @@ -import { - getBreadCrumbList, - setTagNavListInLocalstorage, - getMenuByRouter, - getTagNavListFromLocalstorage, - getHomeRoute, - getNextRoute, - routeHasExist, - routeEqual, - getRouteTitleHandled, - localSave, - localRead -} from '@/libs/util' -import beforeClose from '@/router/before-close' -import { saveErrorLogger } from '@/api/data' -import router from '@/router' -import routers from '@/router/routers' -import config from '@/config' -const { homeName } = config - -const closePage = (state, route) => { - const nextRoute = getNextRoute(state.tagNavList, route) - state.tagNavList = state.tagNavList.filter(item => { - return !routeEqual(item, route) - }) - router.push(nextRoute) -} - -export default { - state: { - breadCrumbList: [], - tagNavList: [], - homeRoute: {}, - local: localRead('local'), - errorList: [], - hasReadErrorPage: false - }, - getters: { - menuList: (state, getters, rootState) => getMenuByRouter(routers, rootState.user.access), - errorCount: state => state.errorList.length - }, - mutations: { - setBreadCrumb (state, route) { - state.breadCrumbList = getBreadCrumbList(route, state.homeRoute) - }, - setHomeRoute (state, routes) { - state.homeRoute = getHomeRoute(routes, homeName) - }, - setTagNavList (state, list) { - let tagList = [] - if (list) { - tagList = [...list] - } else tagList = getTagNavListFromLocalstorage() || [] - if (tagList[0] && tagList[0].name !== homeName) tagList.shift() - let homeTagIndex = tagList.findIndex(item => item.name === homeName) - if (homeTagIndex > 0) { - let homeTag = tagList.splice(homeTagIndex, 1)[0] - tagList.unshift(homeTag) - } - state.tagNavList = tagList - setTagNavListInLocalstorage([...tagList]) - }, - closeTag (state, route) { - let tag = state.tagNavList.filter(item => routeEqual(item, route)) - route = tag[0] ? tag[0] : null - if (!route) return - if (route.meta && route.meta.beforeCloseName && route.meta.beforeCloseName in beforeClose) { - new Promise(beforeClose[route.meta.beforeCloseName]).then(close => { - if (close) { - closePage(state, route) - } - }) - } else { - closePage(state, route) - } - }, - addTag (state, { route, type = 'unshift' }) { - let router = getRouteTitleHandled(route) - if (!routeHasExist(state.tagNavList, router)) { - if (type === 'push') state.tagNavList.push(router) - else { - if (router.name === homeName) state.tagNavList.unshift(router) - else state.tagNavList.splice(1, 0, router) - } - setTagNavListInLocalstorage([...state.tagNavList]) - } - }, - setLocal (state, lang) { - localSave('local', lang) - state.local = lang - }, - addError (state, error) { - state.errorList.push(error) - }, - setHasReadErrorLoggerStatus (state, status = true) { - state.hasReadErrorPage = status - } - }, - actions: { - addErrorLog ({ commit, rootState }, info) { - if (!window.location.href.includes('error_logger_page')) commit('setHasReadErrorLoggerStatus', false) - const { user: { token, userId, userName } } = rootState - let data = { - ...info, - time: Date.parse(new Date()), - token, - userId, - userName - } - saveErrorLogger(info).then(() => { - commit('addError', data) - }) - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/store/module/user.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/store/module/user.js deleted file mode 100644 index e1aa311..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/store/module/user.js +++ /dev/null @@ -1,217 +0,0 @@ -import { - login, - logout, - getUserInfo, - getMessage, - getContentByMsgId, - hasRead, - removeReaded, - restoreTrash, - getUnreadCount -} from '@/api/user' -import { setToken, getToken } from '@/libs/util' - -export default { - state: { - userName: '', - userId: '', - avatorImgPath: '', - token: getToken(), - access: '', - hasGetInfo: false, - unreadCount: 0, - messageUnreadList: [], - messageReadedList: [], - messageTrashList: [], - messageContentStore: {} - }, - mutations: { - setAvator (state, avatorPath) { - state.avatorImgPath = avatorPath - }, - setUserId (state, id) { - state.userId = id - }, - setUserName (state, name) { - state.userName = name - }, - setAccess (state, access) { - state.access = access - }, - setToken (state, token) { - state.token = token - setToken(token) - }, - setHasGetInfo (state, status) { - state.hasGetInfo = status - }, - setMessageCount (state, count) { - state.unreadCount = count - }, - setMessageUnreadList (state, list) { - state.messageUnreadList = list - }, - setMessageReadedList (state, list) { - state.messageReadedList = list - }, - setMessageTrashList (state, list) { - state.messageTrashList = list - }, - updateMessageContentStore (state, { msg_id, content }) { - state.messageContentStore[msg_id] = content - }, - moveMsg (state, { from, to, msg_id }) { - const index = state[from].findIndex(_ => _.msg_id === msg_id) - const msgItem = state[from].splice(index, 1)[0] - msgItem.loading = false - state[to].unshift(msgItem) - } - }, - getters: { - messageUnreadCount: state => state.messageUnreadList.length, - messageReadedCount: state => state.messageReadedList.length, - messageTrashCount: state => state.messageTrashList.length - }, - actions: { - // 登录 - handleLogin ({ commit }, {userName, password}) { - userName = userName.trim() - return new Promise((resolve, reject) => { - login({ - userName, - password - }).then(res => { - const data = res.data - commit('setToken', data.token) - resolve() - }).catch(err => { - reject(err) - }) - }) - }, - // 退出登录 - handleLogOut ({ state, commit }) { - return new Promise((resolve, reject) => { - logout(state.token).then(() => { - commit('setToken', '') - commit('setAccess', []) - resolve() - }).catch(err => { - reject(err) - }) - // 如果你的退出登录无需请求接口，则可以直接使用下面三行代码而无需使用logout调用接口 - // commit('setToken', '') - // commit('setAccess', []) - // resolve() - }) - }, - // 获取用户相关信息 - getUserInfo ({ state, commit }) { - return new Promise((resolve, reject) => { - try { - getUserInfo(state.token).then(res => { - const data = res.data - commit('setAvator', data.avator) - commit('setUserName', data.name) - commit('setUserId', data.user_id) - commit('setAccess', data.access) - commit('setHasGetInfo', true) - resolve(data) - }).catch(err => { - reject(err) - }) - } catch (error) { - reject(error) - } - }) - }, - // 此方法用来获取未读消息条数，接口只返回数值，不返回消息列表 - getUnreadMessageCount ({ state, commit }) { - getUnreadCount().then(res => { - const { data } = res - commit('setMessageCount', data) - }) - }, - // 获取消息列表，其中包含未读、已读、回收站三个列表 - getMessageList ({ state, commit }) { - return new Promise((resolve, reject) => { - getMessage().then(res => { - const { unread, readed, trash } = res.data - commit('setMessageUnreadList', unread.sort((a, b) => new Date(b.create_time) - new Date(a.create_time))) - commit('setMessageReadedList', readed.map(_ => { - _.loading = false - return _ - }).sort((a, b) => new Date(b.create_time) - new Date(a.create_time))) - commit('setMessageTrashList', trash.map(_ => { - _.loading = false - return _ - }).sort((a, b) => new Date(b.create_time) - new Date(a.create_time))) - resolve() - }).catch(error => { - reject(error) - }) - }) - }, - // 根据当前点击的消息的id获取内容 - getContentByMsgId ({ state, commit }, { msg_id }) { - return new Promise((resolve, reject) => { - let contentItem = state.messageContentStore[msg_id] - if (contentItem) { - resolve(contentItem) - } else { - getContentByMsgId(msg_id).then(res => { - const content = res.data - commit('updateMessageContentStore', { msg_id, content }) - resolve(content) - }) - } - }) - }, - // 把一个未读消息标记为已读 - hasRead ({ state, commit }, { msg_id }) { - return new Promise((resolve, reject) => { - hasRead(msg_id).then(() => { - commit('moveMsg', { - from: 'messageUnreadList', - to: 'messageReadedList', - msg_id - }) - commit('setMessageCount', state.unreadCount - 1) - resolve() - }).catch(error => { - reject(error) - }) - }) - }, - // 删除一个已读消息到回收站 - removeReaded ({ commit }, { msg_id }) { - return new Promise((resolve, reject) => { - removeReaded(msg_id).then(() => { - commit('moveMsg', { - from: 'messageReadedList', - to: 'messageTrashList', - msg_id - }) - resolve() - }).catch(error => { - reject(error) - }) - }) - }, - // 还原一个已删除消息到已读消息 - restoreTrash ({ commit }, { msg_id }) { - return new Promise((resolve, reject) => { - restoreTrash(msg_id).then(() => { - commit('moveMsg', { - from: 'messageTrashList', - to: 'messageReadedList', - msg_id - }) - resolve() - }).catch(error => { - reject(error) - }) - }) - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/charts/bar.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/charts/bar.vue deleted file mode 100644 index b0a2709..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/charts/bar.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/charts/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/charts/index.js deleted file mode 100644 index 2ca3c91..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/charts/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import ChartPie from './pie.vue' -import ChartBar from './bar.vue' -export { ChartPie, ChartBar } diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/charts/pie.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/charts/pie.vue deleted file mode 100644 index c86d68c..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/charts/pie.vue +++ /dev/null @@ -1,70 +0,0 @@ - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/common-icon/common-icon.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/common-icon/common-icon.vue deleted file mode 100644 index 768fa1b..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/common-icon/common-icon.vue +++ /dev/null @@ -1,42 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/common-icon/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/common-icon/index.js deleted file mode 100644 index 1207d15..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/common-icon/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import CommonIcon from './common-icon.vue' -export default CommonIcon diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/common/common.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/common/common.less deleted file mode 100644 index 3c3e5b1..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/common/common.less +++ /dev/null @@ -1,8 +0,0 @@ -.no-select{ - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/common/util.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/common/util.js deleted file mode 100644 index 2129e7a..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/common/util.js +++ /dev/null @@ -1,3 +0,0 @@ -export const showTitle = (item, vm) => { - return vm.$config.useI18n ? vm.$t(item.name) : ((item.meta && item.meta.title) || item.name) -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/count-to/count-to.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/count-to/count-to.vue deleted file mode 100644 index a10e3ff..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/count-to/count-to.vue +++ /dev/null @@ -1,174 +0,0 @@ - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/count-to/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/count-to/index.js deleted file mode 100644 index 17b3332..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/count-to/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import countTo from './count-to.vue' -export default countTo diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/count-to/index.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/count-to/index.less deleted file mode 100644 index e17d7c6..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/count-to/index.less +++ /dev/null @@ -1,10 +0,0 @@ -@prefix: ~"count-to"; - -.@{prefix}-wrapper{ - .content-outer{ - display: inline-block; - .@{prefix}-unit-text{ - font-style: normal; - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/cropper/cropper.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/cropper/cropper.vue deleted file mode 100644 index 6b7c3a6..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/cropper/cropper.vue +++ /dev/null @@ -1,48 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/cropper/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/cropper/index.js deleted file mode 100644 index e7db5ea..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/cropper/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import Cropper from './index.vue' -export default Cropper diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/cropper/index.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/cropper/index.less deleted file mode 100644 index cdf431d..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/cropper/index.less +++ /dev/null @@ -1,35 +0,0 @@ -.bg{ - background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAAA3NCSVQICAjb4U/gAAAABlBMVEXMzMz////TjRV2AAAACXBIWXMAAArrAAAK6wGCiw1aAAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAABFJREFUCJlj+M/AgBVhF/0PAH6/D/HkDxOGAAAAAElFTkSuQmCC") -} -.cropper-wrapper{ - width: 600px; - height: 340px; - .img-box{ - height: 340px; - width: 430px; - border: 1px solid #ebebeb; - display: inline-block; - .bg; - img{ - max-width: 100%; - display: block; - } - } - .right-con{ - display: inline-block; - width: 170px; - vertical-align: top; - box-sizing: border-box; - padding: 0 10px; - .preview-box{ - height: 150px !important; - width: 100% !important; - overflow: hidden; - border: 1px solid #ebebeb; - .bg; - } - .button-box{ - padding: 10px 0 0; - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/cropper/index.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/cropper/index.vue deleted file mode 100644 index 7bb664f..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/cropper/index.vue +++ /dev/null @@ -1,139 +0,0 @@ - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/icons/icons.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/icons/icons.vue deleted file mode 100644 index 50b7183..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/icons/icons.vue +++ /dev/null @@ -1,35 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/icons/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/icons/index.js deleted file mode 100644 index bdc38b2..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/icons/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import Icons from './icons.vue' -export default Icons diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/info-card/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/info-card/index.js deleted file mode 100644 index 354419b..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/info-card/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import InforCard from './infor-card.vue' -export default InforCard diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/info-card/infor-card.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/info-card/infor-card.vue deleted file mode 100644 index 6240d0e..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/info-card/infor-card.vue +++ /dev/null @@ -1,94 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/login-form/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/login-form/index.js deleted file mode 100644 index d480c28..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/login-form/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import LoginForm from './login-form.vue' -export default LoginForm diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/login-form/login-form.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/login-form/login-form.vue deleted file mode 100644 index 497c08c..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/login-form/login-form.vue +++ /dev/null @@ -1,72 +0,0 @@ - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/a-back-top/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/a-back-top/index.js deleted file mode 100644 index 4da0014..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/a-back-top/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import ABackTop from './index.vue' -export default ABackTop diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/a-back-top/index.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/a-back-top/index.vue deleted file mode 100644 index f26f95c..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/a-back-top/index.vue +++ /dev/null @@ -1,90 +0,0 @@ - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/error-store/error-store.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/error-store/error-store.vue deleted file mode 100644 index 9941677..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/error-store/error-store.vue +++ /dev/null @@ -1,49 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/error-store/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/error-store/index.js deleted file mode 100644 index a777df1..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/error-store/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import ErrorStore from './error-store.vue' -export default ErrorStore diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/fullscreen/fullscreen.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/fullscreen/fullscreen.vue deleted file mode 100644 index d5213fa..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/fullscreen/fullscreen.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/fullscreen/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/fullscreen/index.js deleted file mode 100644 index 422c7c1..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/fullscreen/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import Fullscreen from './fullscreen.vue' -export default Fullscreen diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.less deleted file mode 100644 index 1ace1eb..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.less +++ /dev/null @@ -1,4 +0,0 @@ -.custom-bread-crumb{ - display: inline-block; - vertical-align: top; -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue deleted file mode 100644 index 51b121d..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue +++ /dev/null @@ -1,46 +0,0 @@ - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/custom-bread-crumb/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/custom-bread-crumb/index.js deleted file mode 100644 index a590fe0..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/custom-bread-crumb/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import customBreadCrumb from './custom-bread-crumb.vue' -export default customBreadCrumb diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/header-bar.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/header-bar.less deleted file mode 100644 index c245d19..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/header-bar.less +++ /dev/null @@ -1,14 +0,0 @@ -.header-bar{ - width: 100%; - height: 100%; - position: relative; - .custom-content-con{ - float: right; - height: auto; - padding-right: 20px; - line-height: 64px; - & > *{ - float: right; - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/header-bar.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/header-bar.vue deleted file mode 100644 index 1452146..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/header-bar.vue +++ /dev/null @@ -1,34 +0,0 @@ - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/index.js deleted file mode 100644 index 3d4a170..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import HeaderBar from './header-bar' -export default HeaderBar diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/sider-trigger/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/sider-trigger/index.js deleted file mode 100644 index 15853f4..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/sider-trigger/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import siderTrigger from './sider-trigger.vue' -export default siderTrigger diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/sider-trigger/sider-trigger.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/sider-trigger/sider-trigger.less deleted file mode 100644 index eb50999..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/sider-trigger/sider-trigger.less +++ /dev/null @@ -1,21 +0,0 @@ -.trans{ - transition: transform .2s ease; -} -@size: 40px; -.sider-trigger-a{ - padding: 6px; - width: @size; - height: @size; - display: inline-block; - text-align: center; - color: #5c6b77; - margin-top: 12px; - i{ - .trans; - vertical-align: top; - } - &.collapsed i{ - transform: rotateZ(90deg); - .trans; - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/sider-trigger/sider-trigger.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/sider-trigger/sider-trigger.vue deleted file mode 100644 index 200e18f..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/header-bar/sider-trigger/sider-trigger.vue +++ /dev/null @@ -1,27 +0,0 @@ - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/language/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/language/index.js deleted file mode 100644 index de2a90a..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/language/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import Language from './language.vue' -export default Language diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/language/language.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/language/language.vue deleted file mode 100644 index b1d92ec..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/language/language.vue +++ /dev/null @@ -1,51 +0,0 @@ - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/side-menu/collapsed-menu.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/side-menu/collapsed-menu.vue deleted file mode 100644 index 73ac93e..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/side-menu/collapsed-menu.vue +++ /dev/null @@ -1,51 +0,0 @@ - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/side-menu/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/side-menu/index.js deleted file mode 100644 index 5b36868..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/side-menu/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import SideMenu from './side-menu.vue' -export default SideMenu diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/side-menu/item-mixin.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/side-menu/item-mixin.js deleted file mode 100644 index 8b807af..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/side-menu/item-mixin.js +++ /dev/null @@ -1,21 +0,0 @@ -export default { - props: { - parentItem: { - type: Object, - default: () => {} - }, - theme: String, - iconSize: Number - }, - computed: { - parentName () { - return this.parentItem.name - }, - children () { - return this.parentItem.children - }, - textColor () { - return this.theme === 'dark' ? '#fff' : '#495060' - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/side-menu/mixin.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/side-menu/mixin.js deleted file mode 100644 index 21b618b..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/side-menu/mixin.js +++ /dev/null @@ -1,18 +0,0 @@ -import CommonIcon from '_c/common-icon' -import { showTitle } from '@/libs/util' -export default { - components: { - CommonIcon - }, - methods: { - showTitle (item) { - return showTitle(item, this) - }, - showChildren (item) { - return item.children && (item.children.length > 1 || (item.meta && item.meta.showAlways)) - }, - getNameOrHref (item, children0) { - return item.href ? `isTurnByHref_${item.href}` : (children0 ? item.children[0].name : item.name) - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/side-menu/side-menu-item.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/side-menu/side-menu-item.vue deleted file mode 100644 index 12338a6..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/side-menu/side-menu-item.vue +++ /dev/null @@ -1,26 +0,0 @@ - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/side-menu/side-menu.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/side-menu/side-menu.less deleted file mode 100644 index 4716d82..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/side-menu/side-menu.less +++ /dev/null @@ -1,40 +0,0 @@ -.side-menu-wrapper{ - user-select: none; - .menu-collapsed{ - padding-top: 10px; - - .ivu-dropdown{ - width: 100%; - .ivu-dropdown-rel a{ - width: 100%; - } - } - .ivu-tooltip{ - width: 100%; - .ivu-tooltip-rel{ - width: 100%; - } - .ivu-tooltip-popper .ivu-tooltip-content{ - .ivu-tooltip-arrow{ - border-right-color: #fff; - } - .ivu-tooltip-inner{ - background: #fff; - color: #495060; - } - } - } - - - } - a.drop-menu-a{ - display: inline-block; - padding: 6px 15px; - width: 100%; - text-align: center; - color: #495060; - } -} -.menu-title{ - padding-left: 6px; -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/side-menu/side-menu.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/side-menu/side-menu.vue deleted file mode 100644 index ee18e86..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/side-menu/side-menu.vue +++ /dev/null @@ -1,114 +0,0 @@ - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/tags-nav/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/tags-nav/index.js deleted file mode 100644 index 585792a..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/tags-nav/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import TagsNav from './tags-nav.vue' -export default TagsNav diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/tags-nav/tags-nav.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/tags-nav/tags-nav.less deleted file mode 100644 index a4c8c5d..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/tags-nav/tags-nav.less +++ /dev/null @@ -1,87 +0,0 @@ -.no-select{ - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} -.size{ - width: 100%; - height: 100%; -} -.tags-nav{ - position: relative; - border-top: 1px solid #F0F0F0; - border-bottom: 1px solid #F0F0F0; - .no-select; - .size; - .close-con{ - position: absolute; - right: 0; - top: 0; - height: 100%; - width: 32px; - background: #fff; - text-align: center; - z-index: 10; - } - .btn-con{ - position: absolute; - top: 0px; - height: 100%; - background: #fff; - padding-top: 3px; - z-index: 10; - button{ - padding: 6px 4px; - line-height: 14px; - text-align: center; - } - &.left-btn{ - left: 0px; - } - &.right-btn{ - right: 32px; - border-right: 1px solid #F0F0F0; - } - } - .scroll-outer{ - position: absolute; - left: 28px; - right: 61px; - top: 0; - bottom: 0; - box-shadow: 0px 0 3px 2px rgba(100,100,100,.1) inset; - .scroll-body{ - height: ~"calc(100% - 1px)"; - display: inline-block; - padding: 1px 4px 0; - position: absolute; - overflow: visible; - white-space: nowrap; - transition: left .3s ease; - .ivu-tag-dot-inner{ - transition: background .2s ease; - } - } - } - .contextmenu { - position: absolute; - margin: 0; - padding: 5px 0; - background: #fff; - z-index: 100; - list-style-type: none; - border-radius: 4px; - box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3); - li { - margin: 0; - padding: 5px 15px; - cursor: pointer; - &:hover { - background: #eee; - } - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/tags-nav/tags-nav.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/tags-nav/tags-nav.vue deleted file mode 100644 index 2dbca44..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/tags-nav/tags-nav.vue +++ /dev/null @@ -1,209 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/user/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/user/index.js deleted file mode 100644 index 3d04a5c..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/user/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import User from './user.vue' -export default User diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/user/user.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/user/user.less deleted file mode 100644 index a3c95af..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/user/user.less +++ /dev/null @@ -1,12 +0,0 @@ -.user{ - &-avator-dropdown{ - cursor: pointer; - display: inline-block; - // height: 64px; - vertical-align: middle; - // line-height: 64px; - .ivu-badge-dot{ - top: 16px; - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/user/user.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/user/user.vue deleted file mode 100644 index 3d4689d..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/components/user/user.vue +++ /dev/null @@ -1,59 +0,0 @@ - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/index.js deleted file mode 100644 index 7df2a08..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import Main from './main.vue' -export default Main diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/main.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/main.less deleted file mode 100644 index fd0cd41..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/main.less +++ /dev/null @@ -1,75 +0,0 @@ -.main{ - .logo-con{ - height: 64px; - padding: 10px; - img{ - height: 44px; - width: auto; - display: block; - margin: 0 auto; - } - } - .header-con{ - background: #fff; - padding: 0 20px; - width: 100%; - } - .main-layout-con{ - height: 100%; - overflow: hidden; - } - .main-content-con{ - height: ~"calc(100% - 60px)"; - overflow: hidden; - } - .tag-nav-wrapper{ - padding: 0; - height:40px; - background:#F0F0F0; - } - .content-wrapper{ - padding: 18px; - height: ~"calc(100% - 80px)"; - overflow: auto; - } - .left-sider{ - .ivu-layout-sider-children{ - overflow-y: scroll; - margin-right: -18px; - } - } -} -.ivu-menu-item > i{ - margin-right: 12px !important; -} -.ivu-menu-submenu > .ivu-menu > .ivu-menu-item > i { - margin-right: 8px !important; -} -.collased-menu-dropdown{ - width: 100%; - margin: 0; - line-height: normal; - padding: 7px 0 6px 16px; - clear: both; - font-size: 12px !important; - white-space: nowrap; - list-style: none; - cursor: pointer; - transition: background 0.2s ease-in-out; - &:hover{ - background: rgba(100, 100, 100, 0.1); - } - & * { - color: #515a6e; - } - .ivu-menu-item > i{ - margin-right: 12px !important; - } - .ivu-menu-submenu > .ivu-menu > .ivu-menu-item > i { - margin-right: 8px !important; - } -} - -.ivu-select-dropdown.ivu-dropdown-transfer{ - max-height: 400px; -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/main.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/main.vue deleted file mode 100644 index 3c1603f..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/main/main.vue +++ /dev/null @@ -1,183 +0,0 @@ - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/parent-view/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/parent-view/index.js deleted file mode 100644 index a959c65..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/parent-view/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import ParentView from './parent-view.vue' -export default ParentView diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/parent-view/parent-view.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/parent-view/parent-view.vue deleted file mode 100644 index 84259f3..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/parent-view/parent-view.vue +++ /dev/null @@ -1,20 +0,0 @@ - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/split-pane/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/split-pane/index.js deleted file mode 100644 index f5ed60e..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/split-pane/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import Split from './split.vue' -export default Split diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/split-pane/index.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/split-pane/index.less deleted file mode 100644 index 2583d90..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/split-pane/index.less +++ /dev/null @@ -1,114 +0,0 @@ -@split-prefix-cls: ~"ivu-split"; -@box-shadow: 0 0 4px 0 rgba(28, 36, 56, 0.4); -@trigger-bar-background: rgba(23, 35, 61, 0.25); -@trigger-background: #F8F8F9; -@trigger-width: 6px; -@trigger-bar-width: 4px; -@trigger-bar-offset: (@trigger-width - @trigger-bar-width) / 2; -@trigger-bar-interval: 3px; -@trigger-bar-weight: 1px; -@trigger-bar-con-height: (@trigger-bar-weight + @trigger-bar-interval) * 8; - -.@{split-prefix-cls}{ - &-wrapper{ - position: relative; - width: 100%; - height: 100%; - } - &-pane{ - position: absolute; - &.left-pane, &.right-pane{ - top: 0px; - bottom: 0px; - } - &.left-pane{ - left: 0px; - } - &.right-pane{ - right: 0px; - } - &.top-pane, &.bottom-pane{ - left: 0px; - right: 0px; - } - &.top-pane{ - top: 0px; - } - &.bottom-pane{ - bottom: 0px; - } - } - &-trigger{ - &-con{ - position: absolute; - transform: translate(-50%, -50%); - z-index: 10; - } - &-bar-con{ - position: absolute; - overflow: hidden; - &.vertical{ - left: @trigger-bar-offset; - top: 50%; - height: @trigger-bar-con-height; - transform: translate(0, -50%); - } - &.horizontal{ - left: 50%; - top: @trigger-bar-offset; - width: @trigger-bar-con-height; - transform: translate(-50%, 0); - } - } - &-vertical{ - width: @trigger-width; - height: 100%; - background: @trigger-background; - box-shadow: @box-shadow; - cursor: col-resize; - .@{split-prefix-cls}-trigger-bar{ - width: @trigger-bar-width; - height: 1px; - background: @trigger-bar-background; - float: left; - margin-top: @trigger-bar-interval; - } - } - &-horizontal{ - height: @trigger-width; - width: 100%; - background: @trigger-background; - box-shadow: @box-shadow; - cursor: row-resize; - .@{split-prefix-cls}-trigger-bar{ - height: @trigger-bar-width; - width: 1px; - background: @trigger-bar-background; - float: left; - margin-right: @trigger-bar-interval; - } - } - } - &-horizontal{ - .@{split-prefix-cls}-trigger-con{ - top: 50%; - height: 100%; - width: 0; - } - } - &-vertical{ - .@{split-prefix-cls}-trigger-con{ - left: 50%; - height: 0; - width: 100%; - } - } - .no-select{ - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/split-pane/split-pane.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/split-pane/split-pane.vue deleted file mode 100644 index 9afe011..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/split-pane/split-pane.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/split-pane/split.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/split-pane/split.vue deleted file mode 100644 index 409982e..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/split-pane/split.vue +++ /dev/null @@ -1,158 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/split-pane/trigger.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/split-pane/trigger.vue deleted file mode 100644 index 9abdf03..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/split-pane/trigger.vue +++ /dev/null @@ -1,43 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/tables/edit.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/tables/edit.vue deleted file mode 100644 index e1066ef..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/tables/edit.vue +++ /dev/null @@ -1,73 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/tables/handle-btns.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/tables/handle-btns.js deleted file mode 100644 index 551b2e3..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/tables/handle-btns.js +++ /dev/null @@ -1,33 +0,0 @@ -const btns = { - delete: (h, params, vm) => { - return h('Poptip', { - props: { - confirm: true, - title: '你确定要删除吗?' - }, - on: { - 'on-ok': () => { - vm.$emit('on-delete', params) - vm.$emit('input', params.tableData.filter((item, index) => index !== params.row.initRowIndex)) - } - } - }, [ - h('Button', { - props: { - type: 'text', - ghost: true - } - }, [ - h('Icon', { - props: { - type: 'md-trash', - size: 18, - color: '#000000' - } - }) - ]) - ]) - } -} - -export default btns diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/tables/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/tables/index.js deleted file mode 100644 index 4dabfab..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/tables/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import Tables from './tables.vue' -export default Tables diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/tables/index.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/tables/index.less deleted file mode 100644 index 3c352e1..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/tables/index.less +++ /dev/null @@ -1,17 +0,0 @@ -.search-con{ - padding: 10px 0; - .search{ - &-col{ - display: inline-block; - width: 200px; - } - &-input{ - display: inline-block; - width: 200px; - margin-left: 2px; - } - &-btn{ - margin-left: 2px; - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/tables/tables.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/tables/tables.vue deleted file mode 100644 index fa2c235..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/tables/tables.vue +++ /dev/null @@ -1,277 +0,0 @@ - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/tree-table/index.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/tree-table/index.vue deleted file mode 100644 index 6af71d1..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/components/tree-table/index.vue +++ /dev/null @@ -1,194 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/error-page/401.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/error-page/401.vue deleted file mode 100644 index 1032326..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/error-page/401.vue +++ /dev/null @@ -1,19 +0,0 @@ - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/error-page/404.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/error-page/404.vue deleted file mode 100644 index 473df42..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/error-page/404.vue +++ /dev/null @@ -1,19 +0,0 @@ - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/error-page/500.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/error-page/500.vue deleted file mode 100644 index 6a885da..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/error-page/500.vue +++ /dev/null @@ -1,19 +0,0 @@ - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/error-page/back-btn-group.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/error-page/back-btn-group.vue deleted file mode 100644 index 4bbda48..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/error-page/back-btn-group.vue +++ /dev/null @@ -1,38 +0,0 @@ - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/error-page/error-content.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/error-page/error-content.vue deleted file mode 100644 index 3c9a0f4..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/error-page/error-content.vue +++ /dev/null @@ -1,28 +0,0 @@ - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/error-page/error.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/error-page/error.less deleted file mode 100644 index 6380245..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/error-page/error.less +++ /dev/null @@ -1,46 +0,0 @@ -.error-page{ - width: 100%; - height: 100%; - position: relative; - background: #f8f8f9; - .content-con{ - width: 700px; - height: 600px; - position: absolute; - left: 50%; - top: 50%; - transform: translate(-50%, -60%); - img{ - display: block; - width: 100%; - height: 100%; - } - .text-con{ - position: absolute; - left: 0px; - top: 0px; - h4{ - position: absolute; - left: 0px; - top: 0px; - font-size: 80px; - font-weight: 700; - color: #348EED; - } - h5{ - position: absolute; - width: 700px; - left: 0px; - top: 100px; - font-size: 20px; - font-weight: 700; - color: #67647D; - } - } - .back-btn-group{ - position: absolute; - right: 0px; - bottom: 20px; - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/error-store/error-store.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/error-store/error-store.vue deleted file mode 100644 index e66631c..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/error-store/error-store.vue +++ /dev/null @@ -1,39 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/login/login.less b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/login/login.less deleted file mode 100644 index e986ed4..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/login/login.less +++ /dev/null @@ -1,29 +0,0 @@ -.login{ - width: 100%; - height: 100%; - background-image: url('../../assets/images/login-bg.jpg'); - background-size: cover; - background-position: center; - position: relative; - &-con{ - position: absolute; - right: 160px; - top: 50%; - transform: translateY(-60%); - width: 300px; - &-header{ - font-size: 16px; - font-weight: 300; - text-align: center; - padding: 30px 0; - } - .form-con{ - padding: 10px 0 0; - } - .login-tip{ - font-size: 10px; - text-align: center; - color: #c3c3c3; - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/login/login.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/login/login.vue deleted file mode 100644 index 7595e01..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/login/login.vue +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/session/session.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/session/session.vue deleted file mode 100644 index d0dab4a..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/session/session.vue +++ /dev/null @@ -1,90 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/single-page/error-logger.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/single-page/error-logger.vue deleted file mode 100644 index a4b4ac2..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/single-page/error-logger.vue +++ /dev/null @@ -1,91 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/single-page/home/home.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/single-page/home/home.vue deleted file mode 100644 index d504c9b..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/single-page/home/home.vue +++ /dev/null @@ -1,61 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/single-page/home/index.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/single-page/home/index.js deleted file mode 100644 index de4ced1..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/single-page/home/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import home from './home.vue' -export default home diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/single-page/message/index.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/single-page/message/index.vue deleted file mode 100644 index 11b43f9..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/single-page/message/index.vue +++ /dev/null @@ -1,194 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/sourcepackage/sourcepackage.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/sourcepackage/sourcepackage.vue deleted file mode 100644 index d2eb82b..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/sourcepackage/sourcepackage.vue +++ /dev/null @@ -1,97 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/transmit/transmit.vue b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/transmit/transmit.vue deleted file mode 100644 index a7c9641..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/src/view/transmit/transmit.vue +++ /dev/null @@ -1,86 +0,0 @@ - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/vue.config.js b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/vue.config.js deleted file mode 100644 index 5d6c1d4..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord.UI/vue.config.js +++ /dev/null @@ -1,43 +0,0 @@ -const path = require('path') - -const resolve = dir => { - return path.join(__dirname, dir) -} - -// 项目部署基础 -// 默认情况下，我们假设你的应用将被部署在域的根目录下, -// 例如：https://www.my-app.com/ -// 默认：'/' -// 如果您的应用程序部署在子路径中，则需要在这指定子路径 -// 例如：https://www.foobar.com/my-app/ -// 需要将它改为'/my-app/' -// iview-admin线上演示打包路径： https://file.iviewui.com/admin-dist/ -const BASE_URL = process.env.NODE_ENV === 'production' - ? '/' - : '/' - -module.exports = { - // Project deployment base - // By default we assume your app will be deployed at the root of a domain, - // e.g. https://www.my-app.com/ - // If your app is deployed at a sub-path, you will need to specify that - // sub-path here. For example, if your app is deployed at - // https://www.foobar.com/my-app/ - // then change this to '/my-app/' - baseUrl: BASE_URL, - // tweak internal webpack configuration. - // see https://github.com/vuejs/vue-cli/blob/dev/docs/webpack.md - // 如果你不需要使用eslint，把lintOnSave设为false即可 - lintOnSave: true, - chainWebpack: config => { - config.resolve.alias - .set('@', resolve('src')) // key,value自行定义，比如.set('@@', resolve('src/components')) - .set('_c', resolve('src/components')) - }, - // 设为false打包时不生成.map文件 - productionSourceMap: false - // 这里写你调用接口的基础路径，来解决跨域，如果设置了代理，那你本地开发环境的axios的baseUrl要写为 '' ，即空字符串 - // devServer: { - // proxy: 'localhost:3000' - // } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Configurations/JT808Options.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Configurations/JT808Options.cs deleted file mode 100644 index 0a67c19..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Configurations/JT808Options.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace JT808.DotNetty.Dashbord.Configurations -{ - public class JT808Options - { - /// - /// 接口服务地址 - /// - public List WebApiHosts { get; set; } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Controllers/JT808AtomicCounterController.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Controllers/JT808AtomicCounterController.cs deleted file mode 100644 index 4204d34..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Controllers/JT808AtomicCounterController.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using JT808.DotNetty.Abstractions.Dtos; -using Microsoft.AspNetCore.Mvc; - -namespace JT808.DotNetty.Dashbord.Controllers -{ - /// - /// 计数器管理 - /// - [Route("jt808webapi/AtomicCounter")] - [ApiController] - public class JT808AtomicCounterController : ControllerBase - { - /// - /// 获取包计算器 - /// - /// - [HttpGet] - [Route("GetAtomicCounter")] - public ActionResult GetAtomicCounter() - { - return new JT808AtomicCounterDto { - MsgSuccessCount=100000, - MsgFailCount=0 - }; - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Controllers/JT808SessionController.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Controllers/JT808SessionController.cs deleted file mode 100644 index bbc929a..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Controllers/JT808SessionController.cs +++ /dev/null @@ -1,67 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; - -namespace JT808.DotNetty.Dashbord.Controllers -{ - /// - /// 会话管理 - /// - [Route("jt808webapi/Session")] - [ApiController] - public class JT808SessionController : ControllerBase - { - /// - /// 通过终端设备号删除会话 - /// - /// - /// - [HttpGet] - [Route("RemoveByTerminalPhoneNo")] - public ActionResult RemoveByTerminalPhoneNo(string terminalPhoneNo) - { - return true; - } - - /// - /// 通过通道Id删除会话 - /// - /// - /// - [HttpGet] - [Route("RemoveByChannelId")] - public ActionResult RemoveByChannelId(string channelId) - { - return true; - } - - ///// - ///// 获取会话集合 - ///// - ///// - ///// - //[HttpGet] - //[Route("GetAll")] - //public ActionResult> GetAll() - //{ - // return new List() { - // new JT808SessionInfoDto { - // ChannelId="0x00x0", - // LastActiveTime=DateTime.Now, - // RemoteAddressIP="127.0.0.1:559", - // TerminalPhoneNo="123456789012", - // StartTime=DateTime.Now, - // }, - // new JT808SessionInfoDto { - // ChannelId="0x00x1", - // LastActiveTime=DateTime.Now, - // RemoteAddressIP="127.0.0.1:558", - // TerminalPhoneNo="123456789013", - // StartTime=DateTime.Now, - // } - // }; - //} - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Controllers/JT808TransmitController.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Controllers/JT808TransmitController.cs deleted file mode 100644 index f65592d..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Controllers/JT808TransmitController.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; - -namespace JT808.DotNetty.Dashbord.Controllers -{ - /// - /// 转发管理 - /// - [Route("jt808webapi/Transmit")] - [ApiController] - public class JT808TransmitController : ControllerBase - { - ///// - ///// 添加地址 - ///// - ///// - ///// - //[HttpPost] - //[Route("Add")] - //public ActionResult Add([FromBody]JT808IPAddressDto jT808IPAddressDto) - //{ - // return true; - //} - - ///// - ///// 删除地址 - ///// - ///// - ///// - //[HttpPost] - //[Route("Remove")] - //public ActionResult Remove([FromBody]JT808IPAddressDto jT808IPAddressDto) - //{ - // return true; - //} - - /// - /// 获取转发IP地址集合 - /// - /// - /// - [HttpGet] - [Route("GetAll")] - public ActionResult> GetAll() - { - return new List() { "127.0.0.1:80", "127.0.0.1:81" }; - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Controllers/JT808UnificationSendController.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Controllers/JT808UnificationSendController.cs deleted file mode 100644 index 270a9b3..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Controllers/JT808UnificationSendController.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; - -namespace JT808.DotNetty.Dashbord.Controllers -{ - /// - /// 统一信息下发 - /// - [Route("jt808webapi/UnificationSend")] - [ApiController] - public class JT808UnificationSendController : ControllerBase - { - - /// - /// 文本信息下发 - /// - /// 终端设备号 - /// 下发文本信息 - /// - [HttpGet("{terminalPhoneNo}/{text}")] - public ActionResult SendText(string terminalPhoneNo, string text) - { - - return true; - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Enums/JT808UnificationSendType.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Enums/JT808UnificationSendType.cs deleted file mode 100644 index e1469d7..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Enums/JT808UnificationSendType.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace JT808.DotNetty.Dashbord.Enums -{ - public enum JT808UnificationSendType - { - /// - /// 文本下发 - /// - TXT=1 - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Internal/IJT808DotNettyWebApi.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Internal/IJT808DotNettyWebApi.cs deleted file mode 100644 index f821050..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Internal/IJT808DotNettyWebApi.cs +++ /dev/null @@ -1,28 +0,0 @@ -using JT808.DotNetty.Abstractions.Dtos; -using System; -using System.Collections.Generic; -using WebApiClient; -using WebApiClient.Attributes; - -namespace JT808.DotNetty.Dashbord.Internal -{ - public interface IJT808DotNettyWebApi : IHttpApi - { - /// - /// 基于Tcp的统一下发信息 - /// - /// - /// - /// - [HttpPost] - ITask> UnificationTcpSend([Uri]string uri, [FormContent]JT808UnificationSendRequestDto jT808UnificationSendRequestDto); - /// - /// /基于Udp的统一下发信息 - /// - /// - /// - /// - [HttpPost] - ITask> UnificationUdpSend([Uri]string uri, [FormContent]JT808UnificationSendRequestDto jT808UnificationSendRequestDto); - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/JT808.DotNetty.Dashbord.csproj b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/JT808.DotNetty.Dashbord.csproj deleted file mode 100644 index b2fafce..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/JT808.DotNetty.Dashbord.csproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - netcoreapp2.2 - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Models/JT808_AtomicCounter.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Models/JT808_AtomicCounter.cs deleted file mode 100644 index 54900d1..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Models/JT808_AtomicCounter.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Threading.Tasks; - -namespace JT808.DotNetty.Dashbord.Models -{ - [Table("jt808_atomic_counter")] - public class JT808_AtomicCounter - { - [Key] - [Column("id")] - public long Id { get; set; } - - [Column("create_time")] - public long CreateTime { get; set; } - - [Column("success_count")] - public long SuccessCount { get; set; } - - [Column("fail_count")] - public long FailCount { get; set; } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Models/JT808_Session.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Models/JT808_Session.cs deleted file mode 100644 index 9230df3..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Models/JT808_Session.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace JT808.DotNetty.Dashbord.Models -{ - [Table("jt808_session")] - public class JT808_Session - { - [Key] - [Column("id")] - public long Id { get; set; } - [Column("create_time")] - public long CreateTime { get; set; } - [MaxLength(32)] - [Column("channel_id")] - public string ChannelId { get; set; } - [MaxLength(16)] - [Column("terminal_phone_no")] - public string TerminalPhoneNo { get; set; } - [Column("last_active_time")] - public long LastActiveTime { get; set; } - [Column("start_time")] - public long StartTime { get; set; } - [MaxLength(32)] - [Column("remote_address_ip")] - public string RemoteAddressIP { get; set; } - /// - /// 通道Id对应多个终端号 - /// true:第三方平台转发 - /// false:设备上报 - /// - [Column("is_transmit")] - public bool IsTransmit { get; set; } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Models/JT808_SessionLog.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Models/JT808_SessionLog.cs deleted file mode 100644 index 5b752f6..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Models/JT808_SessionLog.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Threading.Tasks; - -namespace JT808.DotNetty.Dashbord.Models -{ - [Table("jt808_session_log")] - public class JT808_SessionLog - { - [Key] - [Column("id")] - public long Id { get; set; } - [Column("create_time")] - public long CreateTime { get; set; } - [MaxLength(32)] - [Column("channel_id")] - public string ChannelId { get; set; } - [MaxLength(16)] - [Column("terminal_phone_no")] - public string TerminalPhoneNo { get; set; } - [MaxLength(128)] - [Column("reason")] - public string Reason { get; set; } - [Column("is_success")] - public bool IsSuccess { get; set; } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Models/JT808_SourcePackage.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Models/JT808_SourcePackage.cs deleted file mode 100644 index 149b832..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Models/JT808_SourcePackage.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Threading.Tasks; - -namespace JT808.DotNetty.Dashbord.Models -{ - [Table("jt808_source_package")] - public class JT808_SourcePackage - { - [Key] - [Column("id")] - public long Id { get; set; } - [Column("create_time")] - public long CreateTime { get; set; } - [MaxLength(32)] - [Column("ip")] - public string IP { get; set; } - [Column("port")] - public int Port { get; set; } - /// - /// 是否系统配置 - /// true:网关配置文件 - /// false:平台配置 - /// - [Column("is_system_config")] - public bool IsSystemConfig { get; set; } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Models/JT808_SourcePackageLog.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Models/JT808_SourcePackageLog.cs deleted file mode 100644 index 4ec8225..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Models/JT808_SourcePackageLog.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Threading.Tasks; - -namespace JT808.DotNetty.Dashbord.Models -{ - [Table("jt808_source_package_log")] - public class JT808_SourcePackageLog - { - [Key] - [Column("id")] - public long Id { get; set; } - [Column("create_time")] - public long CreateTime { get; set; } - [MaxLength(32)] - [Column("ip")] - public string IP { get; set; } - [Column("port")] - public int Port { get; set; } - [Column("is_success")] - public bool IsSuccess { get; set; } - [MaxLength(128)] - [Column("reason")] - public string Reason { get; set; } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Models/JT808_Transmit.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Models/JT808_Transmit.cs deleted file mode 100644 index ab8a806..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Models/JT808_Transmit.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Threading.Tasks; - -namespace JT808.DotNetty.Dashbord.Models -{ - [Table("jt808_transmit")] - public class JT808_Transmit - { - [Key] - [Column("id")] - public long Id { get; set; } - [Column("create_time")] - public long CreateTime { get; set; } - [MaxLength(32)] - [Column("ip")] - public string IP { get; set; } - [Column("port")] - public int Port { get; set; } - /// - /// 是否系统配置 - /// true:网关配置文件 - /// false:平台配置 - /// - [Column("is_system_config")] - public bool IsSystemConfig { get; set; } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Models/JT808_TransmitLog.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Models/JT808_TransmitLog.cs deleted file mode 100644 index 28cd5be..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Models/JT808_TransmitLog.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Threading.Tasks; - -namespace JT808.DotNetty.Dashbord.Models -{ - [Table("jt808_transmit_log")] - public class JT808_TransmitLog - { - [Key] - [Column("id")] - public long Id { get; set; } - [Column("create_time")] - public long CreateTime { get; set; } - [MaxLength(32)] - [Column("ip")] - public string IP { get; set; } - [Column("port")] - public int Port { get; set; } - [Column("is_success")] - public bool IsSuccess { get; set; } - [MaxLength(128)] - [Column("reason")] - public string Reason { get; set; } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Models/JT808_UnificationSend.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Models/JT808_UnificationSend.cs deleted file mode 100644 index feb5bae..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Models/JT808_UnificationSend.cs +++ /dev/null @@ -1,36 +0,0 @@ -using JT808.DotNetty.Dashbord.Enums; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Threading.Tasks; - -namespace JT808.DotNetty.Dashbord.Models -{ - [Table("jt808_unification_send")] - public class JT808_UnificationSend - { - [Key] - [Column("id")] - public long Id { get; set; } - [Column("create_time")] - public long CreateTime { get; set; } - [Column("unification_send_type")] - public JT808UnificationSendType UnificationSendType { get; set; } - [MaxLength(16)] - [Column("terminal_phone_no")] - public string TerminalPhoneNo { get; set; } - [MaxLength(2048)] - [Column("hex_data")] - public string HexData { get; set; } - [MaxLength(32)] - [Column("remote_address_ip")] - public string RemoteAddressIP { get; set; } - [Column("is_success")] - public bool IsSuccess { get; set; } - [MaxLength(128)] - [Column("reason")] - public string Reason { get; set; } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Program.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Program.cs deleted file mode 100644 index 181342b..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Program.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Logging; - -namespace JT808.DotNetty.Dashbord -{ - public class Program - { - public static void Main(string[] args) - { - CreateWebHostBuilder(args).Build().Run(); - } - - public static IWebHostBuilder CreateWebHostBuilder(string[] args) => - WebHost.CreateDefaultBuilder(args) - .UseStartup(); - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Providers/JT808DbContext.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Providers/JT808DbContext.cs deleted file mode 100644 index ad43c79..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Providers/JT808DbContext.cs +++ /dev/null @@ -1,48 +0,0 @@ -using JT808.DotNetty.Dashbord.Enums; -using JT808.DotNetty.Dashbord.Models; -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace JT808.DotNetty.Dashbord.Providers -{ - /// - /// - /// Add-Migration Init - /// 首次更新：创建对应文件夹 - /// Update-Database - /// System.NotSupportedException: SQLite does not support this migration operation ('DropColumnOperation'). - /// SQLite： 不支持删除列 - /// 解决方式： - /// https://elanderson.net/2017/04/entity-framework-core-with-sqlite-migration-limitations/ - /// https://sqlite.org/lang_altertable.html#otheralter - /// - public class JT808DbContext : DbContext - { - public DbSet JT808_AtomicCounters { get; set; } - public DbSet JT808_UnificationSends { get; set; } - public DbSet JT808_TransmitLogs { get; set; } - public DbSet JT808_Transmits { get; set; } - public DbSet JT808_SourcePackageLogs { get; set; } - public DbSet JT808_SourcePackages { get; set; } - public DbSet JT808_SessionLogs { get; set; } - public DbSet JT808_Sessions { get; set; } - - protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) - { - optionsBuilder.UseSqlite("Data Source=../JT808.DotNetty.Dashbord/data/jt808.db"); - } - - protected override void OnModelCreating(ModelBuilder modelBuilder) - { - modelBuilder - .Entity() - .Property(e => e.UnificationSendType) - .HasConversion( - v => v.ToString(), - v => (JT808UnificationSendType)Enum.Parse(typeof(JT808UnificationSendType), v)); - } - } -} diff --git a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Startup.cs b/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Startup.cs deleted file mode 100644 index 3c917b3..0000000 --- a/src/JT808.DotNetty.Admin/JT808.DotNetty.Dashbord/Startup.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using JT808.DotNetty.Dashbord.Providers; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; - -namespace JT808.DotNetty.Dashbord -{ - public class Startup - { - public Startup(IConfiguration configuration) - { - Configuration = configuration; - } - - public IConfiguration Configuration { get; } - - // This method gets called by the runtime. Use this method to add services to the container. - public void ConfigureServices(IServiceCollection services) - { - services.AddDbContext(); - services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2); - } - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env) - { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - app.UseMvc(); - } - } -} diff --git a/src/JT808.DotNetty.Admin/envoy/Dockerfile b/src/JT808.DotNetty.Admin/envoy/Dockerfile deleted file mode 100644 index 3000fbf..0000000 --- a/src/JT808.DotNetty.Admin/envoy/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2018 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM envoyproxy/envoy:latest - -COPY net/grpc/gateway/examples/echo/envoy.yaml /etc/envoy/envoy.yaml - -CMD /usr/local/bin/envoy -c /etc/envoy/envoy.yaml -l trace --log-path /tmp/envoy_info.log diff --git a/src/JT808.DotNetty.Admin/envoy/envoy.yaml b/src/JT808.DotNetty.Admin/envoy/envoy.yaml deleted file mode 100644 index 006ed96..0000000 --- a/src/JT808.DotNetty.Admin/envoy/envoy.yaml +++ /dev/null @@ -1,45 +0,0 @@ -admin: - access_log_path: /tmp/admin_access.log - address: - socket_address: { address: 0.0.0.0, port_value: 9901 } - -static_resources: - listeners: - - name: listener_0 - address: - socket_address: { address: 0.0.0.0, port_value: 8080 } - filter_chains: - - filters: - - name: envoy.http_connection_manager - config: - codec_type: auto - stat_prefix: ingress_http - route_config: - name: local_route - virtual_hosts: - - name: local_service - domains: ["*"] - routes: - - match: { prefix: "/" } - route: - cluster: echo_service - max_grpc_timeout: 0s - cors: - allow_origin: - - "*" - allow_methods: GET, PUT, DELETE, POST, OPTIONS - allow_headers: keep-alive,user-agent,cache-control,content-type,content-transfer-encoding,custom-header-1,x-accept-content-transfer-encoding,x-accept-response-streaming,x-user-agent,x-grpc-web,grpc-timeout - max_age: "1728000" - expose_headers: custom-header-1,grpc-status,grpc-message - enabled: true - http_filters: - - name: envoy.grpc_web - - name: envoy.cors - - name: envoy.router - clusters: - - name: echo_service - connect_timeout: 0.25s - type: logical_dns - http2_protocol_options: {} - lb_policy: round_robin - hosts: [{ socket_address: { address: node-server, port_value: 9090 }}] diff --git a/src/JT808.DotNetty.Admin/tools/README.md b/src/JT808.DotNetty.Admin/tools/README.md deleted file mode 100644 index fa51244..0000000 --- a/src/JT808.DotNetty.Admin/tools/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# 下载地址 - -[https://github.com/grpc/grpc-web/releases](https://github.com/grpc/grpc-web/releases) \ No newline at end of file diff --git a/src/JT808.DotNetty.Core/JT808.DotNetty.Core.csproj b/src/JT808.DotNetty.Core/JT808.DotNetty.Core.csproj index 0c1322c..4a2cfe3 100644 --- a/src/JT808.DotNetty.Core/JT808.DotNetty.Core.csproj +++ b/src/JT808.DotNetty.Core/JT808.DotNetty.Core.csproj @@ -14,7 +14,7 @@ https://github.com/SmallChi/JT808DotNetty https://github.com/SmallChi/JT808DotNetty/blob/master/LICENSE true - 1.1.0 + 1.1.1 diff --git a/src/JT808.DotNetty.Core/Session/JT808TcpSessionManager.cs b/src/JT808.DotNetty.Core/Session/JT808TcpSessionManager.cs index ab8c81d..38b190e 100644 --- a/src/JT808.DotNetty.Core/Session/JT808TcpSessionManager.cs +++ b/src/JT808.DotNetty.Core/Session/JT808TcpSessionManager.cs @@ -60,7 +60,7 @@ namespace JT808.DotNetty.Core } } - public void TryAdd(JT808TcpSession appSession) + public void TryAdd(string terminalPhoneNo,IChannel channel) { // 解决了设备号跟通道绑定到一起，不需要用到通道本身的SessionId // 不管设备下发更改了设备终端号，只要是没有在内存中就当是新的 @@ -68,13 +68,25 @@ namespace JT808.DotNetty.Core // 1.原先老的如何销毁 // 2.这时候用的通道是相同的，设备终端是不同的 // 当设备主动或者服务器断开以后，可以释放，这点内存忽略不计，况且更改设备号不是很频繁。 - if (SessionIdDict.TryAdd(appSession.TerminalPhoneNo, appSession)) + + //修复第一次通过转发过来的数据，再次通过直连后通道没有改变导致下发不成功，所以每次进行通道的更新操作。 + if (SessionIdDict.TryGetValue(terminalPhoneNo, out JT808TcpSession oldJT808Session)) + { + oldJT808Session.LastActiveTime = DateTime.Now; + oldJT808Session.Channel = channel; + SessionIdDict.TryUpdate(terminalPhoneNo, oldJT808Session, oldJT808Session); + } + else { - //使用场景： - //部标的超长待机设备,不会像正常的设备一样一直连着，可能10几分钟连上了，然后发完就关闭连接， - //这时候想下发数据需要知道设备什么时候上线，在这边做通知最好不过了。 - //有设备关联上来可以进行通知 例如：使用Redis发布订阅 - jT808SessionPublishing.PublishAsync(JT808Constants.SessionOnline, appSession.TerminalPhoneNo); + JT808TcpSession jT808TcpSession = new JT808TcpSession(channel, terminalPhoneNo); + if (SessionIdDict.TryAdd(terminalPhoneNo, jT808TcpSession)) + { + //使用场景： + //部标的超长待机设备,不会像正常的设备一样一直连着，可能10几分钟连上了，然后发完就关闭连接， + //这时候想下发数据需要知道设备什么时候上线，在这边做通知最好不过了。 + //有设备关联上来可以进行通知 例如：使用Redis发布订阅 + jT808SessionPublishing.PublishAsync(JT808Constants.SessionOnline, jT808TcpSession.TerminalPhoneNo); + } } } diff --git a/src/JT808.DotNetty.Core/Session/JT808UdpSessionManager.cs b/src/JT808.DotNetty.Core/Session/JT808UdpSessionManager.cs index 62e9c4d..4a202f6 100644 --- a/src/JT808.DotNetty.Core/Session/JT808UdpSessionManager.cs +++ b/src/JT808.DotNetty.Core/Session/JT808UdpSessionManager.cs @@ -8,6 +8,7 @@ using JT808.DotNetty.Core.Metadata; using DotNetty.Transport.Channels; using JT808.DotNetty.Core.Configurations; using Microsoft.Extensions.Options; +using System.Net; namespace JT808.DotNetty.Core { @@ -55,13 +56,15 @@ namespace JT808.DotNetty.Core } } - public void TryAdd(JT808UdpSession appSession) + public void TryAdd(IChannel channel,EndPoint sender,string terminalPhoneNo) { //1.先判断是否在缓存里面 - if (SessionIdDict.TryGetValue(appSession.TerminalPhoneNo,out JT808UdpSession jT808UdpSession)) + if (SessionIdDict.TryGetValue(terminalPhoneNo, out JT808UdpSession jT808UdpSession)) { - appSession.StartTime = jT808UdpSession.StartTime; - SessionIdDict.TryUpdate(appSession.TerminalPhoneNo, appSession, jT808UdpSession); + jT808UdpSession.LastActiveTime=DateTime.Now; + jT808UdpSession.Sender = sender; + jT808UdpSession.Channel = channel; + SessionIdDict.TryUpdate(terminalPhoneNo, jT808UdpSession, jT808UdpSession); } else { @@ -70,13 +73,13 @@ namespace JT808.DotNetty.Core //部标的超长待机设备,不会像正常的设备一样一直连着，可能10几分钟连上了，然后发完就关闭连接， //这时候想下发数据需要知道设备什么时候上线，在这边做通知最好不过了。 //有设备关联上来可以进行通知 例如：使用Redis发布订阅 - SessionIdDict.TryAdd(appSession.TerminalPhoneNo, appSession); + SessionIdDict.TryAdd(terminalPhoneNo, new JT808UdpSession(channel, sender, terminalPhoneNo)); } //移动是个大的内网，不跟随下发，根本就发不出来 //移动很多卡，存储的那个socket地址端口，有效期非常短 //不速度快点下发，那个socket地址端口就可能映射到别的对应卡去了 //所以此处采用跟随设备消息下发指令 - jT808SessionPublishing.PublishAsync(JT808Constants.SessionOnline, appSession.TerminalPhoneNo); + jT808SessionPublishing.PublishAsync(JT808Constants.SessionOnline, terminalPhoneNo); } public void Heartbeat(string terminalPhoneNo) diff --git a/src/JT808.DotNetty.Dashbord.sln b/src/JT808.DotNetty.Dashbord.sln deleted file mode 100644 index 0dacb2d..0000000 --- a/src/JT808.DotNetty.Dashbord.sln +++ /dev/null @@ -1,55 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.168 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0D20F469-7269-4D64-A3C6-BE08700EEDEB}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JT808.Protocol", "JT808.Protocol\src\JT808.Protocol\JT808.Protocol.csproj", "{2F2FF360-A037-4C73-AF42-D252F1B86BD6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JT808.DotNetty.Abstractions", "JT808.DotNetty.Abstractions\JT808.DotNetty.Abstractions.csproj", "{A9B7B882-29D4-4B75-9546-EAA0D216EDBB}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JT808.DotNetty.Dashbord.GrpcProtocol", "JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcProtocol\JT808.DotNetty.Dashbord.GrpcProtocol.csproj", "{32D8C95A-C1EA-4EE9-BC7B-47533DD4D5D2}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JT808.DotNetty.Dashbord", "JT808.DotNetty.Admin\JT808.DotNetty.Dashbord\JT808.DotNetty.Dashbord.csproj", "{80D1505D-44E1-4128-8900-B5C0AE7C69E5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JT808.DotNetty.Dashbord.GrpcServer", "JT808.DotNetty.Admin\JT808.DotNetty.Dashbord.GrpcServer\JT808.DotNetty.Dashbord.GrpcServer.csproj", "{9F143F03-D90D-477F-9CE4-0BD1E2A1E379}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2F2FF360-A037-4C73-AF42-D252F1B86BD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F2FF360-A037-4C73-AF42-D252F1B86BD6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F2FF360-A037-4C73-AF42-D252F1B86BD6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F2FF360-A037-4C73-AF42-D252F1B86BD6}.Release|Any CPU.Build.0 = Release|Any CPU - {A9B7B882-29D4-4B75-9546-EAA0D216EDBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9B7B882-29D4-4B75-9546-EAA0D216EDBB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9B7B882-29D4-4B75-9546-EAA0D216EDBB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9B7B882-29D4-4B75-9546-EAA0D216EDBB}.Release|Any CPU.Build.0 = Release|Any CPU - {32D8C95A-C1EA-4EE9-BC7B-47533DD4D5D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32D8C95A-C1EA-4EE9-BC7B-47533DD4D5D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32D8C95A-C1EA-4EE9-BC7B-47533DD4D5D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32D8C95A-C1EA-4EE9-BC7B-47533DD4D5D2}.Release|Any CPU.Build.0 = Release|Any CPU - {80D1505D-44E1-4128-8900-B5C0AE7C69E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {80D1505D-44E1-4128-8900-B5C0AE7C69E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {80D1505D-44E1-4128-8900-B5C0AE7C69E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {80D1505D-44E1-4128-8900-B5C0AE7C69E5}.Release|Any CPU.Build.0 = Release|Any CPU - {9F143F03-D90D-477F-9CE4-0BD1E2A1E379}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9F143F03-D90D-477F-9CE4-0BD1E2A1E379}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9F143F03-D90D-477F-9CE4-0BD1E2A1E379}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9F143F03-D90D-477F-9CE4-0BD1E2A1E379}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {2F2FF360-A037-4C73-AF42-D252F1B86BD6} = {0D20F469-7269-4D64-A3C6-BE08700EEDEB} - {A9B7B882-29D4-4B75-9546-EAA0D216EDBB} = {0D20F469-7269-4D64-A3C6-BE08700EEDEB} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {0DDBE27F-708F-46DC-837F-BEF34A50A0B1} - EndGlobalSection -EndGlobal diff --git a/src/JT808.DotNetty.Tcp/Handlers/JT808TcpServerHandler.cs b/src/JT808.DotNetty.Tcp/Handlers/JT808TcpServerHandler.cs index ed4308f..083c68c 100644 --- a/src/JT808.DotNetty.Tcp/Handlers/JT808TcpServerHandler.cs +++ b/src/JT808.DotNetty.Tcp/Handlers/JT808TcpServerHandler.cs @@ -64,7 +64,7 @@ namespace JT808.DotNetty.Tcp.Handlers { logger.LogDebug("accept package success count<<<" + jT808AtomicCounterService.MsgSuccessCount.ToString()); } - jT808SessionManager.TryAdd(new JT808TcpSession(ctx.Channel, jT808HeaderPackage.Header.TerminalPhoneNo)); + jT808SessionManager.TryAdd(jT808HeaderPackage.Header.TerminalPhoneNo,ctx.Channel); Func handlerFunc; if (handler.HandlerDict.TryGetValue(jT808HeaderPackage.Header.MsgId, out handlerFunc)) { diff --git a/src/JT808.DotNetty.Tcp/JT808.DotNetty.Tcp.csproj b/src/JT808.DotNetty.Tcp/JT808.DotNetty.Tcp.csproj index 59b8ceb..1647bd2 100644 --- a/src/JT808.DotNetty.Tcp/JT808.DotNetty.Tcp.csproj +++ b/src/JT808.DotNetty.Tcp/JT808.DotNetty.Tcp.csproj @@ -14,7 +14,7 @@ https://github.com/SmallChi/JT808DotNetty https://github.com/SmallChi/JT808DotNetty/blob/master/LICENSE true - 1.1.0 + 1.1.1 diff --git a/src/JT808.DotNetty.Tests/JT808.DotNetty.Core.Test/JT808TcpSessionManagerTest.cs b/src/JT808.DotNetty.Tests/JT808.DotNetty.Core.Test/JT808TcpSessionManagerTest.cs index 0baa77a..cdec189 100644 --- a/src/JT808.DotNetty.Tests/JT808.DotNetty.Core.Test/JT808TcpSessionManagerTest.cs +++ b/src/JT808.DotNetty.Tests/JT808.DotNetty.Core.Test/JT808TcpSessionManagerTest.cs @@ -13,7 +13,7 @@ namespace JT808.DotNetty.Core.Test { var no = "test150"; var channel = new EmbeddedChannel(new JT808DefaultChannelId()); - jT80TcpSessionManager.TryAdd(new Metadata.JT808TcpSession(channel, no)); + jT80TcpSessionManager.TryAdd(no,channel); Thread.Sleep(1000); jT80TcpSessionManager.Heartbeat(no); } @@ -23,7 +23,7 @@ namespace JT808.DotNetty.Core.Test { var no = "test151"; var channel = new EmbeddedChannel(new JT808DefaultChannelId()); - jT80TcpSessionManager.TryAdd(new Metadata.JT808TcpSession(channel, no)); + jT80TcpSessionManager.TryAdd(no, channel); var sessionInfo = jT80TcpSessionManager.RemoveSession(no); Assert.AreEqual(no, sessionInfo.TerminalPhoneNo); } @@ -50,11 +50,11 @@ namespace JT808.DotNetty.Core.Test var no3 = "test4"; var no4 = "test5"; var channel = new EmbeddedChannel(new JT808DefaultChannelId()); - jT80TcpSessionManager.TryAdd(new Metadata.JT808TcpSession(channel, no)); - jT80TcpSessionManager.TryAdd(new Metadata.JT808TcpSession(channel, no1)); - jT80TcpSessionManager.TryAdd(new Metadata.JT808TcpSession(channel, no2)); - jT80TcpSessionManager.TryAdd(new Metadata.JT808TcpSession(channel, no3)); - jT80TcpSessionManager.TryAdd(new Metadata.JT808TcpSession(channel, no4)); + jT80TcpSessionManager.TryAdd(no,channel); + jT80TcpSessionManager.TryAdd(no1,channel); + jT80TcpSessionManager.TryAdd(no2,channel); + jT80TcpSessionManager.TryAdd(no3,channel); + jT80TcpSessionManager.TryAdd(no4,channel); var removeSession = jT80TcpSessionManager.RemoveSession(no); Assert.AreEqual(no, removeSession.TerminalPhoneNo); Assert.AreEqual(channel, removeSession.Channel); @@ -72,11 +72,11 @@ namespace JT808.DotNetty.Core.Test var no4 = "test65"; var channel1 = new EmbeddedChannel(new JT808DefaultChannelId()); var channel2 = new EmbeddedChannel(new JT808DefaultChannelId()); - jT80TcpSessionManager.TryAdd(new Metadata.JT808TcpSession(channel1, no)); - jT80TcpSessionManager.TryAdd(new Metadata.JT808TcpSession(channel1, no1)); - jT80TcpSessionManager.TryAdd(new Metadata.JT808TcpSession(channel1, no2)); - jT80TcpSessionManager.TryAdd(new Metadata.JT808TcpSession(channel2, no3)); - jT80TcpSessionManager.TryAdd(new Metadata.JT808TcpSession(channel2, no4)); + jT80TcpSessionManager.TryAdd(no,channel1); + jT80TcpSessionManager.TryAdd(no1,channel1); + jT80TcpSessionManager.TryAdd(no2,channel1); + jT80TcpSessionManager.TryAdd(no3,channel2); + jT80TcpSessionManager.TryAdd(no4,channel2); jT80TcpSessionManager.RemoveSessionByChannel(channel1); } } diff --git a/src/JT808.DotNetty.Tests/JT808.DotNetty.Core.Test/SeedTcpSession.cs b/src/JT808.DotNetty.Tests/JT808.DotNetty.Core.Test/SeedTcpSession.cs index bacfa00..352a1ca 100644 --- a/src/JT808.DotNetty.Tests/JT808.DotNetty.Core.Test/SeedTcpSession.cs +++ b/src/JT808.DotNetty.Tests/JT808.DotNetty.Core.Test/SeedTcpSession.cs @@ -20,7 +20,7 @@ namespace JT808.DotNetty.Core.Test for (var i = 0; i < 10; i++) { var channel = new EmbeddedChannel(new JT808DefaultChannelId()); - jT80TcpSessionManager.TryAdd(new Metadata.JT808TcpSession(channel, i.ToString())); + jT80TcpSessionManager.TryAdd(i.ToString(),channel); } } @@ -30,7 +30,7 @@ namespace JT808.DotNetty.Core.Test for (var i = 0; i < 10; i++) { var channel = new EmbeddedChannel(new JT808DefaultChannelId()); - jT80TcpSessionManager.TryAdd(new Metadata.JT808TcpSession(channel, i.ToString())); + jT80TcpSessionManager.TryAdd(i.ToString(), channel); } } } diff --git a/src/JT808.DotNetty.Udp/Handlers/JT808UdpServerHandler.cs b/src/JT808.DotNetty.Udp/Handlers/JT808UdpServerHandler.cs index 33f82b8..5059305 100644 --- a/src/JT808.DotNetty.Udp/Handlers/JT808UdpServerHandler.cs +++ b/src/JT808.DotNetty.Udp/Handlers/JT808UdpServerHandler.cs @@ -57,7 +57,7 @@ namespace JT808.DotNetty.Udp.Handlers //解析具体的消息体，具体调用JT808Serializer.Deserialize JT808HeaderPackage jT808HeaderPackage = JT808Serializer.Deserialize(msg.Buffer); jT808UdpAtomicCounterService.MsgSuccessIncrement(); - jT808UdpSessionManager.TryAdd(new JT808UdpSession(ctx.Channel, msg.Sender, jT808HeaderPackage.Header.TerminalPhoneNo)); + jT808UdpSessionManager.TryAdd(ctx.Channel, msg.Sender, jT808HeaderPackage.Header.TerminalPhoneNo); if (logger.IsEnabled(LogLevel.Debug)) { logger.LogDebug("accept package success count<<<" + jT808UdpAtomicCounterService.MsgSuccessCount.ToString()); diff --git a/src/JT808.DotNetty.Udp/JT808.DotNetty.Udp.csproj b/src/JT808.DotNetty.Udp/JT808.DotNetty.Udp.csproj index b2f82c9..d893348 100644 --- a/src/JT808.DotNetty.Udp/JT808.DotNetty.Udp.csproj +++ b/src/JT808.DotNetty.Udp/JT808.DotNetty.Udp.csproj @@ -14,7 +14,7 @@ https://github.com/SmallChi/JT808DotNetty https://github.com/SmallChi/JT808DotNetty/blob/master/LICENSE true - 1.1.0 + 1.1.1 diff --git a/src/JT808.DotNetty.WebApi/JT808.DotNetty.WebApi.csproj b/src/JT808.DotNetty.WebApi/JT808.DotNetty.WebApi.csproj index 88deec3..16622ca 100644 --- a/src/JT808.DotNetty.WebApi/JT808.DotNetty.WebApi.csproj +++ b/src/JT808.DotNetty.WebApi/JT808.DotNetty.WebApi.csproj @@ -14,7 +14,7 @@ https://github.com/SmallChi/JT808DotNetty https://github.com/SmallChi/JT808DotNetty/blob/master/LICENSE true - 1.1.0 + 1.1.1 diff --git a/src/JT808.DotNetty.WebApiClientTool/JT808.DotNetty.WebApiClientTool.csproj b/src/JT808.DotNetty.WebApiClientTool/JT808.DotNetty.WebApiClientTool.csproj index 422320b..51eb294 100644 --- a/src/JT808.DotNetty.WebApiClientTool/JT808.DotNetty.WebApiClientTool.csproj +++ b/src/JT808.DotNetty.WebApiClientTool/JT808.DotNetty.WebApiClientTool.csproj @@ -14,7 +14,7 @@ https://github.com/SmallChi/JT808DotNetty https://github.com/SmallChi/JT808DotNetty/blob/master/LICENSE true - 1.1.0 + 1.1.1 diff --git a/src/JT808.Protocol b/src/JT808.Protocol index 11f9d08..a233a19 160000 --- a/src/JT808.Protocol +++ b/src/JT808.Protocol @@ -1 +1 @@ -Subproject commit 11f9d088cf01a0e5f77270daa7d814df0fa22a9e +Subproject commit a233a19a246af895234a4de684cb9a0ed3864ab1