From 79d80ca21b022f2b47018f1a81bb7e6cdd71ddf9 Mon Sep 17 00:00:00 2001 From: bicijinlian Date: Wed, 11 Nov 2020 22:43:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=B8=8E=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AccessStudy.Core/AccessDB/Demo.accdb | Bin 884736 -> 884736 bytes AccessStudy.Core/AccessDB/Demo.mdb | Bin 327680 -> 327680 bytes AccessStudy.Core/IDbUtil.cs | 12 +-- AccessStudy.Core/Student.cs | 22 ++++ AccessStudy.Core/StudentServer.cs | 101 +++++++++++++++++- AccessStudy.CoreTest/UseXunit.cs | 2 +- .../Controllers/DefaultController.cs | 35 ------ .../AccessStudy.WebApi.csproj | 4 - .../Controllers/WeatherForecastController.cs | 10 +- .../Program.cs | 12 +-- .../Properties/launchSettings.json | 6 +- .../Startup.cs | 15 ++- .../WeatherForecast.cs | 2 +- .../appsettings.Development.json | 0 .../appsettings.json | 0 AccessStudy.sln | 12 +-- 16 files changed, 154 insertions(+), 79 deletions(-) delete mode 100644 AccessStudy.OledbApi/Controllers/DefaultController.cs rename AccessStudy.OledbApi/AccessStudy.OledbApi.csproj => AccessStudy.WebApi/AccessStudy.WebApi.csproj (56%) rename {AccessStudy.OledbApi => AccessStudy.WebApi}/Controllers/WeatherForecastController.cs (92%) rename {AccessStudy.OledbApi => AccessStudy.WebApi}/Program.cs (95%) rename {AccessStudy.OledbApi => AccessStudy.WebApi}/Properties/launchSettings.json (84%) rename {AccessStudy.OledbApi => AccessStudy.WebApi}/Startup.cs (92%) rename {AccessStudy.OledbApi => AccessStudy.WebApi}/WeatherForecast.cs (89%) rename {AccessStudy.OledbApi => AccessStudy.WebApi}/appsettings.Development.json (100%) rename {AccessStudy.OledbApi => AccessStudy.WebApi}/appsettings.json (100%) diff --git a/AccessStudy.Core/AccessDB/Demo.accdb b/AccessStudy.Core/AccessDB/Demo.accdb index 1ce419a2fa354ee78d441804caba40e150e6bc03..e09c011f9a481978a702503f476976a0b61580ef 100644 GIT binary patch delta 1437 zcmd5+|8G-O6hHUgetWO4@3kE?Vq|R>_NDEbwQOsL25h_6Es%+uBqn^(O~;oYmQ)eH z;FrD_GE4|;W5H`M(lsI54+PeB*q87F!$hVD#?2ovCPoF6WF$xz6JtQbysz~w2LA!? z%enXS&OPVcbMO7!qbLzYiR7_}3wYWtE}}7yC=~5;l3)OUZ3|03EtQvMsP_p{U-W#} zGv-aj#?t$Y)85n$JeoJ0bfYAb4aM|8u1>gp=)tz*w_?l@w!mv}5O%^Y*w0YQH=B5f z!Q1Nl4%B5c?R)Q4*nXUTU5g&U_?;sQwMbp4#mzTR@Z?J3cUYJ|rv+iHf@#=IYCat# z9yh(3HCS=Ib2JyB!xC?+z<>>*8zfY9fB?05h+H$fan?CIcV*;Cck+S!g?v~}%7xrb z;>-c~%UYIy9j%T*dbfcDou53cZ>BjvSxuMf$qMI3`s8q?>J*^qMpExQ^|0PgcQlZw z^Ng;qJ5aUv(Zxm*RY&W|O{1yxgr=l#1xVOb%|guwhz0*Mp^gJ8y(KaOk z%xfPNL&Sy6#zHP`ps6NyE&c@5ViS>1In;dBm zC&F@gU0hyU6*kx1xxOxuOmwy;;)%|#Xjh`6Bcw@NRGn)ls^IehtZm3BYzY9PQs zlLnd@@M$2(fWMIIvz2gVGW@yjs-n(;q-&3gr0|>M=>DVA?vR9IEWS-u-x1wz-WThvbR+bwQD@Vcma$I(k7J#?B|<2rWl;?|4Ds%&L(**w56m@eKG5~xi7IL)m? ztu*zdZH#`N&u6(8 zF_mWc{dDsbFVmw_oSiP7=bxv$rnm-r{XB1{A5U?6ocGQ8J(J2kix$=N0e9c5ieGZS znbqG%%~nwjjiY(#|JfJv*G#3fVMbb|KaMKDZ^hW9!WjfHf!^_xril^GUK%%_`>!3N z0(dPDv(c6SdAxMliaqQ+%~R52`Ww|FGC~0cP}l&p&rep+4UI&gm;9tgLTFghYXE|* z>P;JOn+o|!3(c0fgUF$-T;zOiR=oPO%JE9+vRRc@=?my1<1)0dlttR>Cm~i>-mqr1 z#aMH&y25+#)ye7bz@PkR{#{~Zx^jSTc69@242v*QKMF1|u^f%yR__FOmthjmTNypB pb6LruR|9=JK6=^;SW4XV(?0f1op*bARW~@0@$)%(GDrCWT48VK{L?fQ5#B z5{;C?IMc>VqFWCPexK-^7+i>2w4>k(xC+jIv)~d#;kSoG5CwPX%>t;p?T_rziHSk- zrUVuu`@Mn15=a+I(5_FgVq`N8ZF94DkClYUdTjal*(qFJ>d-6QzkBmDqvu&SVvi zp|THL%kicbE1L^|nZKV?o(4O%8TtW^T&%^nEpzRdqAD@9Nr}nzk(x+#L|Lx^w-{?{ z-WO2g>VBnJjYsO_-Ey5=lT-Hg!2W#!C8nrqL}`{IYO}n@Qn{8+*J0|~Sq8vvf1d_G zkb!^&b}+Er0_6;pS)hV}prNA+3lHHx&xvp|7m))HpDY*s`6=rX(U zHVplwqz89x30g#{@7(z_C)aNn@D3hc9F>t-e^i9^%muc`IR*eL|7G0 z(iXxp_0PdsFO}!u%ztW)G_;wcJd!9H5`KA838!SH`L80me_xQu>nGwo{e0M2%5D9| z=ZBd8V~9Nt>Uqq6` z5{ca}(KlY*{ZmY)U(hd=;uemgQJz&Z%1gHsV#J;T0Hy#n0qM0YhD7I;u~Rq<6PReIJb@pW}~JXO3p&NJNCGuxZl$($x6 zajRy#=Re=f_v^2}>F(*aHcwldXJ>8s`I}Ew1pof%e_r`|=HHq!wy&99c~AN8J~`22 zUzT?5A+=|A-P>DN4otoGs;36-eb}D%(D%XZSMRRq?rGhgg1NnJ$60(Z*Wvh$E9}C% zRL9YVM`7jfzpU0vzAX&{%7ISalZG2y8wWRQ*JR0kL0cYQ=)uycNi{#}!F)@*6)}^C zFUNdG)xV98;@i@3I^XEQ)R@)0bW5w5F@uvvgH0Nl{+Pc6ZJwCb<5RFWXYxPp9$Z0f z0{S(=X4nF^!aBHvY6m*!P2#7g;IG9E&0gFj$`f8>qFgf-8%4=;(8rHY#cFZ#cs8As zWni;7c`5@N6AyIO08}gd=b6-oD>C(9EYHNH!lFA9=ZkV)7TuPWg@w_RAu*hVTB8QC zaHY67CmUBQy-x~9jiS`Nr{+*M&`E7hOf1g$?k2sfs8wzC)Ud5^7lhy!)F}R04z3mU z*Zc5BQ9k6uxuPVT>~Jo6HsVsgjoH#7Gk4_uqD0Kv=2aqi`;t*e>K0NsG_8T*LGL3&<0DdbT?*|~3$f=(x>1}Dd z9O9AdNnf4-pio`W$g>vOsiW)~kGKhD5gQ%4Md+~7>=ifI$jAn^B+;wlM|I#YA65eP z1Rxl`x=EcLKBAm(gx^yXmvgtXP%{(HdEdFe*X`QlEVXM7T}Br+t@`+u-sYPdVKuH2 z$BgCcSBCaFSNS0w959J|_;jLl{?S<_)8z**xOCly4o6{o#}q}e^>n<6eBdi3IazcM z0SB;mTDQaTikgG$K<8w-0U^-_bI9X)I(p-!C6EB!t*$d4&baTf+cxa2e4xFkw0O;T zr@Q{T^qD_?dw$231@E@ZeZFhO`Mv)1`VWeB{&!i$QQx`#rr9lbKUcPO@Xe-qH+HynQ*0t-{$&^2zoOFNIl#NCdAioB>s^N4( z8Y3P1VLWR(;nzf0PJ$_RLi$lUHkRO7(+R&OI+0`-2c5>AjY@3dy4IRbqC|U^iNw2V zIG&UyEb*dr%#?W2uOabf45yRQ*y-5+c`vMkC;b}e@`lq%X(V*)lHOWtI_cLyXD2!j z9fl!Am*kMbCSXjlrW1aFMoj~q4S<>PNFzz&O*kEsBcAYUdTYhhVhWy+esoM3&5**( z1G07SgkKX~E(xYFMM@({ylCFB(M=cDbkeV(YsKt4l0dObp1G`1^jSY{;+iS~bun)6 zl~Q*ro1l5snojy13KWA>foGT-oVJ)WihjJ*Ze+1p-{4o`k(3C~W(ppyvdj`S!R5H5 zmzIrionjqN-EZ9RCQ)P?XnLdNqSF*%DRr}nT3A^CQ#hqxN#|s`HVBlTUHVFp%xJ9C zLp)rH-8p16mNa2MxH`0MM2s%FP9wp5~G$k?3S>~LO(olq%_#V>C z#?XjSe?w3kqHbAiX+#>mon~Sw4H3tz#s!#JeUw>eu|zTC1U15GS{BgwXKsU(3~i9o zPd)xgzp*xiU8>@8?6->z3A#wZ4b#rde!IPXaS0rcbWT?zw(Jbrh*}40VFR>46Es5u z9Zht;j<%>8_=*Dcn#5*=%aY(${zQSAZP)fN_>ltjv}@SjL_?vPuF|FieVRw!C{+Cl z-xXBv;0uFl2<`mSfZCG!h{iFQ{=a>F}j(T>JIKy~?*0%E*KU+k0fD2Iw584#}& zIYE*-gQOOIWR_as^#Ud%Z3dVD!bNJ`87A9Lvr`@U8Ocg%JQqqV>erMz$uf6_HXx)l vF3BFtb!OOsut;{I6Mn^bB6F4`+SAc9dx%a-qope!@%~60UF3q#mN@V~hE_k; delta 5667 zcmchbdu$X%9LMLkd%c!I@2>QKmMeFC0DTC3z)@)gE!QiB76f^TU=WH*L_#2FDl%UXjF)zVtGi!Ads{Kg%BQ+5NrS~^*47n+r7ONTH4xVJG0;Y z?fgFTo8LTc%ge3h<<`xvyz4LCd^-2qM-TShNxw?_uAe=8_=>#BhDMKVdR*Zi*)w$d z$z?MiCalcdb7^H|MBLWqdE2GEcdI>1*T=}o0M)Uk+ps0c)MJgsYk?)QX;aEyuB{ud z6a-4PIu5d=nr7ySgEuVpd8H%xGf^@}wxK_J-U`m3Ndf!L3K^Dbv%~FXC?=J?Aj1@D z!dCZ&fozc#dMZ{Wy>+e96@wexz%wJ@$>AppG;==NU{$Pk_JLgclnZnNLvDh9lgV4; zZSpF4jV#1kP4nDt>{cIG#a~zu4~u!(7!Q<}vlC!4FPR-2>}&!Q@SC0e@Mc(FSio=g z^o7ZhHO-?4DUjGK8}=d976`^mHkisSs%%io%aTNVEin-W1#enKZzA|Rbtw^M@`oe) z!7Ea23wJb`mwxX(?Klj0AU9a|Rnow16EyA`NC`bL3QC@=>V~;gY>SOOhq#2lF8Q0{#IxR~>7q zHCI%{$=DRTa9grj?8HiX5F@s3Hb5WKpo(36e2KH69w4haxhmdNBin)2H1{CU__pW}sYQi@U(;Mzy|GcdJ<)iC98FFK7)4qWXpWQrPc6{3WZKL+H9rc6Xypq;9 zzPjAAmNpzcJ?TT|yVnZN{Ys83Qlk*`tD?&fr{huw>FA^J^y#=?4P71zn%Hsav2?T} z!PBSXel>JFOQw~51#O=qU#?{C#1H}(I=X<`gFptiY@}_taz!Glz=3b6xs!Aias6pONdFmq!a0Gh8bJQ4g1tH(RYbk|y+#r$hZtD0IPdDgxu` zsRb623Rp-gVA{FIS$$yPSL}iajO&CSn5v>KG!?OsRK%SNtatua;e`^L)iW_*<(E1@ z*Z%W&&@Y7kI>11gHA#$nmNqAZ)EZ$*gw}yhwEH&%_95t&Dn}#KaCT~mh15!{Sak|8 z)%#JVpTz=2l@r(rvu3x$^-tReA*uQxr2l*U6MmIGcrCJIF>N&RF97%ugS*4%*|pIa zF@Dkza?n>dK=v6RiM^jGKbtWENcSk>gy<8dsob{ynWm3_am^feV6oGfJ-q20*ZkiL zSW~8at75OkmpVvJk=TZ8*}@{T z)r?>_F@mk10ff{kDW_x{RecB0NjaqBe)+5xnS)YPIGvE%OPAN?uM{D4zWWYC /// 表是否存在 @@ -23,7 +23,7 @@ namespace AccessStudy.Core /// /// 获取DataSet /// - DataSet GetDataSet(string sqlText, List parameters = null); + DataSet GetDataSet(string sqlText, List parameters = null); /// /// 获取DataTable @@ -33,7 +33,7 @@ namespace AccessStudy.Core /// /// 获取DataTable /// - DataTable GetDataTable(string sqlText, List parameters = null); + DataTable GetDataTable(string sqlText, List parameters = null); /// /// 获取DataReader @@ -45,19 +45,19 @@ namespace AccessStudy.Core /// 获取DataReader /// 切记：用完之后主动关闭连接 /// - DbDataReader GetDataReader(string sqlText, List parameters = null); + DbDataReader GetDataReader(string sqlText, List parameters = null); /// /// 获取第一行第一列的值 /// 不存在则为null /// - object GetScalar(string sqlText, List parameters = null); + object GetScalar(string sqlText, List parameters = null); /// /// 执行非查询语句 /// /// 受影响行数 - int ExecuteNonQuery(string sqlText, List parameters = null); + int ExecuteNonQuery(string sqlText, List parameters = null); /// /// 打开当前连接 diff --git a/AccessStudy.Core/Student.cs b/AccessStudy.Core/Student.cs index 6db9ed1..d48f97f 100644 --- a/AccessStudy.Core/Student.cs +++ b/AccessStudy.Core/Student.cs @@ -4,12 +4,34 @@ using System.Text; namespace AccessStudy.Core { + /// + /// 学生 + /// public class Student { + /// + /// 编号 + /// public int Id { get; set; } + /// + /// 姓名 + /// public string Name { get; set; } + /// + /// 年龄 + /// public int Age { get; set; } + + /// + /// 地址 + /// + public string Address { get; set; } + + /// + /// 学校 + /// + public string School { get; set; } } } diff --git a/AccessStudy.Core/StudentServer.cs b/AccessStudy.Core/StudentServer.cs index 8d0811a..40a82ae 100644 --- a/AccessStudy.Core/StudentServer.cs +++ b/AccessStudy.Core/StudentServer.cs @@ -1,6 +1,9 @@ using System; using System.Collections.Generic; using System.Data; +using System.Data.OleDb; +using System.Linq; +using System.Linq.Expressions; using System.Text; namespace AccessStudy.Core @@ -9,19 +12,110 @@ namespace AccessStudy.Core { private OledbUtil dbUtil = new OledbUtil(); + /// + /// 获取所有学生 + /// + /// public List GetAll() + { + var dataTable = dbUtil.GetDataTable("Student"); + List students = DataTable2Model(dataTable); + + return students; + } + + /// + /// 按标识查询学生 + /// + public Student Get(int studentId) + { + var querySql = "select * from Student where Id=@studentId"; + var paras = new List() + { + new OleDbParameter("studentId",studentId) + }; + var dataTable = dbUtil.GetDataTable(querySql, paras); + + return DataTable2Model(dataTable).FirstOrDefault(); + } + + /// + /// 添加学生 + /// + public bool Add(Student student) + { + var querySql = "INSERT INTO `Student` (Name,Age,Address,School) VALUES(@Name,@Age,@Address,@School); "; + var paras = new List() + { + new OleDbParameter("Id",student.Id), + new OleDbParameter("Name",student.Name), + new OleDbParameter("Age",student.Age), + new OleDbParameter("Address",student.Address), + new OleDbParameter("School",student.School), + }; + + var effectRow = dbUtil.ExecuteNonQuery(querySql, paras); + + return effectRow > 0; + } + + /// + /// 更新学生 + /// + public bool Update(Student student) + { + var querySql = "Update Student Set Name=@Name,Age=@Age,Address=@Address,School=@School where Id=@Id;"; + var paras = new List() + { + new OleDbParameter("Id",student.Id), + new OleDbParameter("Name",student.Name), + new OleDbParameter("Age",student.Age), + new OleDbParameter("Address",student.Address), + new OleDbParameter("School",student.School), + }; + + var effectRow = dbUtil.ExecuteNonQuery(querySql, paras); + + return effectRow > 0; + } + + /// + /// 删除学生 + /// + public bool Delete(int studentId) + { + var querySql = "DELETE FROM Student WHERE Id = @Id; "; + var paras = new List() + { + new OleDbParameter("Id",studentId), + }; + + var effectRow = dbUtil.ExecuteNonQuery(querySql, paras); + + return effectRow > 0; + } + + /// + /// DataTable转实体列表 + /// + public List DataTable2Model(DataTable dTable) { List students = new List(); - var dataTable = dbUtil.GetDataTable("Student"); + if (dTable==null) + { + return students; + } - foreach (DataRow row in dataTable.Rows) + foreach (DataRow row in dTable.Rows) { var student = new Student() { Id = (int)row["Id"], - Name=row["Name"].ToString(), + Name = row["Name"]?.ToString() ?? "", Age = (int)row["Age"], + Address = row["Address"]?.ToString() ?? "", + School = row["School"]?.ToString() ?? "", }; students.Add(student); @@ -29,5 +123,6 @@ namespace AccessStudy.Core return students; } + } } diff --git a/AccessStudy.CoreTest/UseXunit.cs b/AccessStudy.CoreTest/UseXunit.cs index f2b340e..a38a974 100644 --- a/AccessStudy.CoreTest/UseXunit.cs +++ b/AccessStudy.CoreTest/UseXunit.cs @@ -9,7 +9,7 @@ namespace AccessStudy.CoreTest [Fact] public void Test() { - Assert.True(true,"ʹXunitԪ!"); + Assert.True(true,"使用xUnit"); } } } diff --git a/AccessStudy.OledbApi/Controllers/DefaultController.cs b/AccessStudy.OledbApi/Controllers/DefaultController.cs deleted file mode 100644 index 88f180a..0000000 --- a/AccessStudy.OledbApi/Controllers/DefaultController.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -using AccessStudy.Core; - -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Logging; - -namespace AccessStudy.OledbApi.Controllers -{ - [Route("api/[controller]/[action]")] - [ApiController] - public class DefaultController : ControllerBase - { - private readonly ILogger _logger; - private readonly StudentServer _studentServer; - - public DefaultController(ILogger logger,StudentServer studentServer) - { - _logger = logger; - _studentServer = studentServer; - } - - public IActionResult Index() - { - - var students = _studentServer.GetAll(); - - return new JsonResult(students); - } - } -} diff --git a/AccessStudy.OledbApi/AccessStudy.OledbApi.csproj b/AccessStudy.WebApi/AccessStudy.WebApi.csproj similarity index 56% rename from AccessStudy.OledbApi/AccessStudy.OledbApi.csproj rename to AccessStudy.WebApi/AccessStudy.WebApi.csproj index d73f0a1..d12c450 100644 --- a/AccessStudy.OledbApi/AccessStudy.OledbApi.csproj +++ b/AccessStudy.WebApi/AccessStudy.WebApi.csproj @@ -4,9 +4,5 @@ netcoreapp3.1 - - - - diff --git a/AccessStudy.OledbApi/Controllers/WeatherForecastController.cs b/AccessStudy.WebApi/Controllers/WeatherForecastController.cs similarity index 92% rename from AccessStudy.OledbApi/Controllers/WeatherForecastController.cs rename to AccessStudy.WebApi/Controllers/WeatherForecastController.cs index ad36b1d..03c9242 100644 --- a/AccessStudy.OledbApi/Controllers/WeatherForecastController.cs +++ b/AccessStudy.WebApi/Controllers/WeatherForecastController.cs @@ -1,12 +1,12 @@ -using System; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; + +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Logging; - -namespace AccessStudy.OledbApi.Controllers +namespace AccessStudy.WebApi.Controllers { [ApiController] [Route("[controller]")] diff --git a/AccessStudy.OledbApi/Program.cs b/AccessStudy.WebApi/Program.cs similarity index 95% rename from AccessStudy.OledbApi/Program.cs rename to AccessStudy.WebApi/Program.cs index ebd5376..6640204 100644 --- a/AccessStudy.OledbApi/Program.cs +++ b/AccessStudy.WebApi/Program.cs @@ -1,14 +1,14 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -namespace AccessStudy.OledbApi +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace AccessStudy.WebApi { public class Program { diff --git a/AccessStudy.OledbApi/Properties/launchSettings.json b/AccessStudy.WebApi/Properties/launchSettings.json similarity index 84% rename from AccessStudy.OledbApi/Properties/launchSettings.json rename to AccessStudy.WebApi/Properties/launchSettings.json index a69b475..509bb83 100644 --- a/AccessStudy.OledbApi/Properties/launchSettings.json +++ b/AccessStudy.WebApi/Properties/launchSettings.json @@ -4,7 +4,7 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:30078", + "applicationUrl": "http://localhost:12854", "sslPort": 0 } }, @@ -17,10 +17,10 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "AccessStudy.OledbApi": { + "AccessStudy.WebApi": { "commandName": "Project", "launchBrowser": true, - "launchUrl": "api/Default/Index", + "launchUrl": "weatherforecast", "applicationUrl": "http://localhost:5000", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" diff --git a/AccessStudy.OledbApi/Startup.cs b/AccessStudy.WebApi/Startup.cs similarity index 92% rename from AccessStudy.OledbApi/Startup.cs rename to AccessStudy.WebApi/Startup.cs index 51fb308..8ad109c 100644 --- a/AccessStudy.OledbApi/Startup.cs +++ b/AccessStudy.WebApi/Startup.cs @@ -1,10 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -using AccessStudy.Core; - using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; @@ -13,7 +6,12 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -namespace AccessStudy.OledbApi +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace AccessStudy.WebApi { public class Startup { @@ -28,7 +26,6 @@ namespace AccessStudy.OledbApi public void ConfigureServices(IServiceCollection services) { services.AddControllers(); - services.AddScoped(); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. diff --git a/AccessStudy.OledbApi/WeatherForecast.cs b/AccessStudy.WebApi/WeatherForecast.cs similarity index 89% rename from AccessStudy.OledbApi/WeatherForecast.cs rename to AccessStudy.WebApi/WeatherForecast.cs index beb937b..775e0c0 100644 --- a/AccessStudy.OledbApi/WeatherForecast.cs +++ b/AccessStudy.WebApi/WeatherForecast.cs @@ -1,6 +1,6 @@ using System; -namespace AccessStudy.OledbApi +namespace AccessStudy.WebApi { public class WeatherForecast { diff --git a/AccessStudy.OledbApi/appsettings.Development.json b/AccessStudy.WebApi/appsettings.Development.json similarity index 100% rename from AccessStudy.OledbApi/appsettings.Development.json rename to AccessStudy.WebApi/appsettings.Development.json diff --git a/AccessStudy.OledbApi/appsettings.json b/AccessStudy.WebApi/appsettings.json similarity index 100% rename from AccessStudy.OledbApi/appsettings.json rename to AccessStudy.WebApi/appsettings.json diff --git a/AccessStudy.sln b/AccessStudy.sln index 9bd8abb..a5f0037 100644 --- a/AccessStudy.sln +++ b/AccessStudy.sln @@ -5,9 +5,9 @@ VisualStudioVersion = 16.0.30621.155 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AccessStudy.Core", "AccessStudy.Core\AccessStudy.Core.csproj", "{0670AFE2-3712-44A0-883B-4392E9FD2E73}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AccessStudy.OledbApi", "AccessStudy.OledbApi\AccessStudy.OledbApi.csproj", "{A2D5ADA0-2D19-4AB3-AAED-4397727D5866}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AccessStudy.CoreTest", "AccessStudy.CoreTest\AccessStudy.CoreTest.csproj", "{B0118C4C-10D8-4515-A336-A90479024D7C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AccessStudy.CoreTest", "AccessStudy.CoreTest\AccessStudy.CoreTest.csproj", "{B0118C4C-10D8-4515-A336-A90479024D7C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AccessStudy.WebApi", "AccessStudy.WebApi\AccessStudy.WebApi.csproj", "{2858AA9B-4F2B-4591-9179-033139719704}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -19,14 +19,14 @@ Global {0670AFE2-3712-44A0-883B-4392E9FD2E73}.Debug|Any CPU.Build.0 = Debug|Any CPU {0670AFE2-3712-44A0-883B-4392E9FD2E73}.Release|Any CPU.ActiveCfg = Release|Any CPU {0670AFE2-3712-44A0-883B-4392E9FD2E73}.Release|Any CPU.Build.0 = Release|Any CPU - {A2D5ADA0-2D19-4AB3-AAED-4397727D5866}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2D5ADA0-2D19-4AB3-AAED-4397727D5866}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2D5ADA0-2D19-4AB3-AAED-4397727D5866}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2D5ADA0-2D19-4AB3-AAED-4397727D5866}.Release|Any CPU.Build.0 = Release|Any CPU {B0118C4C-10D8-4515-A336-A90479024D7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B0118C4C-10D8-4515-A336-A90479024D7C}.Debug|Any CPU.Build.0 = Debug|Any CPU {B0118C4C-10D8-4515-A336-A90479024D7C}.Release|Any CPU.ActiveCfg = Release|Any CPU {B0118C4C-10D8-4515-A336-A90479024D7C}.Release|Any CPU.Build.0 = Release|Any CPU + {2858AA9B-4F2B-4591-9179-033139719704}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2858AA9B-4F2B-4591-9179-033139719704}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2858AA9B-4F2B-4591-9179-033139719704}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2858AA9B-4F2B-4591-9179-033139719704}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE