diff --git a/YiSha.Business/YiSha.Business.AutoJob/YiSha.Business.AutoJob.csproj b/YiSha.Business/YiSha.Business.AutoJob/YiSha.Business.AutoJob.csproj index 8ff76818..66c0bfe8 100644 --- a/YiSha.Business/YiSha.Business.AutoJob/YiSha.Business.AutoJob.csproj +++ b/YiSha.Business/YiSha.Business.AutoJob/YiSha.Business.AutoJob.csproj @@ -1,11 +1,11 @@ - netcoreapp3.1 + net8.0 - + diff --git a/YiSha.Business/YiSha.Business.Cache/YiSha.Business.Cache.csproj b/YiSha.Business/YiSha.Business.Cache/YiSha.Business.Cache.csproj index 8a797e05..e07b8f0f 100644 --- a/YiSha.Business/YiSha.Business.Cache/YiSha.Business.Cache.csproj +++ b/YiSha.Business/YiSha.Business.Cache/YiSha.Business.Cache.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net8.0 diff --git a/YiSha.Business/YiSha.Business/YiSha.Business.csproj b/YiSha.Business/YiSha.Business/YiSha.Business.csproj index 8f7f4085..a1d86972 100644 --- a/YiSha.Business/YiSha.Business/YiSha.Business.csproj +++ b/YiSha.Business/YiSha.Business/YiSha.Business.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net8.0 diff --git a/YiSha.Business/YiSha.Service/YiSha.Service.csproj b/YiSha.Business/YiSha.Service/YiSha.Service.csproj index 2e31850b..a65b539e 100644 --- a/YiSha.Business/YiSha.Service/YiSha.Service.csproj +++ b/YiSha.Business/YiSha.Service/YiSha.Service.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net8.0 diff --git a/YiSha.Cache/YiSha.Cache.Factory/YiSha.Cache.Factory.csproj b/YiSha.Cache/YiSha.Cache.Factory/YiSha.Cache.Factory.csproj index 1de8c3b9..d2c71eeb 100644 --- a/YiSha.Cache/YiSha.Cache.Factory/YiSha.Cache.Factory.csproj +++ b/YiSha.Cache/YiSha.Cache.Factory/YiSha.Cache.Factory.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net8.0 diff --git a/YiSha.Cache/YiSha.Cache.Interface/YiSha.Cache.Interface.csproj b/YiSha.Cache/YiSha.Cache.Interface/YiSha.Cache.Interface.csproj index cb631906..95ce5f9a 100644 --- a/YiSha.Cache/YiSha.Cache.Interface/YiSha.Cache.Interface.csproj +++ b/YiSha.Cache/YiSha.Cache.Interface/YiSha.Cache.Interface.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net8.0 diff --git a/YiSha.Cache/YiSha.MemoryCache/YiSha.MemoryCache.csproj b/YiSha.Cache/YiSha.MemoryCache/YiSha.MemoryCache.csproj index 25e99e28..e0619113 100644 --- a/YiSha.Cache/YiSha.MemoryCache/YiSha.MemoryCache.csproj +++ b/YiSha.Cache/YiSha.MemoryCache/YiSha.MemoryCache.csproj @@ -1,11 +1,11 @@  - netcoreapp3.1 + net8.0 - + diff --git a/YiSha.Cache/YiSha.RedisCache/YiSha.RedisCache.csproj b/YiSha.Cache/YiSha.RedisCache/YiSha.RedisCache.csproj index 5c2d6f64..b3de8e9d 100644 --- a/YiSha.Cache/YiSha.RedisCache/YiSha.RedisCache.csproj +++ b/YiSha.Cache/YiSha.RedisCache/YiSha.RedisCache.csproj @@ -1,11 +1,11 @@ - netcoreapp3.1 + net8.0 - + diff --git a/YiSha.Data/YiSha.Data.EF/YiSha.Data.EF.csproj b/YiSha.Data/YiSha.Data.EF/YiSha.Data.EF.csproj index 47a68c94..5d44c47e 100644 --- a/YiSha.Data/YiSha.Data.EF/YiSha.Data.EF.csproj +++ b/YiSha.Data/YiSha.Data.EF/YiSha.Data.EF.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net8.0 @@ -10,9 +10,9 @@ - - - + + + diff --git a/YiSha.Data/YiSha.Data.Repository/YiSha.Data.Repository.csproj b/YiSha.Data/YiSha.Data.Repository/YiSha.Data.Repository.csproj index f9a16b47..96a66c3a 100644 --- a/YiSha.Data/YiSha.Data.Repository/YiSha.Data.Repository.csproj +++ b/YiSha.Data/YiSha.Data.Repository/YiSha.Data.Repository.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net8.0 diff --git a/YiSha.Data/YiSha.Data/DbHelper.cs b/YiSha.Data/YiSha.Data/DbHelper.cs index 15243b5d..09819b9f 100644 --- a/YiSha.Data/YiSha.Data/DbHelper.cs +++ b/YiSha.Data/YiSha.Data/DbHelper.cs @@ -101,7 +101,7 @@ public async Task ExecuteReadeAsync(CommandType cmdType, string str dbContext, Guid.NewGuid(), connection.ConnectionId, - startTime); + startTime,CommandSource.ExecuteSqlRaw); var reader = interceptionResult.HasResult ? interceptionResult.Result @@ -117,7 +117,7 @@ public async Task ExecuteReadeAsync(CommandType cmdType, string str connection.ConnectionId, reader, startTime, - stopwatch.Elapsed); + stopwatch.Elapsed,CommandSource.ExecuteSqlRaw); } return reader; } @@ -169,7 +169,7 @@ public async Task ExecuteScalarAsync(CommandType cmdType, string strSql, dbContext, Guid.NewGuid(), connection.ConnectionId, - startTime); + startTime, CommandSource.ExecuteSqlRaw); var obj = interceptionResult.HasResult ? interceptionResult.Result @@ -185,7 +185,7 @@ public async Task ExecuteScalarAsync(CommandType cmdType, string strSql, connection.ConnectionId, obj, startTime, - stopwatch.Elapsed); + stopwatch.Elapsed, CommandSource.ExecuteSqlRaw); } return obj; } diff --git a/YiSha.Data/YiSha.Data/YiSha.Data.csproj b/YiSha.Data/YiSha.Data/YiSha.Data.csproj index c09f6f18..aec4af48 100644 --- a/YiSha.Data/YiSha.Data/YiSha.Data.csproj +++ b/YiSha.Data/YiSha.Data/YiSha.Data.csproj @@ -1,14 +1,14 @@ - netcoreapp3.1 + net8.0 - - - - + + + + diff --git a/YiSha.Entity/YiSha.Entity/YiSha.Entity.csproj b/YiSha.Entity/YiSha.Entity/YiSha.Entity.csproj index c077374f..72e5a391 100644 --- a/YiSha.Entity/YiSha.Entity/YiSha.Entity.csproj +++ b/YiSha.Entity/YiSha.Entity/YiSha.Entity.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net8.0 diff --git a/YiSha.Entity/YiSha.Enum/YiSha.Enum.csproj b/YiSha.Entity/YiSha.Enum/YiSha.Enum.csproj index cb631906..95ce5f9a 100644 --- a/YiSha.Entity/YiSha.Enum/YiSha.Enum.csproj +++ b/YiSha.Entity/YiSha.Enum/YiSha.Enum.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net8.0 diff --git a/YiSha.Entity/YiSha.Model/YiSha.Model.csproj b/YiSha.Entity/YiSha.Model/YiSha.Model.csproj index 0f4ec7df..1d879b6c 100644 --- a/YiSha.Entity/YiSha.Model/YiSha.Model.csproj +++ b/YiSha.Entity/YiSha.Model/YiSha.Model.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net8.0 diff --git a/YiSha.Test/YiSha.CacheTest/YiSha.CacheTest.csproj b/YiSha.Test/YiSha.CacheTest/YiSha.CacheTest.csproj index 2ad902df..38e9e575 100644 --- a/YiSha.Test/YiSha.CacheTest/YiSha.CacheTest.csproj +++ b/YiSha.Test/YiSha.CacheTest/YiSha.CacheTest.csproj @@ -1,18 +1,18 @@  - netcoreapp3.1 + net8.0 false - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/YiSha.Test/YiSha.DataTest/YiSha.DataTest.csproj b/YiSha.Test/YiSha.DataTest/YiSha.DataTest.csproj index 482c6b37..3fcaf577 100644 --- a/YiSha.Test/YiSha.DataTest/YiSha.DataTest.csproj +++ b/YiSha.Test/YiSha.DataTest/YiSha.DataTest.csproj @@ -1,15 +1,18 @@ - + - netcoreapp3.1 + net8.0 false - - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/YiSha.Test/YiSha.UtilTest/YiSha.UtilTest.csproj b/YiSha.Test/YiSha.UtilTest/YiSha.UtilTest.csproj index 9c0a9620..b81d0d4e 100644 --- a/YiSha.Test/YiSha.UtilTest/YiSha.UtilTest.csproj +++ b/YiSha.Test/YiSha.UtilTest/YiSha.UtilTest.csproj @@ -1,18 +1,18 @@  - netcoreapp3.1 + net8.0 false - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/YiSha.Util/YiSha.CodeGenerator/YiSha.CodeGenerator.csproj b/YiSha.Util/YiSha.CodeGenerator/YiSha.CodeGenerator.csproj index 5ed26c42..1c52a057 100644 --- a/YiSha.Util/YiSha.CodeGenerator/YiSha.CodeGenerator.csproj +++ b/YiSha.Util/YiSha.CodeGenerator/YiSha.CodeGenerator.csproj @@ -1,11 +1,11 @@ - netcoreapp3.1 + net8.0 - + diff --git a/YiSha.Util/YiSha.IdGenerator/YiSha.IdGenerator.csproj b/YiSha.Util/YiSha.IdGenerator/YiSha.IdGenerator.csproj index 9bc5667f..6ffde92c 100644 --- a/YiSha.Util/YiSha.IdGenerator/YiSha.IdGenerator.csproj +++ b/YiSha.Util/YiSha.IdGenerator/YiSha.IdGenerator.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net8.0 diff --git a/YiSha.Util/YiSha.Util/YiSha.Util.csproj b/YiSha.Util/YiSha.Util/YiSha.Util.csproj index 4271ba26..17359aab 100644 --- a/YiSha.Util/YiSha.Util/YiSha.Util.csproj +++ b/YiSha.Util/YiSha.Util/YiSha.Util.csproj @@ -1,19 +1,19 @@  - netcoreapp3.1 + net8.0 - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + diff --git a/YiSha.Web/YiSha.Admin.Web/YiSha.Admin.Web.csproj b/YiSha.Web/YiSha.Admin.Web/YiSha.Admin.Web.csproj index 1921cfd4..8c8a2aa2 100644 --- a/YiSha.Web/YiSha.Admin.Web/YiSha.Admin.Web.csproj +++ b/YiSha.Web/YiSha.Admin.Web/YiSha.Admin.Web.csproj @@ -1,9 +1,9 @@  - netcoreapp3.1 - 3.1.0.0 - 3.1.0.0 + net8.0 + 7.0.0.0 + 7.0.0.0 YiSha.Admin.Web YiSha.Admin.Web YiShaAdmin @@ -18,9 +18,9 @@ - - - + + + diff --git a/YiSha.Web/YiSha.Admin.Web/wwwroot/yisha/js/yisha.min.js b/YiSha.Web/YiSha.Admin.Web/wwwroot/yisha/js/yisha.min.js index 4cc18626..827dbaa6 100644 --- a/YiSha.Web/YiSha.Admin.Web/wwwroot/yisha/js/yisha.min.js +++ b/YiSha.Web/YiSha.Admin.Web/wwwroot/yisha/js/yisha.min.js @@ -1 +1 @@ -window.ys={},function(n,t){"use strict";n.extend(t,{openDialog:function(i){t.isMobile()?(i.width="auto",i.height="auto"):i.height||(i.height=n(window).height()-50+"px");var r=n.extend({type:2,title:"",width:"768px",content:"",maxmin:!0,shade:.4,btn:["确认","关闭"],callback:null,shadeClose:!1,fix:!1,closeBtn:1},i);layer.open({type:r.type,area:[r.width,r.height],maxmin:r.maxmin,shade:r.shade,title:r.title,content:r.content,btn:r.btn,shadeClose:r.shadeClose,fix:r.fix,closeBtn:r.closeBtn,yes:r.callback,cancel:function(){return!0}})},openDialogContent:function(i){t.isMobile()?(i.width="auto",i.height="auto"):i.height||(i.height=n(window).height()-50+"px");var r=n.extend({type:1,title:!1,width:"768px",content:"",maxmin:!1,shade:.4,btn:null,callback:null,shadeClose:!0,fix:!0,closeBtn:0},i);layer.open({type:r.type,area:[r.width,r.height],maxmin:r.maxmin,shade:r.shade,title:r.title,content:r.content,btn:r.btn,shadeClose:r.shadeClose,fix:r.fix,closeBtn:r.closeBtn,yes:r.callback,cancel:function(){return!0}})},closeDialog:function(){var n=parent.layer.getFrameIndex(window.name);parent.layer.close(n)},msgWarning:function(n){layer.msg(n,{icon:0,time:1e3,shift:5})},msgSuccess:function(n){t.isNullOrEmpty(n)&&(n="操作成功");top.layer.msg(n,{icon:1,time:1e3,shift:5})},msgError:function(n){t.isNullOrEmpty(n)&&(n="操作失败");layer.msg(n,{icon:2,time:3e3,shift:5})},alertWarning:function(n){layer.alert(n,{icon:0,title:"系统提示",btn:["确认"],btnclass:["btn btn-primary"]})},alertSuccess:function(n){layer.alert(n,{icon:1,title:"系统提示",btn:["确认"],btnclass:["btn btn-primary"]})},alertError:function(n){layer.alert(n,{icon:2,title:"系统提示",btn:["确认"],btnclass:["btn btn-primary"]})},confirm:function(n,t){layer.confirm(n,{icon:3,title:"系统提示",btn:["确认","取消"],btnclass:["btn btn-primary","btn btn-danger"]},function(n){layer.close(n);t(!0)})},showLoading:function(t){n.blockUI({message:'
<\/div> '+t+"<\/div>",css:{border:"none",backgroundColor:"transparent"}})},closeLoading:function(){setTimeout(function(){n.unblockUI()},50)},getIds:function(t){var i="";return n.each(t,function(n,t){n==0?i=t.Id:i+=","+t.Id}),i},checkRowEdit:function(n){if(n.length==0)t.msgError("您没有选择任何行!");else if(n.length>1)t.msgError("您的选择大于1行!");else if(n.length==1)return!0;return!1},checkRowDelete:function(n){if(n.length==0)t.msgError("您没有选择任何行!");else if(n.length>0)return!0;return!1},ajax:function(i){var r=n.extend({url:i.url,"async":!0,type:"get",data:i.data||{},dataType:i.dataType||"json",error:function(){t.alertError("系统出错了")},success:function(){t.msgSuccess()},beforeSend:function(){t.showLoading("正在处理中...")},complete:function(){t.closeLoading()}},i);if(t.isNullOrEmpty(r.url)){t.alertError("url 参数不能为空");return}n.ajax({url:r.url,"async":r.async,type:r.type,data:r.data,dataType:r.dataType,error:r.error,success:r.success,beforeSend:r.beforeSend,complete:r.complete})},ajaxUploadFile:function(i){var r=n.extend({url:i.url,data:i.data||{},error:function(){t.alertError("系统出错了")},success:function(){t.msgSuccess()},beforeSend:function(){t.showLoading("正在处理中...")},complete:function(){t.closeLoading()}},i);if(t.isNullOrEmpty(r.url)){t.alertError("url 参数不能为空");return}if(t.isNullOrEmpty(r.data)){t.alertError("data 参数不能为空");return}n.ajax({url:r.url,data:r.data,type:"post",processData:!1,contentType:!1,error:r.error,success:r.success,beforeSend:r.beforeSend,complete:r.complete})},exportExcel:function(n,i){t.ajax({url:n,type:"post",data:i,success:function(n){n.Tag==1?window.location.href=ctx+"File/DownloadFile?filePath="+n.Data+"&delete=1":t.msgError(n.Message)},beforeSend:function(){t.showLoading("正在导出数据,请稍后...")}})},request:function(n){var i=decodeURI(window.location.search),r=new RegExp("(^|&)"+n+"=([^&]*)(&|$)"),t=i.substr(1).match(r);return t!=null?unescape(t[2]):null},getHttpFileName:function(n){if(n==null||n=="")return n;var t=n.lastIndexOf("/");return t>0?n.substring(t+1):n},getFileNameWithoutExtension:function(n){if(n==null||n=="")return n;var t=n.indexOf(".");return t>0?n.substring(0,t):n},changeURLParam:function(n,t,i){var e=t+"=([^&]*)",r=t+"="+i,f,u;return n.match(e)?(f="/("+t+"=)([^&]*)/gi",n.replace(eval(f),r)):n.match("[?]")?(u=n.split("#"),u.length>1?u[0]+"&"+r+"#"+u[1]:n+"&"+r):n+"?"+r},isNullOrEmpty:function(n){return typeof n=="string"&&n==""||n==null||n==undefined?!0:!1},getJson:function(n){return n},getGuid:function(){for(var i,t="",n=1;n<=32;n++)i=Math.floor(Math.random()*16).toString(16),t+=i,(n==8||n==12||n==16||n==20)&&(t+="-");return t},getValueByKey:function(t,i){var r="";return n.each(t,function(n,t){t.Key==i&&(r=t.Value)}),r},getLastValue:function(n){if(!t.isNullOrEmpty(n)){var i=n.toString().split(",");return i[i.length-1]}return""},formatDate:function(n,t){var i,r,u;if(!n)return"";i=n;typeof n=="string"&&(i=n.indexOf("/Date(")>-1?new Date(parseInt(n.replace("/Date(","").replace(")/",""),10)):new Date(Date.parse(n.replace(/-/g,"/").replace("T"," ").split(".")[0])));r={"M+":i.getMonth()+1,"d+":i.getDate(),"H+":i.getHours(),"m+":i.getMinutes(),"s+":i.getSeconds(),"q+":Math.floor((i.getMonth()+3)/3),S:i.getMilliseconds()};/(y+)/.test(t)&&(t=t.replace(RegExp.$1,(i.getFullYear()+"").substr(4-RegExp.$1.length)));for(u in r)new RegExp("("+u+")").test(t)&&(t=t.replace(RegExp.$1,RegExp.$1.length==1?r[u]:("00"+r[u]).substr((""+r[u]).length)));return t},trimStart:function(n,t){var r,i;return t==null||t==""?n.replace(/^s*/,""):(r=new RegExp("^"+t+"*"),i=n.replace(r,""),i)},trimEnd:function(n,t){var r,i;if(t==null||t==""){for(r=/s/,i=n.length;r.test(n.charAt(--i)););return n.slice(0,i+1)}for(r=new RegExp(t),i=n.length;r.test(n.charAt(--i)););return n.slice(0,i+1)},toString:function(n){return n==null?"":n.toString()},openLink:function(n,t){var i=document.createElement("a");i.target=t?t:"_blank";i.href=n;i.click()},recursion:function(n,i,r,u,f){u||(u="id");f||(f="parentId");for(var e in n)if(n[e][u]==i)return r.push(n[e]),t.recursion(n,n[e][f],r,u,f)},isMobile:function(){return navigator.userAgent.match(/(Android|iPhone|SymbianOS|Windows Phone|iPad|iPod)/i)}})}(window.jQuery,window.ys),function(n){"use strict";n.fn.ysRadioBox=function(t,i){var u,f,r,e;return typeof t=="string"?n.fn.ysRadioBox.methods[t](this,i):(u=n(this),f=u.attr("id"),!f)?!1:(r=n.extend({url:null,key:"Key",value:"Value",data:null,dataName:"Data","default":undefined},t),e={loadData:function(){r.url&&n.ajax({url:r.url,type:"get",dataType:"json","async":!1,cache:!1,success:function(n){r.data=n;r.dataName&&r.data!=null&&(r.data=r.data[r.dataName])},error:function(){throw exception;}})},render:function(t){if(t.data&&t.data.length>=0){var r=u.attr("ref"),e=f+"_radiobox",i="";n.each(t.data,function(n){var u=t.data[n];i+="