diff --git a/src/JTTools.Test/JTTools.Test.csproj b/src/JTTools.Test/JTTools.Test.csproj index a5d9448..f71cb67 100644 --- a/src/JTTools.Test/JTTools.Test.csproj +++ b/src/JTTools.Test/JTTools.Test.csproj @@ -1,14 +1,14 @@  - netcoreapp3.0 + netcoreapp3.1 false - - + + all diff --git a/src/JTTools/JTTools.csproj b/src/JTTools/JTTools.csproj index e95b8d1..cdbfa25 100644 --- a/src/JTTools/JTTools.csproj +++ b/src/JTTools/JTTools.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 InProcess @@ -11,15 +11,15 @@ - - - + + + - + - - + + diff --git a/src/JTTools/Program.cs b/src/JTTools/Program.cs index f0b5dff..3e597f8 100644 --- a/src/JTTools/Program.cs +++ b/src/JTTools/Program.cs @@ -28,16 +28,19 @@ namespace JTTools { services.AddControllers() //Microsoft.AspNetCore.Mvc.NewtonsoftJson - //.AddNewtonsoftJson(jsonOptions => + .AddNewtonsoftJson(jsonOptions => + { + jsonOptions.SerializerSettings.Converters.Add(new ByteArrayHexConverter()); + jsonOptions.SerializerSettings.ContractResolver = new DefaultContractResolver(); + //jsonOptions.SerializerSettings.Formatting = Newtonsoft.Json.Formatting.Indented; + }) + //.AddJsonOptions(jsonOptions => //{ - // jsonOptions.SerializerSettings.Converters.Add(new ByteArrayHexConverter()); - // jsonOptions.SerializerSettings.ContractResolver = new DefaultContractResolver(); - // jsonOptions.SerializerSettings.Formatting = Newtonsoft.Json.Formatting.Indented; + // jsonOptions.JsonSerializerOptions.MaxDepth = 64; + + // jsonOptions.JsonSerializerOptions.Converters.Add(new ByteArrayHexTextJsonConverter()); //}) - .AddJsonOptions(jsonOptions => - { - jsonOptions.JsonSerializerOptions.Converters.Add(new ByteArrayHexTextJsonConverter()); - }); + ; services.AddCors(options => options.AddPolicy("Domain", builder => builder.WithOrigins(hostingContext.Configuration.GetSection("AllowedOrigins").Value.Split(",")) diff --git a/src/ui/jttools/.eslintignore b/src/ui/jttools/.eslintignore index e1fcc9c..f5d3a82 100644 --- a/src/ui/jttools/.eslintignore +++ b/src/ui/jttools/.eslintignore @@ -2,3 +2,4 @@ /config/ /dist/ /*.js +/*.vue diff --git a/src/ui/jttools/.eslintrc.js b/src/ui/jttools/.eslintrc.js index 22fdce8..7c86fec 100644 --- a/src/ui/jttools/.eslintrc.js +++ b/src/ui/jttools/.eslintrc.js @@ -22,6 +22,8 @@ module.exports = { // 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/src/App.vue b/src/ui/jttools/src/App.vue index 2bf8de2..2c88856 100644 --- a/src/ui/jttools/src/App.vue +++ b/src/ui/jttools/src/App.vue @@ -20,7 +20,6 @@ - @@ -109,92 +108,93 @@ + >Copyright © 2015-2019 SmallChi. All Rights Reserved. 粤ICP备19128140号