Commit 6eaf7c4

authored

Merge pull request liaozb#3 from liaozb/master

同步代码

2 parents aab939b + 0a05a5b commit 6eaf7c4Copy full SHA for 6eaf7c4

File tree

+14

-6

lines changed

+14

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,11 @@`
`22`	`22`	`<PackageReference Include="Microsoft.AspNetCore.Rewrite" Version="2.1.1" />`
`23`	`23`	`<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.1.3" />`
`24`	`24`	`<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.5" />`
`25`		`- <PackageReference Include="MySql.Data" Version="8.0.12" />`
	`25`	`+ <PackageReference Include="MySql.Data" Version="8.0.13" />`
`26`	`26`	`<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.18.3" />`
`27`	`27`	`<PackageReference Include="SqlKata" Version="1.1.3" />`
`28`	`28`	`<PackageReference Include="SqlKata.Execution" Version="1.1.3" />`
`29`		`- <PackageReference Include="sqlSugarCore" Version="4.8.1" />`
	`29`	`+ <PackageReference Include="sqlSugarCore" Version="4.8.5" />`
`30`	`30`	`<PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />`
`31`	`31`	`<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="3.0.0" />`
`32`	`32`	`<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="3.0.0" />`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ public ActionResult Remove([FromBody]string json)`
`292`	`292`	`string key = item.Key.Trim();`
`293`	`293`	`var value = JObject.Parse(item.Value.ToString());`
`294`	`294`	`var sb = new System.Text.StringBuilder(100);`
`295`		`- sb.Append($"delete FROM {key} where");`
	`295`	`+ sb.Append($"delete FROM {key} where");`
`296`	`296`	`if (role.Delete==null\|\|role.Delete.Table==null)`
`297`	`297`	`{`
`298`	`298`	`ht["code"] = "500";`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,14 @@ public DbContext(IConfiguration options)`
`18`	`18`	`IsAutoCloseConnection = true,`
`19`	`19`	`InitKeyType= InitKeyType.Attribute`
`20`	`20`	`});`
	`21`	`+ Db.Aop.OnLogExecuted = (sql, pars) => //SQL执行完事件`
	`22`	`+ {`
	`23`	`+`
	`24`	`+ };`
	`25`	`+ Db.Aop.OnLogExecuting = (sql, pars) => //SQL执行前事件`
	`26`	`+ {`
	`27`	`+`
	`28`	`+ };`
`21`	`29`	`}`
`22`	`30`	`public SqlSugarClient Db;`
`23`	`31`	`public DbSet<Login> LoginDb { get { return new DbSet<Login>(Db); } }`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"ConnectionStrings": {`
`3`		`- "DbType": 0, //0:MySql,1:SqlServer,2:Sqlite`
`4`		`- //"ConnectionString": "Server=liaozengbo\\sql2018; Database=test; User Id=sa;Password=sa123;",`
`5`		`- "ConnectionString": "Server=119.29.9.25;Port=3306;Database=test;Uid=root;Pwd=1q,2w.3e?;CharSet=UTF8;"`
	`3`	`+ "DbType": 1, //0:MySql,1:SqlServer,2:Sqlite`
	`4`	`+ "ConnectionString": "Server=liaozengbo\\sql2018; Database=Sample; User Id=sa;Password=sa123;"`
	`5`	`+ //"ConnectionString": "Server=119.29.9.25;Port=3306;Database=test;Uid=root;Pwd=1q,2w.3e?;CharSet=UTF8;"`
`6`	`6`	`},`
`7`	`7`	`"Authentication": {`
`8`	`8`	`"JwtBearer": {`

Comments

(0)