From 69f70ea53bf53fe5ecc56e9828f2f2f465193886 Mon Sep 17 00:00:00 2001 From: "SmallChi(Koike)" <564952747@qq.com> Date: Fri, 17 Apr 2020 22:02:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ByteArrayHexTextJsonConverterTest.cs | 69 ---- src/JTTools.Bak.Test/JTTools.Test.csproj | 23 -- src/JTTools.Bak.Test/JTToolsControllerTest.cs | 65 --- .../Controllers/JTToolsController.cs | 202 --------- src/JTTools.Bak/Dtos/JT809RequestDto.cs | 14 - src/JTTools.Bak/Dtos/JTRequestDto.cs | 14 - src/JTTools.Bak/Dtos/JTResultDto.cs | 14 - src/JTTools.Bak/JTTools.csproj | 32 -- .../JsonConvert/ByteArrayHexConverter.cs | 29 -- .../ByteArrayHexTextJsonConverter.cs | 37 -- src/JTTools.Bak/Program.cs | 108 ----- src/JTTools.Bak/appsettings.Development.json | 11 - src/JTTools.Bak/appsettings.json | 9 - src/ui/jttools/.babelrc | 12 - src/ui/jttools/.editorconfig | 9 - src/ui/jttools/.eslintignore | 5 - src/ui/jttools/.eslintrc.js | 31 -- src/ui/jttools/.gitignore | 15 - src/ui/jttools/.postcssrc.js | 10 - src/ui/jttools/README.md | 21 - src/ui/jttools/build/build.js | 41 -- src/ui/jttools/build/check-versions.js | 54 --- src/ui/jttools/build/logo.png | Bin 6849 -> 0 bytes src/ui/jttools/build/utils.js | 101 ----- src/ui/jttools/build/vue-loader.conf.js | 22 - src/ui/jttools/build/webpack.base.conf.js | 91 ---- src/ui/jttools/build/webpack.dev.conf.js | 95 ----- src/ui/jttools/build/webpack.prod.conf.js | 145 ------- src/ui/jttools/config/dev.env.js | 7 - src/ui/jttools/config/index.js | 76 ---- src/ui/jttools/config/prod.env.js | 4 - src/ui/jttools/index.html | 14 - src/ui/jttools/package.json | 75 ---- src/ui/jttools/src/App.vue | 390 ------------------ src/ui/jttools/src/main.js | 15 - src/ui/jttools/static/.gitkeep | 0 36 files changed, 1860 deletions(-) delete mode 100644 src/JTTools.Bak.Test/ByteArrayHexTextJsonConverterTest.cs delete mode 100644 src/JTTools.Bak.Test/JTTools.Test.csproj delete mode 100644 src/JTTools.Bak.Test/JTToolsControllerTest.cs delete mode 100644 src/JTTools.Bak/Controllers/JTToolsController.cs delete mode 100644 src/JTTools.Bak/Dtos/JT809RequestDto.cs delete mode 100644 src/JTTools.Bak/Dtos/JTRequestDto.cs delete mode 100644 src/JTTools.Bak/Dtos/JTResultDto.cs delete mode 100644 src/JTTools.Bak/JTTools.csproj delete mode 100644 src/JTTools.Bak/JsonConvert/ByteArrayHexConverter.cs delete mode 100644 src/JTTools.Bak/JsonConvert/ByteArrayHexTextJsonConverter.cs delete mode 100644 src/JTTools.Bak/Program.cs delete mode 100644 src/JTTools.Bak/appsettings.Development.json delete mode 100644 src/JTTools.Bak/appsettings.json delete mode 100644 src/ui/jttools/.babelrc delete mode 100644 src/ui/jttools/.editorconfig delete mode 100644 src/ui/jttools/.eslintignore delete mode 100644 src/ui/jttools/.eslintrc.js delete mode 100644 src/ui/jttools/.gitignore delete mode 100644 src/ui/jttools/.postcssrc.js delete mode 100644 src/ui/jttools/README.md delete mode 100644 src/ui/jttools/build/build.js delete mode 100644 src/ui/jttools/build/check-versions.js delete mode 100644 src/ui/jttools/build/logo.png delete mode 100644 src/ui/jttools/build/utils.js delete mode 100644 src/ui/jttools/build/vue-loader.conf.js delete mode 100644 src/ui/jttools/build/webpack.base.conf.js delete mode 100644 src/ui/jttools/build/webpack.dev.conf.js delete mode 100644 src/ui/jttools/build/webpack.prod.conf.js delete mode 100644 src/ui/jttools/config/dev.env.js delete mode 100644 src/ui/jttools/config/index.js delete mode 100644 src/ui/jttools/config/prod.env.js delete mode 100644 src/ui/jttools/index.html delete mode 100644 src/ui/jttools/package.json delete mode 100644 src/ui/jttools/src/App.vue delete mode 100644 src/ui/jttools/src/main.js delete mode 100644 src/ui/jttools/static/.gitkeep diff --git a/src/JTTools.Bak.Test/ByteArrayHexTextJsonConverterTest.cs b/src/JTTools.Bak.Test/ByteArrayHexTextJsonConverterTest.cs deleted file mode 100644 index d369854..0000000 --- a/src/JTTools.Bak.Test/ByteArrayHexTextJsonConverterTest.cs +++ /dev/null @@ -1,69 +0,0 @@ -using JTTools.JsonConvert; -using System; -using System.Collections.Generic; -using System.Text; -using System.Text.Json; -using Xunit; - -namespace JTTools.Test -{ - public class ByteArrayHexTextJsonConverterTest - { - [Fact] - public void Test1() - { - var options = new JsonSerializerOptions(); - options.Converters.Add(new ByteArrayHexTextJsonConverter()); - string jsonSerialized = JsonSerializer.Serialize(new byte[] { 0xA1,0x2D,0xF6}, options); - Assert.Equal("\"A1 2D F6\"", jsonSerialized); - } - - [Fact] - public void Test2() - { - string json = "\"A1 2D,F6\""; - var options = new JsonSerializerOptions(); - options.Converters.Add(new ByteArrayHexTextJsonConverter()); - byte[] arr = JsonSerializer.Deserialize(json, options); - Assert.Equal(0xA1, arr[0]); - Assert.Equal(0x2D, arr[1]); - Assert.Equal(0xF6, arr[2]); - } - - [Fact] - public void Test3() - { - string json = "{\"Array1\":\"A1 2D,F6\"}"; - var options = new JsonSerializerOptions(); - options.Converters.Add(new ByteArrayHexTextJsonConverter()); - ClassWithProperty obj = JsonSerializer.Deserialize(json, options); - Assert.Equal(0xA1, obj.Array1[0]); - Assert.Equal(0x2D, obj.Array1[1]); - Assert.Equal(0xF6, obj.Array1[2]); - } - - - [Fact] - public void Test4() - { - string json = "{\"Array1\":\"A1 2D,O6\"}"; - var options = new JsonSerializerOptions(); - options.Converters.Add(new ByteArrayHexTextJsonConverter()); - try - { - ClassWithProperty obj = JsonSerializer.Deserialize(json, options); - } - catch (System.FormatException ex) - { - Assert.Equal("Could not find any recognizable digits.", ex.Message); - } - } - - - private class ClassWithProperty - { - public byte[] Array1 { get; set; } - } - - } -} diff --git a/src/JTTools.Bak.Test/JTTools.Test.csproj b/src/JTTools.Bak.Test/JTTools.Test.csproj deleted file mode 100644 index f273c1b..0000000 --- a/src/JTTools.Bak.Test/JTTools.Test.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - netcoreapp3.1 - - false - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - diff --git a/src/JTTools.Bak.Test/JTToolsControllerTest.cs b/src/JTTools.Bak.Test/JTToolsControllerTest.cs deleted file mode 100644 index dbfc26c..0000000 --- a/src/JTTools.Bak.Test/JTToolsControllerTest.cs +++ /dev/null @@ -1,65 +0,0 @@ -using JT808.Protocol; -using JT808.Protocol.Extensions.JT1078; -using JT809.Protocol; -using JT809.Protocol.Configs; -using JT809.Protocol.Enums; -using JT809.Protocol.Extensions.JT1078; -using JT809.Protocol.MessageBody; -using JTTools.Controllers; -using JTTools.Dtos; -using Microsoft.Extensions.DependencyInjection; -using System; -using Xunit; - -namespace JTTools.Test -{ - public class JTToolsControllerTest - { - IServiceCollection serviceDescriptors = new ServiceCollection(); - - private readonly JTToolsController jTToolsController; - - public JTToolsControllerTest() - { - serviceDescriptors.AddJT808Configure(); - //.AddJT1078Configure(); - serviceDescriptors.AddJT809Configure() - .AddJT1078Configure(); - serviceDescriptors.AddSingleton(); - IServiceProvider ServiceProvider = serviceDescriptors.BuildServiceProvider(); - jTToolsController = ServiceProvider.GetRequiredService(); - } - - [Fact] - public void Parse809Test1() - { - var result=jTToolsController.Parse809(new JT809RequestDto() - { - IsEncrypt=true, - EncryptOptions=new JT809EncryptOptions - { - IA1= 96135846, - IC1= 30000000, - M1 = 10000079 - }, - HexData= "5B 00 00 00 73 00 00 17 3B 12 00 02 A2 49 7F 01 02 0F 01 00 00 00 01 AC 84 2A 2C 11 20 47 CA 38 E1 DD 75 BE EE F8 03 D5 7A B8 17 C7 C0 43 3C D0 85 6D 94 EA E0 00 5A 01 23 68 A6 D6 DB A1 0B 49 F6 CB 74 C6 61 F6 D6 6A 80 C4 D2 B1 10 40 AE 48 7E 96 3A 8D 0F ED 7A 1B 2D 82 00 41 B9 BE 0A E7 8C D6 AB 7D B7 79 2E 8A 7F 17 AE B8 0A 9F AE AA A2 75 A4 5D" - }); - JT809Package package = (JT809Package)result.Value.Data; - JT809_0x1200 jT809_0X1200 = (JT809_0x1200)package.Bodies; - Assert.Equal(44190079u, package.Header.MsgGNSSCENTERID); - Assert.Equal(30116, package.CRCCode); - Assert.Equal("SEB408", jT809_0X1200.VehicleNo); - Assert.Equal(JT809VehicleColorType.ɫ, jT809_0X1200.VehicleColor); - } - [Fact] - public void Parse808Test1() - { - var result=jTToolsController.Parse808(new JT809RequestDto() - { - IsEncrypt=true, - HexData= "7E 02 00 00 57 00 00 00 00 77 77 62 F7 00 08 00 00 00 04 00 03 01 66 53 A7 06 A2 55 F8 00 9E 00 00 00 00 20 03 31 07 00 35 01 04 00 00 00 00 03 02 00 00 21 08 00 00 00 A0 00 05 6F 67 25 04 00 00 00 00 2B 04 00 00 00 00 30 01 03 31 01 0C 16 04 00 00 0B FE 17 01 02 18 04 01 1D 00 00 14 04 00 00 00 02 8A 7E" - }); - - } - } -} diff --git a/src/JTTools.Bak/Controllers/JTToolsController.cs b/src/JTTools.Bak/Controllers/JTToolsController.cs deleted file mode 100644 index 88a716b..0000000 --- a/src/JTTools.Bak/Controllers/JTToolsController.cs +++ /dev/null @@ -1,202 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using JTTools.Dtos; -using Microsoft.AspNetCore.Mvc; -using JT1078.Protocol; -using JT808.Protocol; -using JT809.Protocol; -using JT809.Protocol.Exceptions; -using JT808.Protocol.Extensions; -using JT808.Protocol.Exceptions; -using Microsoft.AspNetCore.Cors; -using Newtonsoft.Json; -using JT808.Protocol.Interfaces; -using JT809.Protocol.Interfaces; -using Microsoft.AspNetCore.Authorization; - -namespace JTTools.Controllers -{ - [Route("api/JTTools")] - [ApiController] - [EnableCors("Domain")] - public class JTToolsController : ControllerBase - { - private readonly IJT809Config jT809Config; - private readonly IJT808Config jT808Config; - private readonly JT808Serializer jT808Serializer; - private readonly JT808Serializer jT808_JTAS_Serializer; - private readonly JT808Serializer jT808_JT1078Serializer; - private readonly JT809Serializer jT809Serializer; - - public JTToolsController( - JT808_JTActiveSafety_Config jT808_JTActiveSafety_Config, - JT808_JT1078_Config jT808_JT1078_Config, - IJT809Config jT809Config, - IJT808Config jT808Config) - { - this.jT809Config = jT809Config; - this.jT808Config = jT808Config; - jT808Serializer = jT808Config.GetSerializer(); - jT808_JTAS_Serializer = jT808_JTActiveSafety_Config.GetSerializer(); - jT808_JT1078Serializer = jT808_JT1078_Config.GetSerializer(); - jT809Serializer = jT809Config.GetSerializer(); - } - - [Route("Parse808")] - [HttpPost] - public ActionResult Parse808([FromBody]JTRequestDto parameter) - { - JTResultDto jTResultDto = new JTResultDto(); - try - { - jTResultDto.Code = 200; - var a = parameter.HexData.ToHexBytes(); - jTResultDto.Data =jT808Serializer.Deserialize(a); - } - catch(JT808Exception ex) - { - jTResultDto.Code = 500; - jTResultDto.Message = $"{ex.ErrorCode}-{ex.Message}"; - } - catch (Exception ex) - { - jTResultDto.Code = 500; - jTResultDto.Message = ex.Message; - } - return jTResultDto; - } - - [Route("Analyze808")] - [HttpPost] - public ActionResult Analyze808([FromBody]JTRequestDto parameter) - { - JTResultDto jTResultDto = new JTResultDto(); - try - { - jTResultDto.Code = 200; - jTResultDto.Data = jT808Serializer.Analyze(parameter.HexData.ToHexBytes()); - } - catch (JT808Exception ex) - { - jTResultDto.Code = 500; - jTResultDto.Message = $"{ex.ErrorCode}-{ex.Message}"; - } - catch (Exception ex) - { - jTResultDto.Code = 500; - jTResultDto.Message = ex.Message; - } - return jTResultDto; - } - - [Route("Analyze808ExtJTAS")] - [HttpPost] - public ActionResult Analyze808ExtJTAS([FromBody]JTRequestDto parameter) - { - JTResultDto jTResultDto = new JTResultDto(); - try - { - jTResultDto.Code = 200; - jTResultDto.Data = jT808_JTAS_Serializer.Analyze(parameter.HexData.ToHexBytes()); - } - catch (JT808Exception ex) - { - jTResultDto.Code = 500; - jTResultDto.Message = $"{ex.ErrorCode}-{ex.Message}"; - } - catch (Exception ex) - { - jTResultDto.Code = 500; - jTResultDto.Message = ex.Message; - } - return jTResultDto; - } - - [Route("Analyze808ExtJT1078")] - [HttpPost] - public ActionResult Analyze808ExtJT1078([FromBody]JTRequestDto parameter) - { - JTResultDto jTResultDto = new JTResultDto(); - try - { - jTResultDto.Code = 200; - jTResultDto.Data = jT808_JT1078Serializer.Analyze(parameter.HexData.ToHexBytes()); - } - catch (JT808Exception ex) - { - jTResultDto.Code = 500; - jTResultDto.Message = $"{ex.ErrorCode}-{ex.Message}"; - } - catch (Exception ex) - { - jTResultDto.Code = 500; - jTResultDto.Message = ex.Message; - } - return jTResultDto; - } - - [Route("Parse809")] - [HttpPost] - public ActionResult Parse809([FromBody]JT809RequestDto parameter) - { - JTResultDto jTResultDto = new JTResultDto(); - try - { - if (parameter.IsEncrypt) - { - IJT809Config jt809ConfigInternal = new JT809Config(Guid.NewGuid().ToString()); - jt809ConfigInternal.EncryptOptions = parameter.EncryptOptions; - JT809Serializer jT809SerializerInternal = new JT809Serializer(jt809ConfigInternal); - jTResultDto.Data = jT809SerializerInternal.Deserialize(parameter.HexData.ToHexBytes()); - } - else - { - jTResultDto.Data = jT809Serializer.Deserialize(parameter.HexData.ToHexBytes()); - } - jTResultDto.Code = 200; - - } - catch (JT809Exception ex) - { - jTResultDto.Code = 500; - jTResultDto.Message = $"{ex.ErrorCode}-{ex.Message}"; - } - catch (Exception ex) - { - jTResultDto.Code = 500; - jTResultDto.Message = ex.Message; - } - return jTResultDto; - } - - [Route("Parse1078")] - [HttpPost] - public ActionResult Parse1078([FromBody]JTRequestDto parameter) - { - JTResultDto jTResultDto = new JTResultDto(); - try - { - jTResultDto.Code = 200; - jTResultDto.Data = JT1078Serializer.Deserialize(parameter.HexData.ToHexBytes()); - } - catch (Exception ex) - { - jTResultDto.Code = 500; - jTResultDto.Message = ex.Message; - } - return jTResultDto; - } - } - - class JT809Config :JT809GlobalConfigBase - { - public JT809Config(string configId) - { - ConfigId = configId; - } - - public override string ConfigId { get; } - } -} diff --git a/src/JTTools.Bak/Dtos/JT809RequestDto.cs b/src/JTTools.Bak/Dtos/JT809RequestDto.cs deleted file mode 100644 index 61ff239..0000000 --- a/src/JTTools.Bak/Dtos/JT809RequestDto.cs +++ /dev/null @@ -1,14 +0,0 @@ -using JT809.Protocol.Configs; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace JTTools.Dtos -{ - public class JT809RequestDto: JTRequestDto - { - public bool IsEncrypt { get; set; } = false; - public JT809EncryptOptions EncryptOptions { get; set; } - } -} diff --git a/src/JTTools.Bak/Dtos/JTRequestDto.cs b/src/JTTools.Bak/Dtos/JTRequestDto.cs deleted file mode 100644 index 963c837..0000000 --- a/src/JTTools.Bak/Dtos/JTRequestDto.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace JTTools.Dtos -{ - public class JTRequestDto - { - public string HexData { get; set; } - public bool Skip { get; set; } - public bool Custom { get; set; } - } -} diff --git a/src/JTTools.Bak/Dtos/JTResultDto.cs b/src/JTTools.Bak/Dtos/JTResultDto.cs deleted file mode 100644 index c3308a4..0000000 --- a/src/JTTools.Bak/Dtos/JTResultDto.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace JTTools.Dtos -{ - public class JTResultDto - { - public int Code { get; set; } - public string Message { get; set; } - public object Data { get; set; } - } -} diff --git a/src/JTTools.Bak/JTTools.csproj b/src/JTTools.Bak/JTTools.csproj deleted file mode 100644 index 7e6ff74..0000000 --- a/src/JTTools.Bak/JTTools.csproj +++ /dev/null @@ -1,32 +0,0 @@ - - - - netcoreapp3.1 - InProcess - - - - - - - - - - - - - - - - - - - - - - - Always - - - - diff --git a/src/JTTools.Bak/JsonConvert/ByteArrayHexConverter.cs b/src/JTTools.Bak/JsonConvert/ByteArrayHexConverter.cs deleted file mode 100644 index 27624d6..0000000 --- a/src/JTTools.Bak/JsonConvert/ByteArrayHexConverter.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace JTTools -{ - public class ByteArrayHexConverter : JsonConverter - { - public override bool CanConvert(Type objectType) => objectType == typeof(byte[]); - - public override bool CanRead => false; - public override bool CanWrite => true; - - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) => throw new NotImplementedException(); - - private readonly string _separator; - - public ByteArrayHexConverter(string separator = " ") => _separator = separator; - - public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) - { - var hexString = string.Join(_separator, ((byte[])value).Select(p => p.ToString("X2"))); - writer.WriteValue(hexString); - } - } -} diff --git a/src/JTTools.Bak/JsonConvert/ByteArrayHexTextJsonConverter.cs b/src/JTTools.Bak/JsonConvert/ByteArrayHexTextJsonConverter.cs deleted file mode 100644 index 302688b..0000000 --- a/src/JTTools.Bak/JsonConvert/ByteArrayHexTextJsonConverter.cs +++ /dev/null @@ -1,37 +0,0 @@ -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc.Formatters; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.Threading.Tasks; - -namespace JTTools.JsonConvert -{ - /// - /// - /// ref:https://github.com/dotnet/corefx/blob/release/3.0/src/System.Text.Json/tests/Serialization/CustomConverterTests.Array.cs - /// - public class ByteArrayHexTextJsonConverter : JsonConverter - { - public override byte[] Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - //string hexJson = reader.get(); - var hexJson = reader.GetString(); - var list = new List(); - foreach (string str in hexJson.Split(new string[] { ",", " " }, StringSplitOptions.RemoveEmptyEntries)) - { - list.Add(Convert.ToByte(str, 16)); - } - return list.ToArray(); - } - - public override void Write(Utf8JsonWriter writer, byte[] value, JsonSerializerOptions options) - { - var hexString = string.Join(" ", (value).Select(p => p.ToString("X2"))); - writer.WriteStringValue(hexString); - } - } -} diff --git a/src/JTTools.Bak/Program.cs b/src/JTTools.Bak/Program.cs deleted file mode 100644 index 42643ac..0000000 --- a/src/JTTools.Bak/Program.cs +++ /dev/null @@ -1,108 +0,0 @@ -using Microsoft.AspNetCore; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.DependencyInjection; -using JT808.Protocol; -using JT808.Protocol.Interfaces; -using JT809.Protocol; -using JT808.Protocol.Extensions.JT1078; -using JT808.Protocol.Extensions.JTActiveSafety; -using JT809.Protocol.Extensions.JT1078; -using Newtonsoft.Json.Serialization; -using System; -using Microsoft.Extensions.Logging; -using NLog.Extensions.Logging; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; -using JTTools.JsonConvert; - -namespace JTTools -{ - public class Program - { - public static void Main(string[] args) - { - Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.ConfigureServices((hostingContext, services) => - { - services.AddControllers() - //Microsoft.AspNetCore.Mvc.NewtonsoftJson - .AddNewtonsoftJson(jsonOptions => - { - jsonOptions.SerializerSettings.Converters.Add(new ByteArrayHexConverter()); - jsonOptions.SerializerSettings.ContractResolver = new DefaultContractResolver(); - //jsonOptions.SerializerSettings.Formatting = Newtonsoft.Json.Formatting.Indented; - }) - //.AddJsonOptions(jsonOptions => - //{ - // jsonOptions.JsonSerializerOptions.MaxDepth = 64; - - // jsonOptions.JsonSerializerOptions.Converters.Add(new ByteArrayHexTextJsonConverter()); - //}) - ; - services.AddCors(options => - options.AddPolicy("Domain", builder => - builder.WithOrigins(hostingContext.Configuration.GetSection("AllowedOrigins").Value.Split(",")) - .AllowAnyMethod() - .AllowAnyHeader() - .AllowAnyOrigin())); - - }) - .ConfigureKestrel(ksOptions => - { - ksOptions.ListenAnyIP(18888); - }) - .ConfigureLogging((context, logging) => { - //if (Environment.OSVersion.Platform == PlatformID.Unix) - //{ - // NLog.LogManager.LoadConfiguration("Configs/nlog.unix.config"); - //} - //else - //{ - // NLog.LogManager.LoadConfiguration("Configs/nlog.win.config"); - //} - //logging.AddNLog(new NLogProviderOptions { CaptureMessageTemplates = true, CaptureMessageProperties = true }); - //logging.SetMinimumLevel(LogLevel.Trace); - }) - .ConfigureAppConfiguration((hostingContext, config) => - { - config.SetBasePath(AppDomain.CurrentDomain.BaseDirectory); - config.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true); - }) - .Configure(app => { - app.UseRouting(); - app.UseCors("Domain"); - app.UseEndpoints(endpoints => - { - endpoints.MapControllers(); - }); - }); - }) - .ConfigureServices(services => - { - services.AddJT808Configure(); - services.AddJT808Configure(new JT808_JTActiveSafety_Config()) - .AddJTActiveSafetyConfigure(); - services.AddJT808Configure(new JT808_JT1078_Config()) - .AddJT1078Configure(); - services.AddJT809Configure() - .AddJT1078Configure(); - }) - .Build() - .Run(); - } - } - - public class JT808_JTActiveSafety_Config : GlobalConfigBase - { - public override string ConfigId { get; protected set; } = "JT808_JTActiveSafety_Config"; - } - - public class JT808_JT1078_Config : GlobalConfigBase - { - public override string ConfigId { get; protected set; } = "JT808_JT1078_Config"; - } -} diff --git a/src/JTTools.Bak/appsettings.Development.json b/src/JTTools.Bak/appsettings.Development.json deleted file mode 100644 index 2844626..0000000 --- a/src/JTTools.Bak/appsettings.Development.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" - } - }, - "AllowedHosts": "*", - "AllowedOrigins": "http://jttools.smallchi.cn,https://jttools.smallchi.cn,http://localhost:8080" -} diff --git a/src/JTTools.Bak/appsettings.json b/src/JTTools.Bak/appsettings.json deleted file mode 100644 index 9dab55f..0000000 --- a/src/JTTools.Bak/appsettings.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Debug" //Warning - } - }, - "AllowedHosts": "*", - "AllowedOrigins": "http://jttools.smallchi.cn,https://jttools.smallchi.cn,http://localhost:8080" -} diff --git a/src/ui/jttools/.babelrc b/src/ui/jttools/.babelrc deleted file mode 100644 index 3a280ba..0000000 --- a/src/ui/jttools/.babelrc +++ /dev/null @@ -1,12 +0,0 @@ -{ - "presets": [ - ["env", { - "modules": false, - "targets": { - "browsers": ["> 1%", "last 2 versions", "not ie <= 8"] - } - }], - "stage-2" - ], - "plugins": ["transform-vue-jsx", "transform-runtime"] -} diff --git a/src/ui/jttools/.editorconfig b/src/ui/jttools/.editorconfig deleted file mode 100644 index 9d08a1a..0000000 --- a/src/ui/jttools/.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/ui/jttools/.eslintignore b/src/ui/jttools/.eslintignore deleted file mode 100644 index f5d3a82..0000000 --- a/src/ui/jttools/.eslintignore +++ /dev/null @@ -1,5 +0,0 @@ -/build/ -/config/ -/dist/ -/*.js -/*.vue diff --git a/src/ui/jttools/.eslintrc.js b/src/ui/jttools/.eslintrc.js deleted file mode 100644 index 7c86fec..0000000 --- a/src/ui/jttools/.eslintrc.js +++ /dev/null @@ -1,31 +0,0 @@ -// https://eslint.org/docs/user-guide/configuring - -module.exports = { - root: true, - parserOptions: { - parser: 'babel-eslint' - }, - env: { - browser: true, - }, - extends: [ - // https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention - // consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules. - 'plugin:vue/essential', - // https://github.com/standard/standard/blob/master/docs/RULES-en.md - 'standard' - ], - // required to lint *.vue files - plugins: [ - 'vue' - ], - // add your custom rules here - rules: { - // allow async-await - 'eslint-disable':'off', - 'eslint-disable-next-line':'off', - 'generator-star-spacing': 'off', - // allow debugger during development - 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off' - } -} diff --git a/src/ui/jttools/.gitignore b/src/ui/jttools/.gitignore deleted file mode 100644 index ee89a17..0000000 --- a/src/ui/jttools/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -.DS_Store -node_modules/ -/dist/ -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -# Editor directories and files -.idea -.vscode -*.suo -*.ntvs* -*.njsproj -*.sln -package-lock.json diff --git a/src/ui/jttools/.postcssrc.js b/src/ui/jttools/.postcssrc.js deleted file mode 100644 index eee3e92..0000000 --- a/src/ui/jttools/.postcssrc.js +++ /dev/null @@ -1,10 +0,0 @@ -// https://github.com/michael-ciniawsky/postcss-load-config - -module.exports = { - "plugins": { - "postcss-import": {}, - "postcss-url": {}, - // to edit target browsers: use "browserslist" field in package.json - "autoprefixer": {} - } -} diff --git a/src/ui/jttools/README.md b/src/ui/jttools/README.md deleted file mode 100644 index a7a23c6..0000000 --- a/src/ui/jttools/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# jttools - -> A Vue.js project - -## Build Setup - -``` bash -# install dependencies -npm install - -# serve with hot reload at localhost:8080 -npm run dev - -# build for production with minification -npm run build - -# build for production and view the bundle analyzer report -npm run build --report -``` - -For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader). diff --git a/src/ui/jttools/build/build.js b/src/ui/jttools/build/build.js deleted file mode 100644 index 8f2ad8a..0000000 --- a/src/ui/jttools/build/build.js +++ /dev/null @@ -1,41 +0,0 @@ -'use strict' -require('./check-versions')() - -process.env.NODE_ENV = 'production' - -const ora = require('ora') -const rm = require('rimraf') -const path = require('path') -const chalk = require('chalk') -const webpack = require('webpack') -const config = require('../config') -const webpackConfig = require('./webpack.prod.conf') - -const spinner = ora('building for production...') -spinner.start() - -rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => { - if (err) throw err - webpack(webpackConfig, (err, stats) => { - spinner.stop() - if (err) throw err - process.stdout.write(stats.toString({ - colors: true, - modules: false, - children: false, // If you are using ts-loader, setting this to true will make TypeScript errors show up during build. - chunks: false, - chunkModules: false - }) + '\n\n') - - if (stats.hasErrors()) { - console.log(chalk.red(' Build failed with errors.\n')) - process.exit(1) - } - - console.log(chalk.cyan(' Build complete.\n')) - console.log(chalk.yellow( - ' Tip: built files are meant to be served over an HTTP server.\n' + - ' Opening index.html over file:// won\'t work.\n' - )) - }) -}) diff --git a/src/ui/jttools/build/check-versions.js b/src/ui/jttools/build/check-versions.js deleted file mode 100644 index 3ef972a..0000000 --- a/src/ui/jttools/build/check-versions.js +++ /dev/null @@ -1,54 +0,0 @@ -'use strict' -const chalk = require('chalk') -const semver = require('semver') -const packageConfig = require('../package.json') -const shell = require('shelljs') - -function exec (cmd) { - return require('child_process').execSync(cmd).toString().trim() -} - -const versionRequirements = [ - { - name: 'node', - currentVersion: semver.clean(process.version), - versionRequirement: packageConfig.engines.node - } -] - -if (shell.which('npm')) { - versionRequirements.push({ - name: 'npm', - currentVersion: exec('npm --version'), - versionRequirement: packageConfig.engines.npm - }) -} - -module.exports = function () { - const warnings = [] - - for (let i = 0; i < versionRequirements.length; i++) { - const mod = versionRequirements[i] - - if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) { - warnings.push(mod.name + ': ' + - chalk.red(mod.currentVersion) + ' should be ' + - chalk.green(mod.versionRequirement) - ) - } - } - - if (warnings.length) { - console.log('') - console.log(chalk.yellow('To use this template, you must update following to modules:')) - console.log() - - for (let i = 0; i < warnings.length; i++) { - const warning = warnings[i] - console.log(' ' + warning) - } - - console.log() - process.exit(1) - } -} diff --git a/src/ui/jttools/build/logo.png b/src/ui/jttools/build/logo.png deleted file mode 100644 index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6849 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 { - const notifier = require('node-notifier') - - return (severity, errors) => { - if (severity !== 'error') return - - const error = errors[0] - const filename = error.file && error.file.split('!').pop() - - notifier.notify({ - title: packageConfig.name, - message: severity + ': ' + error.name, - subtitle: filename || '', - icon: path.join(__dirname, 'logo.png') - }) - } -} diff --git a/src/ui/jttools/build/vue-loader.conf.js b/src/ui/jttools/build/vue-loader.conf.js deleted file mode 100644 index 33ed58b..0000000 --- a/src/ui/jttools/build/vue-loader.conf.js +++ /dev/null @@ -1,22 +0,0 @@ -'use strict' -const utils = require('./utils') -const config = require('../config') -const isProduction = process.env.NODE_ENV === 'production' -const sourceMapEnabled = isProduction - ? config.build.productionSourceMap - : config.dev.cssSourceMap - -module.exports = { - loaders: utils.cssLoaders({ - sourceMap: sourceMapEnabled, - extract: isProduction - }), - cssSourceMap: sourceMapEnabled, - cacheBusting: config.dev.cacheBusting, - transformToRequire: { - video: ['src', 'poster'], - source: 'src', - img: 'src', - image: 'xlink:href' - } -} diff --git a/src/ui/jttools/build/webpack.base.conf.js b/src/ui/jttools/build/webpack.base.conf.js deleted file mode 100644 index aa4fcf0..0000000 --- a/src/ui/jttools/build/webpack.base.conf.js +++ /dev/null @@ -1,91 +0,0 @@ -'use strict' -const path = require('path') -const utils = require('./utils') -const config = require('../config') -const vueLoaderConfig = require('./vue-loader.conf') - -function resolve (dir) { - return path.join(__dirname, '..', dir) -} - -const createLintingRule = () => ({ - test: /\.(js|vue)$/, - loader: 'eslint-loader', - enforce: 'pre', - include: [resolve('src'), resolve('test')], - options: { - formatter: require('eslint-friendly-formatter'), - emitWarning: !config.dev.showEslintErrorsInOverlay - } -}) - -module.exports = { - context: path.resolve(__dirname, '../'), - entry: { - app: './src/main.js' - }, - output: { - path: config.build.assetsRoot, - filename: '[name].js', - publicPath: process.env.NODE_ENV === 'production' - ? config.build.assetsPublicPath - : config.dev.assetsPublicPath - }, - resolve: { - extensions: ['.js', '.vue', '.json'], - alias: { - '@': resolve('src'), - } - }, - module: { - rules: [ - ...(config.dev.useEslint ? [createLintingRule()] : []), - { - test: /\.vue$/, - loader: 'vue-loader', - options: vueLoaderConfig - }, - { - test: /\.js$/, - loader: 'babel-loader', - include: [resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client')] - }, - { - test: /\.(png|jpe?g|gif|svg)(\?.*)?$/, - loader: 'url-loader', - options: { - limit: 10000, - name: utils.assetsPath('img/[name].[hash:7].[ext]') - } - }, - { - test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/, - loader: 'url-loader', - options: { - limit: 10000, - name: utils.assetsPath('media/[name].[hash:7].[ext]') - } - }, - { - test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/, - loader: 'url-loader', - options: { - limit: 10000, - name: utils.assetsPath('fonts/[name].[hash:7].[ext]') - } - } - ] - }, - node: { - // prevent webpack from injecting useless setImmediate polyfill because Vue - // source contains it (although only uses it if it's native). - setImmediate: false, - // prevent webpack from injecting mocks to Node native modules - // that does not make sense for the client - dgram: 'empty', - fs: 'empty', - net: 'empty', - tls: 'empty', - child_process: 'empty' - } -} diff --git a/src/ui/jttools/build/webpack.dev.conf.js b/src/ui/jttools/build/webpack.dev.conf.js deleted file mode 100644 index 070ae22..0000000 --- a/src/ui/jttools/build/webpack.dev.conf.js +++ /dev/null @@ -1,95 +0,0 @@ -'use strict' -const utils = require('./utils') -const webpack = require('webpack') -const config = require('../config') -const merge = require('webpack-merge') -const path = require('path') -const baseWebpackConfig = require('./webpack.base.conf') -const CopyWebpackPlugin = require('copy-webpack-plugin') -const HtmlWebpackPlugin = require('html-webpack-plugin') -const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin') -const portfinder = require('portfinder') - -const HOST = process.env.HOST -const PORT = process.env.PORT && Number(process.env.PORT) - -const devWebpackConfig = merge(baseWebpackConfig, { - module: { - rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true }) - }, - // cheap-module-eval-source-map is faster for development - devtool: config.dev.devtool, - - // these devServer options should be customized in /config/index.js - devServer: { - clientLogLevel: 'warning', - historyApiFallback: { - rewrites: [ - { from: /.*/, to: path.posix.join(config.dev.assetsPublicPath, 'index.html') }, - ], - }, - hot: true, - contentBase: false, // since we use CopyWebpackPlugin. - compress: true, - host: HOST || config.dev.host, - port: PORT || config.dev.port, - open: config.dev.autoOpenBrowser, - overlay: config.dev.errorOverlay - ? { warnings: false, errors: true } - : false, - publicPath: config.dev.assetsPublicPath, - proxy: config.dev.proxyTable, - quiet: true, // necessary for FriendlyErrorsPlugin - watchOptions: { - poll: config.dev.poll, - } - }, - plugins: [ - new webpack.DefinePlugin({ - 'process.env': require('../config/dev.env') - }), - new webpack.HotModuleReplacementPlugin(), - new webpack.NamedModulesPlugin(), // HMR shows correct file names in console on update. - new webpack.NoEmitOnErrorsPlugin(), - // https://github.com/ampedandwired/html-webpack-plugin - new HtmlWebpackPlugin({ - filename: 'index.html', - template: 'index.html', - inject: true - }), - // copy custom static assets - new CopyWebpackPlugin([ - { - from: path.resolve(__dirname, '../static'), - to: config.dev.assetsSubDirectory, - ignore: ['.*'] - } - ]) - ] -}) - -module.exports = new Promise((resolve, reject) => { - portfinder.basePort = process.env.PORT || config.dev.port - portfinder.getPort((err, port) => { - if (err) { - reject(err) - } else { - // publish the new Port, necessary for e2e tests - process.env.PORT = port - // add port to devServer config - devWebpackConfig.devServer.port = port - - // Add FriendlyErrorsPlugin - devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({ - compilationSuccessInfo: { - messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`], - }, - onErrors: config.dev.notifyOnErrors - ? utils.createNotifierCallback() - : undefined - })) - - resolve(devWebpackConfig) - } - }) -}) diff --git a/src/ui/jttools/build/webpack.prod.conf.js b/src/ui/jttools/build/webpack.prod.conf.js deleted file mode 100644 index d9f99f6..0000000 --- a/src/ui/jttools/build/webpack.prod.conf.js +++ /dev/null @@ -1,145 +0,0 @@ -'use strict' -const path = require('path') -const utils = require('./utils') -const webpack = require('webpack') -const config = require('../config') -const merge = require('webpack-merge') -const baseWebpackConfig = require('./webpack.base.conf') -const CopyWebpackPlugin = require('copy-webpack-plugin') -const HtmlWebpackPlugin = require('html-webpack-plugin') -const ExtractTextPlugin = require('extract-text-webpack-plugin') -const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin') -const UglifyJsPlugin = require('uglifyjs-webpack-plugin') - -const env = require('../config/prod.env') - -const webpackConfig = merge(baseWebpackConfig, { - module: { - rules: utils.styleLoaders({ - sourceMap: config.build.productionSourceMap, - extract: true, - usePostCSS: true - }) - }, - devtool: config.build.productionSourceMap ? config.build.devtool : false, - output: { - path: config.build.assetsRoot, - filename: utils.assetsPath('js/[name].[chunkhash].js'), - chunkFilename: utils.assetsPath('js/[id].[chunkhash].js') - }, - plugins: [ - // http://vuejs.github.io/vue-loader/en/workflow/production.html - new webpack.DefinePlugin({ - 'process.env': env - }), - new UglifyJsPlugin({ - uglifyOptions: { - compress: { - warnings: false - } - }, - sourceMap: config.build.productionSourceMap, - parallel: true - }), - // extract css into its own file - new ExtractTextPlugin({ - filename: utils.assetsPath('css/[name].[contenthash].css'), - // Setting the following option to `false` will not extract CSS from codesplit chunks. - // Their CSS will instead be inserted dynamically with style-loader when the codesplit chunk has been loaded by webpack. - // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`, - // increasing file size: https://github.com/vuejs-templates/webpack/issues/1110 - allChunks: true, - }), - // Compress extracted CSS. We are using this plugin so that possible - // duplicated CSS from different components can be deduped. - new OptimizeCSSPlugin({ - cssProcessorOptions: config.build.productionSourceMap - ? { safe: true, map: { inline: false } } - : { safe: true } - }), - // generate dist index.html with correct asset hash for caching. - // you can customize output by editing /index.html - // see https://github.com/ampedandwired/html-webpack-plugin - new HtmlWebpackPlugin({ - filename: config.build.index, - template: 'index.html', - inject: true, - minify: { - removeComments: true, - collapseWhitespace: true, - removeAttributeQuotes: true - // more options: - // https://github.com/kangax/html-minifier#options-quick-reference - }, - // necessary to consistently work with multiple chunks via CommonsChunkPlugin - chunksSortMode: 'dependency' - }), - // keep module.id stable when vendor modules does not change - new webpack.HashedModuleIdsPlugin(), - // enable scope hoisting - new webpack.optimize.ModuleConcatenationPlugin(), - // split vendor js into its own file - new webpack.optimize.CommonsChunkPlugin({ - name: 'vendor', - minChunks (module) { - // any required modules inside node_modules are extracted to vendor - return ( - module.resource && - /\.js$/.test(module.resource) && - module.resource.indexOf( - path.join(__dirname, '../node_modules') - ) === 0 - ) - } - }), - // extract webpack runtime and module manifest to its own file in order to - // prevent vendor hash from being updated whenever app bundle is updated - new webpack.optimize.CommonsChunkPlugin({ - name: 'manifest', - minChunks: Infinity - }), - // This instance extracts shared chunks from code splitted chunks and bundles them - // in a separate chunk, similar to the vendor chunk - // see: https://webpack.js.org/plugins/commons-chunk-plugin/#extra-async-commons-chunk - new webpack.optimize.CommonsChunkPlugin({ - name: 'app', - async: 'vendor-async', - children: true, - minChunks: 3 - }), - - // copy custom static assets - new CopyWebpackPlugin([ - { - from: path.resolve(__dirname, '../static'), - to: config.build.assetsSubDirectory, - ignore: ['.*'] - } - ]) - ] -}) - -if (config.build.productionGzip) { - const CompressionWebpackPlugin = require('compression-webpack-plugin') - - webpackConfig.plugins.push( - new CompressionWebpackPlugin({ - asset: '[path].gz[query]', - algorithm: 'gzip', - test: new RegExp( - '\\.(' + - config.build.productionGzipExtensions.join('|') + - ')$' - ), - threshold: 10240, - minRatio: 0.8 - }) - ) -} - -if (config.build.bundleAnalyzerReport) { - const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin - webpackConfig.plugins.push(new BundleAnalyzerPlugin()) -} - -module.exports = webpackConfig diff --git a/src/ui/jttools/config/dev.env.js b/src/ui/jttools/config/dev.env.js deleted file mode 100644 index 1e22973..0000000 --- a/src/ui/jttools/config/dev.env.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict' -const merge = require('webpack-merge') -const prodEnv = require('./prod.env') - -module.exports = merge(prodEnv, { - NODE_ENV: '"development"' -}) diff --git a/src/ui/jttools/config/index.js b/src/ui/jttools/config/index.js deleted file mode 100644 index 926ab36..0000000 --- a/src/ui/jttools/config/index.js +++ /dev/null @@ -1,76 +0,0 @@ -'use strict' -// Template version: 1.3.1 -// see http://vuejs-templates.github.io/webpack for documentation. - -const path = require('path') - -module.exports = { - dev: { - - // Paths - assetsSubDirectory: 'static', - assetsPublicPath: '/', - proxyTable: {}, - - // Various Dev Server settings - host: 'localhost', // can be overwritten by process.env.HOST - port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined - autoOpenBrowser: false, - errorOverlay: true, - notifyOnErrors: true, - poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions- - - // Use Eslint Loader? - // If true, your code will be linted during bundling and - // linting errors and warnings will be shown in the console. - useEslint: true, - // If true, eslint errors and warnings will also be shown in the error overlay - // in the browser. - showEslintErrorsInOverlay: false, - - /** - * Source Maps - */ - - // https://webpack.js.org/configuration/devtool/#development - devtool: 'cheap-module-eval-source-map', - - // If you have problems debugging vue-files in devtools, - // set this to false - it *may* help - // https://vue-loader.vuejs.org/en/options.html#cachebusting - cacheBusting: true, - - cssSourceMap: true - }, - - build: { - // Template for index.html - index: path.resolve(__dirname, '../dist/index.html'), - - // Paths - assetsRoot: path.resolve(__dirname, '../dist'), - assetsSubDirectory: 'static', - assetsPublicPath: '/', - - /** - * Source Maps - */ - - productionSourceMap: true, - // https://webpack.js.org/configuration/devtool/#production - devtool: '#source-map', - - // Gzip off by default as many popular static hosts such as - // Surge or Netlify already gzip all static assets for you. - // Before setting to `true`, make sure to: - // npm install --save-dev compression-webpack-plugin - productionGzip: false, - productionGzipExtensions: ['js', 'css'], - - // Run the build command with an extra argument to - // View the bundle analyzer report after build finishes: - // `npm run build --report` - // Set to `true` or `false` to always turn it on or off - bundleAnalyzerReport: process.env.npm_config_report - } -} diff --git a/src/ui/jttools/config/prod.env.js b/src/ui/jttools/config/prod.env.js deleted file mode 100644 index a6f9976..0000000 --- a/src/ui/jttools/config/prod.env.js +++ /dev/null @@ -1,4 +0,0 @@ -'use strict' -module.exports = { - NODE_ENV: '"production"' -} diff --git a/src/ui/jttools/index.html b/src/ui/jttools/index.html deleted file mode 100644 index 7be9d2b..0000000 --- a/src/ui/jttools/index.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - JTTools解析工具 - - -
- - - diff --git a/src/ui/jttools/package.json b/src/ui/jttools/package.json deleted file mode 100644 index b7e32c5..0000000 --- a/src/ui/jttools/package.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "name": "jttools", - "version": "1.0.0", - "description": "A Vue.js project", - "author": "SmallChi", - "private": true, - "scripts": { - "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", - "start": "npm run dev", - "lint": "eslint --ext .js,.vue src", - "build": "node build/build.js" - }, - "dependencies": { - "axios": "^0.19.0", - "iview": "^3.4.2", - "vue": "^2.5.2", - "vue-json-viewer": "^2.2.1" - }, - "devDependencies": { - "autoprefixer": "^7.1.2", - "babel-core": "^6.22.1", - "babel-eslint": "^8.2.1", - "babel-helper-vue-jsx-merge-props": "^2.0.3", - "babel-loader": "^7.1.1", - "babel-plugin-syntax-jsx": "^6.18.0", - "babel-plugin-transform-runtime": "^6.22.0", - "babel-plugin-transform-vue-jsx": "^3.5.0", - "babel-preset-env": "^1.3.2", - "babel-preset-stage-2": "^6.22.0", - "chalk": "^2.0.1", - "copy-webpack-plugin": "^4.0.1", - "css-loader": "^0.28.0", - "eslint": "^4.15.0", - "eslint-config-standard": "^10.2.1", - "eslint-friendly-formatter": "^3.0.0", - "eslint-loader": "^1.7.1", - "eslint-plugin-import": "^2.7.0", - "eslint-plugin-node": "^5.2.0", - "eslint-plugin-promise": "^3.4.0", - "eslint-plugin-standard": "^3.0.1", - "eslint-plugin-vue": "^4.0.0", - "extract-text-webpack-plugin": "^3.0.0", - "file-loader": "^1.1.4", - "friendly-errors-webpack-plugin": "^1.6.1", - "html-webpack-plugin": "^2.30.1", - "node-notifier": "^5.1.2", - "optimize-css-assets-webpack-plugin": "^3.2.0", - "ora": "^1.2.0", - "portfinder": "^1.0.13", - "postcss-import": "^11.0.0", - "postcss-loader": "^2.0.8", - "postcss-url": "^7.2.1", - "rimraf": "^2.6.0", - "semver": "^5.3.0", - "shelljs": "^0.7.6", - "uglifyjs-webpack-plugin": "^1.1.1", - "url-loader": "^0.5.8", - "vue-loader": "^13.3.0", - "vue-style-loader": "^3.0.1", - "vue-template-compiler": "^2.5.2", - "webpack": "^3.6.0", - "webpack-bundle-analyzer": "^3.6.0", - "webpack-dev-server": "^2.9.1", - "webpack-merge": "^4.1.0" - }, - "engines": { - "node": ">= 6.0.0", - "npm": ">= 3.0.0" - }, - "browserslist": [ - "> 1%", - "last 2 versions", - "not ie <= 8" - ] -} diff --git a/src/ui/jttools/src/App.vue b/src/ui/jttools/src/App.vue deleted file mode 100644 index d0bff8d..0000000 --- a/src/ui/jttools/src/App.vue +++ /dev/null @@ -1,390 +0,0 @@ - - - - - diff --git a/src/ui/jttools/src/main.js b/src/ui/jttools/src/main.js deleted file mode 100644 index ca650d9..0000000 --- a/src/ui/jttools/src/main.js +++ /dev/null @@ -1,15 +0,0 @@ -import Vue from 'vue' -import App from './App' -import iView from 'iview' -import JsonViewer from 'vue-json-viewer' -import 'iview/dist/styles/iview.css' -import 'vue-json-viewer/style.css' - -Vue.config.productionTip = false -Vue.use(iView) -Vue.use(JsonViewer) -/* eslint-disable no-new */ -new Vue({ - el: '#app', - render: h => h(App) -}) diff --git a/src/ui/jttools/static/.gitkeep b/src/ui/jttools/static/.gitkeep deleted file mode 100644 index e69de29..0000000