diff --git a/.gitignore b/.gitignore index 304bb52a6b4bae264fac9fd417c3d3ca2cffafbe..6f907fdaa3246f294e646f0691d674cc2935d023 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,367 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Oo]ut/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + /Vol.Vue/node_modules /Vue.Net/VOL.Web/bin /Vue.Net/VOL.WebApi/bin @@ -40,3 +404,4 @@ /开发版dev/Vue.NetCore/Vue.Net/.vs/* /Vue.Net/_ReSharper.Caches/ReSharperPlatformVs16192_607b9a31.VOL.00 /开发版dev/Vue.NetCore/Vue.Net/VOL.WebApi/Download/Logger/Queue/WriteError + diff --git a/README.md b/README.md index bc7ca553cc3cb5572c0509a346309e3445c17f70..47975b344ced1fcd187ee7ad8f8806d5fc32b152 100644 --- a/README.md +++ b/README.md @@ -31,69 +31,69 @@ ## App/H5开发 - http://v2.volcore.xyz/app/guide ## 框架已支持Vue3版本 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/v3.png) +![Home](/imgs/v3.png) ## 框架已增加低代码设计器 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/fd01.png) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/fd02.png) +![Home](/imgs/fd01.png) +![Home](/imgs/fd02.png) ## 框架2.0已更新(部分新增功能截图) 增加切换皮肤功能 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/h.png) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/home_them.png) +![Home](/imgs/h.png) +![Home](/imgs/home_them.png) 增加可复用的后台请求参数校验 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/validator.png) +![Home](/imgs/validator.png) 增加树形菜单与代码生成页面使用 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/x7tree.png) +![Home](/imgs/x7tree.png) 增加文本编辑器直接发布静态页面功能 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/editor.png) +![Home](/imgs/editor.png) 一对一多从表显示(只需要少量代码就可完成成，其他都由代码生成器生成) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/m1.png) +![Home](/imgs/m1.png) 表合并显示 (只需要几行代码完成代码生成器生成的页面实现扩展) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/span.png) +![Home](/imgs/span.png) 从图上传图片 (只需要几行代码完成代码生成器生成的页面实现扩展) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/p1.png) +![Home](/imgs/p1.png) 一对多从表(不限从表数量)扩展 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/multi.png) +![Home](/imgs/multi.png) 图表 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/charts.png) +![Home](/imgs/charts.png) ## 1、只读基础表单 整个只读的基础表单的所有前后端代码，全部由代码生成器生成，代码生成器中几乎不需要配置，并支持并后端业务代码扩展，直接生成代码后，配置菜单权限即可 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/table1.png) +![Home](/imgs/table1.png) ## 2、自动绑定下拉框数据表单 整个自动绑定下拉框数据表单的所有前后端代码，全部由代码生成器生成，并支持并后端业务代码扩展，在代码生成器中只需要指定数据源编号，页面加载时会根据编号自动加载数据源并绑定 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/table2.png) +![Home](/imgs/table2.png) ## 3、启用图片支持、审核表单 整个启用图片支持、审核表单的所有前后端代码，全部由代码生成器生成，并支持并后端业务代码扩展，审核功能需要在菜单配置权限、代码生成器中勾选启用图片支持 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/table3.png) +![Home](/imgs/table3.png) ## 4、高级查询 整个表单的所有前后端代码，全部由代码生成器生成，并支持并后端业务代码扩展，查询字段、类型(下拉框、日期、TextArea等)、所在行与列都由代码生成器完成，不需要写任何代码 - ![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/tablesearch4.png) + ![Home](/imgs/tablesearch4.png) ## 5、主从表新建、编辑 主从表新建、编辑所有前后端代码，全部由代码生成器生成，并支持并后端业务代码扩展，新建、编辑从表配置、字段、类型(下拉框、日期、TextArea等)、所在行与列、字段是否只读、标签显示的长度等都由代码生成器完成，不需要写任何代码 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/editTbale2.png) +![Home](/imgs/editTbale2.png) ## 6、excel导入 excel导入整个页面都由代码生成器生成，导入的字段、字段是否必填，下载模板也由代码生成器上配置(自己根据实际需要决定是否采用此方法)，导入时会验证是否为空与数据的合法性，逻辑校验自己实现扩展方法即可 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/importTable1.png) +![Home](/imgs/importTable1.png) ## 7、H5开发 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/h5.jpg) +![Home](/imgs/h5.jpg) ## 8、权限分配 目前只实现了对用户的角色的Action进行权限分配 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/auth.png) +![Home](/imgs/auth.png) ## 9、代码生成器 代码生成器提供了20多种可配置的属性，可灵活配置显示、查询、编辑、导入、导出、主从关系等功能点击看代码生成器文档 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/coder.png) +![Home](/imgs/coder.png) 其他功能。。。。。 diff --git a/Vue.Net/VOL.AppManager/VOL.AppManager.csproj b/Vue.Net/VOL.AppManager/VOL.AppManager.csproj index 120d34f4fde63d9c7efd5e58f5af5728f69e53d2..312ec8360c5f5c336e25df0bde8dec8a9fc6871e 100644 --- a/Vue.Net/VOL.AppManager/VOL.AppManager.csproj +++ b/Vue.Net/VOL.AppManager/VOL.AppManager.csproj @@ -8,7 +8,7 @@ - netcoreapp3.1 + net6.0 VOL.AppManager Library @@ -18,10 +18,10 @@ - - - - + + + + diff --git a/Vue.Net/VOL.Builder/VOL.Builder.csproj b/Vue.Net/VOL.Builder/VOL.Builder.csproj index 3c77e62f23888bfebb1044d95b377e581c9e0627..ec268db307ce8bb92cbfe8ae2fb118ffaef7cf7e 100644 --- a/Vue.Net/VOL.Builder/VOL.Builder.csproj +++ b/Vue.Net/VOL.Builder/VOL.Builder.csproj @@ -8,7 +8,7 @@ - netcoreapp3.1 + net6.0 Library @@ -17,11 +17,11 @@ - - - - - + + + + + diff --git a/Vue.Net/VOL.Core/DBManager/DBServerProvider.cs b/Vue.Net/VOL.Core/DBManager/DBServerProvider.cs index 30bfac727661ca6ecfbabff75f0e8251fd8cd701..81e0f7fbf1254d1a16013c4007bb51749ec2a303 100644 --- a/Vue.Net/VOL.Core/DBManager/DBServerProvider.cs +++ b/Vue.Net/VOL.Core/DBManager/DBServerProvider.cs @@ -1,4 +1,5 @@ using Microsoft.EntityFrameworkCore; +using MySqlConnector; using Npgsql; using System; using System.Collections.Generic; @@ -60,19 +61,19 @@ namespace VOL.Core.DBManager } public static IDbConnection GetDbConnection(string connString = null) { - if (connString==null) + if (connString == null) { connString = ConnectionPool[DefaultConnName]; - } + } if (DBType.Name == DbCurrentType.MySql.ToString()) { - return new MySql.Data.MySqlClient.MySqlConnection(connString); + return new MySqlConnection(connString); } if (DBType.Name == DbCurrentType.PgSql.ToString()) { return new NpgsqlConnection(connString); } - return new SqlConnection(connString); + return new SqlConnection(connString); } @@ -82,16 +83,16 @@ namespace VOL.Core.DBManager /// 如果connString为null 执行重载GetDbConnection(string connString = null) /// 指定连接数据库的类型：MySql/MsSql/PgSql /// - public static IDbConnection GetDbConnection(string connString = null, DbCurrentType dbCurrentType=DbCurrentType.Default) + public static IDbConnection GetDbConnection(string connString = null, DbCurrentType dbCurrentType = DbCurrentType.Default) { //默认获取DbConnection - if (connString.IsNullOrEmpty()|| DbCurrentType.Default== dbCurrentType) + if (connString.IsNullOrEmpty() || DbCurrentType.Default == dbCurrentType) { return GetDbConnection(connString); } - if (dbCurrentType==DbCurrentType.MySql) + if (dbCurrentType == DbCurrentType.MySql) { - return new MySql.Data.MySqlClient.MySqlConnection(connString); + return new MySqlConnection(connString); } if (dbCurrentType == DbCurrentType.PgSql) { diff --git a/Vue.Net/VOL.Core/Dapper/SqlDapper.cs b/Vue.Net/VOL.Core/Dapper/SqlDapper.cs index 1de67cae15f0920500dbe792ed2e53a4186aaedb..bdcdb9e218a0ad8f68ed56383d1ea5cb12139728 100644 --- a/Vue.Net/VOL.Core/Dapper/SqlDapper.cs +++ b/Vue.Net/VOL.Core/Dapper/SqlDapper.cs @@ -1,6 +1,6 @@  using Dapper; -using MySql.Data.MySqlClient; +using MySqlConnector; using System; using System.Collections.Generic; using System.Data; @@ -82,10 +82,10 @@ namespace VOL.Core.Dapper dbTransaction.Commit(); return reslutT; } - catch (Exception ex) + catch (Exception) { dbTransaction?.Rollback(); - throw ex; + throw; } finally { @@ -130,10 +130,10 @@ namespace VOL.Core.Dapper } return reslutT; } - catch (Exception ex) + catch (Exception) { dbTransaction?.Rollback(); - throw ex; + throw; } } } @@ -800,9 +800,9 @@ namespace VOL.Core.Dapper } } - catch (Exception ex) + catch (Exception) { - throw ex; + throw; } return insertCount; // File.Delete(path); diff --git a/Vue.Net/VOL.Core/EFDbContext/VOLContext.cs b/Vue.Net/VOL.Core/EFDbContext/VOLContext.cs index a4da6612402bb32fd96cdf62ba31551cc7c415f2..4fe1a6e89abdec057d12c0d95b676c6de5bc4a49 100644 --- a/Vue.Net/VOL.Core/EFDbContext/VOLContext.cs +++ b/Vue.Net/VOL.Core/EFDbContext/VOLContext.cs @@ -74,7 +74,7 @@ namespace VOL.Core.EFDbContext string connectionString = DBServerProvider.GetConnectionString(null); if (Const.DBType.Name == Enums.DbCurrentType.MySql.ToString()) { - optionsBuilder.UseMySql(connectionString); + optionsBuilder.UseMySql(connectionString, ServerVersion.AutoDetect(connectionString)); } else if (Const.DBType.Name == Enums.DbCurrentType.PgSql.ToString()) { @@ -113,7 +113,7 @@ namespace VOL.Core.EFDbContext .ToList().ForEach(t => { modelBuilder.Entity(t); - // modelBuilder.Model.AddEntityType(t); + // modelBuilder.Model.AddEntityType(t); }); } //modelBuilder.AddEntityConfigurationsFromAssembly(GetType().Assembly); diff --git a/Vue.Net/VOL.Core/Extensions/AutofacManager/AutofacContainerModuleExtension.cs b/Vue.Net/VOL.Core/Extensions/AutofacManager/AutofacContainerModuleExtension.cs index a0169cd2c1337456ebf8d86235bc7b97d3f1e841..9006ac06b2a040901969b1c02b1b37510efb220f 100644 --- a/Vue.Net/VOL.Core/Extensions/AutofacManager/AutofacContainerModuleExtension.cs +++ b/Vue.Net/VOL.Core/Extensions/AutofacManager/AutofacContainerModuleExtension.cs @@ -72,7 +72,7 @@ namespace VOL.Core.Extensions //services.AddDbContext(); //mysql8.x的版本使用Pomelo.EntityFrameworkCore.MySql 3.1会产生异常，需要在字符串连接上添加allowPublicKeyRetrieval=true - services.AddDbContextPool(optionsBuilder => { optionsBuilder.UseMySql(connectionString); }, 64); + services.AddDbContextPool(optionsBuilder => { optionsBuilder.UseMySql(connectionString, ServerVersion.AutoDetect(connectionString)); }, 64); } else if (DBType.Name == DbCurrentType.PgSql.ToString()) { diff --git a/Vue.Net/VOL.Core/Extensions/ObjectExtension.cs b/Vue.Net/VOL.Core/Extensions/ObjectExtension.cs index 54ac87df4253c7d34e0336d22762f1712bffad45..ff701ab620e6447785ac7d10672fe3535dbc7760 100644 --- a/Vue.Net/VOL.Core/Extensions/ObjectExtension.cs +++ b/Vue.Net/VOL.Core/Extensions/ObjectExtension.cs @@ -56,7 +56,7 @@ namespace VOL.Core.Extensions rowList.Add(row); } } - catch (Exception ex) { throw ex; } + catch (Exception ) { throw; } finally { Reader.Close(); @@ -125,10 +125,9 @@ namespace VOL.Core.Extensions objectList.Add(model); } } - catch (Exception ex) + catch (Exception) { - - throw ex; + throw; } finally { diff --git a/Vue.Net/VOL.Core/Infrastructure/DictionaryManager.cs b/Vue.Net/VOL.Core/Infrastructure/DictionaryManager.cs index cf4e994d4bce14975e7ae48ef497c83381f972c5..3ac0e319f83823e017a73d07edd7f73fd0febeef 100644 --- a/Vue.Net/VOL.Core/Infrastructure/DictionaryManager.cs +++ b/Vue.Net/VOL.Core/Infrastructure/DictionaryManager.cs @@ -51,7 +51,7 @@ namespace VOL.Core.Infrastructure catch (Exception ex) { Logger.Error($"字典执行sql异常,sql:{sql},异常信息：{ex.Message + ex.StackTrace}"); - throw ex; + throw; // Console.WriteLine(ex.Message); // return null; } diff --git a/Vue.Net/VOL.Core/KafkaManager/Service/KafkaProducer.cs b/Vue.Net/VOL.Core/KafkaManager/Service/KafkaProducer.cs index e5a767eb71beb0e001960936a001c723a82c0b7a..4a45103c40e66e9989ef0721597fac28b1763259 100644 --- a/Vue.Net/VOL.Core/KafkaManager/Service/KafkaProducer.cs +++ b/Vue.Net/VOL.Core/KafkaManager/Service/KafkaProducer.cs @@ -16,14 +16,6 @@ namespace VOL.Core.KafkaManager.Service /// Message.Value 的数据类型 public class KafkaProducer : KafkaConfig, IKafkaProducer { - /// - /// 构造生产者 - /// - protected KafkaProducer() - { - - } - /// /// Kafka地址(包含端口号) /// diff --git a/Vue.Net/VOL.Core/VOL.Core.csproj b/Vue.Net/VOL.Core/VOL.Core.csproj index db8bb9455ccc13d7ea1713bd4d48c16240e8d299..feeb1d4103320c0b616dd1c6a69fdf18a8769061 100644 --- a/Vue.Net/VOL.Core/VOL.Core.csproj +++ b/Vue.Net/VOL.Core/VOL.Core.csproj @@ -8,7 +8,7 @@ - netcoreapp3.1 + net6.0 Library @@ -35,26 +35,26 @@ - - - + + + - - - + + + - - - - + + + + - - - + + + - - + + diff --git a/Vue.Net/VOL.Entity/VOL.Entity.csproj b/Vue.Net/VOL.Entity/VOL.Entity.csproj index e3e431e2df4c2bc2a0123d4d2ca44e8ed98c093c..9b852448d3084287efb278010effe497e22ca252 100644 --- a/Vue.Net/VOL.Entity/VOL.Entity.csproj +++ b/Vue.Net/VOL.Entity/VOL.Entity.csproj @@ -8,7 +8,7 @@ - netcoreapp3.1 + net6.0 @@ -18,10 +18,10 @@ - - - - + + + + diff --git a/Vue.Net/VOL.Order/VOL.Order.csproj b/Vue.Net/VOL.Order/VOL.Order.csproj index e661e28d9d61db163a358665aed4d5cae4a1beb4..a4277b776d49fd42621fa26d37af295181929b0a 100644 --- a/Vue.Net/VOL.Order/VOL.Order.csproj +++ b/Vue.Net/VOL.Order/VOL.Order.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6.0 Library diff --git a/Vue.Net/VOL.System/VOL.System.csproj b/Vue.Net/VOL.System/VOL.System.csproj index d0807e6dc16f0ba21d461a4141958c4d557bee50..01992460c5e0ab7527995ff43d83aa1f518aba6b 100644 --- a/Vue.Net/VOL.System/VOL.System.csproj +++ b/Vue.Net/VOL.System/VOL.System.csproj @@ -8,7 +8,7 @@ - netcoreapp3.1 + net6.0 Library @@ -17,11 +17,11 @@ - - - - - + + + + + diff --git a/Vue.Net/VOL.WebApi/VOL.WebApi.csproj b/Vue.Net/VOL.WebApi/VOL.WebApi.csproj index a7b96cfa8b0c904e39c151c1e1fe5cf850ea2339..257f796a6a6707878ad808296f18c5b364303f10 100644 --- a/Vue.Net/VOL.WebApi/VOL.WebApi.csproj +++ b/Vue.Net/VOL.WebApi/VOL.WebApi.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6.0 enable @@ -18,10 +18,10 @@ - - + + - +