Skip to content

Commit bd96b28

Browse files
netnrnetnr
committed
m
1 parent 0af316d commit bd96b28

File tree

169 files changed

+1180
-7743
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+1180
-7743
lines changed

‎docs/404.html

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
font-weight: 600;
1717
color: #42b983;
1818
}
19+
20+
.sidebar ul li.active > a {
21+
font-weight: 400 !important;
22+
}
1923
</style>
2024
</head>
2125
<body>
@@ -58,10 +62,10 @@
5862
<script>
5963
const nd = {
6064
sourceList: [
61-
"https://npm.elemecdn.com/@highlightjs/cdn-assets@11.2.0/styles/vs.min.css",
62-
"https://npm.elemecdn.com/@highlightjs/cdn-assets@11.2.0/highlight.min.js",
6365
"https://npm.elemecdn.com/docsify@4.12.1/lib/themes/vue.css",
64-
"https://npm.elemecdn.com/docsify@4.12.1/lib/docsify.min.js"
66+
"https://npm.elemecdn.com/docsify@4.12.1/lib/docsify.min.js",
67+
"https://npm.elemecdn.com/@highlightjs/cdn-assets@11.3.1/styles/vs.min.css",
68+
"https://npm.elemecdn.com/@highlightjs/cdn-assets@11.3.1/highlight.min.js"
6569
],
6670
createNode: function (nn, html) {
6771
let em = document.createElement(nn);
@@ -78,10 +82,14 @@
7882

7983
var head = document.getElementsByTagName("HEAD")[0];
8084

81-
head.appendChild(nd.createNode("STYLE", res[0]));
82-
head.appendChild(nd.createNode("SCRIPT", res[1]));
83-
head.appendChild(nd.createNode("STYLE", "*" + res[2].split(';*')[1]));
84-
head.appendChild(nd.createNode("SCRIPT", res[3]));
85+
for (let i = 0; i < res.length; i++) {
86+
let suri = nd.sourceList[i];
87+
let text = res[i];
88+
if (text.includes("fonts.googleapis.com")) {
89+
text = "*" + text.split(';*')[1];
90+
}
91+
head.appendChild(nd.createNode(suri.endsWith('.js') ? "SCRIPT" : "STYLE", text));
92+
}
8593
})
8694
}
8795
}

‎mix/Chat/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,16 +148,16 @@ <h4 class="modal-title">用户名/Account</h4>
148148
</div>
149149
</div>
150150

151-
<script src="https://s1.netnr.com/libs/mimc-webjs-sdk/1.0.3/mimc-min_1_0_3.js"></script>
151+
<script src="https://s1.netnr.eu.org/libs/mimc-webjs-sdk/1.0.3/mimc-min_1_0_3.js"></script>
152152

153153
<link href="https://npm.elemecdn.com/netnrmd@3.0.2/src/netnrmd.css" rel="stylesheet" />
154154
<script src="https://npm.elemecdn.com/netnrmd@3.0.2/src/netnrmd.bundle.js"></script>
155155

156-
<script src="https://npm.elemecdn.com/monaco-editor@0.31.0/min/vs/loader.js"></script>
156+
<script src="https://npm.elemecdn.com/monaco-editor@0.31.1/min/vs/loader.js"></script>
157157
<script>
158158
require.config({
159159
paths: {
160-
vs: 'https://npm.elemecdn.com/monaco-editor@0.31.0/min/vs'
160+
vs: 'https://npm.elemecdn.com/monaco-editor@0.31.1/min/vs'
161161
},
162162
'vs/nls': { availableLanguages: { '*': 'zh-cn' } }
163163
});

‎mix/JSONEditor/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<meta name="keywords" content="JSON编辑器 NET牛人" />
1414
<meta name="description" content="JSON编辑器 JSON格式化工具 JSON在线工具" />
1515

16-
<link href="https://npm.elemecdn.com/jsoneditor@9.5.7/dist/jsoneditor.min.css" rel="stylesheet">
17-
<script src="https://npm.elemecdn.com/jsoneditor@9.5.7/dist/jsoneditor.min.js"></script>
16+
<link href="https://npm.elemecdn.com/jsoneditor@9.5.10/dist/jsoneditor.min.css" rel="stylesheet">
17+
<script src="https://npm.elemecdn.com/jsoneditor@9.5.10/dist/jsoneditor.min.js"></script>
1818
<script src="https://npm.elemecdn.com/ace-builds@1.4.13/src-noconflict/theme-tomorrow_night.js"></script>
1919

2020
<style>

‎mix/VIPVideo/index.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,9 @@
5858

5959
//线路
6060
var vipSource = [
61-
"https://okjx.cc/?url=",
62-
"https://vip.bljiex.com/?v="
61+
"https://vip.bljiex.com/?v=",
62+
"https://17kyun.com/api.php?url=",
63+
"https://okjx.cc/?url="
6364
];
6465

6566
//初始化

‎src/Netnr.P/Netnr.Blog.Application/CommonService.cs

Lines changed: 67 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
using Microsoft.EntityFrameworkCore;
2+
using JiebaNet.Segmenter;
3+
using LinqKit;
24
using Netnr.Core;
35
using Netnr.Blog.Data;
46
using Netnr.Blog.Domain;
5-
using JiebaNet.Segmenter;
6-
using LinqKit;
7+
using Netnr.SharedFast;
78

89
namespace Netnr.Blog.Application
910
{
@@ -137,7 +138,19 @@ join b in db.UserWriting on a.UwId equals b.UwId
137138
kws = kws.Distinct().ToList();
138139

139140
var inner = PredicateBuilder.New<UserWriting>();
140-
kws.ForEach(k => inner.Or(x => x.UwTitle.Contains(k)));
141+
switch (GlobalTo.TDB)
142+
{
143+
case SharedEnum.TypeDB.SQLite:
144+
kws.ForEach(k => inner.Or(x => EF.Functions.Like(x.UwTitle, $"%{k}%")));
145+
break;
146+
case SharedEnum.TypeDB.PostgreSQL:
147+
kws.ForEach(k => inner.Or(x => EF.Functions.ILike(x.UwTitle, $"%{k}%")));
148+
break;
149+
default:
150+
kws.ForEach(k => inner.Or(x => x.UwTitle.Contains(k)));
151+
break;
152+
}
153+
141154
query = query.Where(inner);
142155
}
143156

@@ -549,7 +562,12 @@ orderby a.GistCreateTime descending
549562

550563
if (!string.IsNullOrWhiteSpace(q))
551564
{
552-
query1 = query1.Where(x => x.a.GistFilename.Contains(q) || x.a.GistContent.Contains(q) || x.a.GistRemark.Contains(q));
565+
query1 = GlobalTo.TDB switch
566+
{
567+
SharedEnum.TypeDB.SQLite => query1.Where(x => EF.Functions.Like(x.a.GistFilename, $"%{q}%") || EF.Functions.Like(x.a.GistRemark, $"%{q}%") || EF.Functions.Like(x.a.GistContent, $"%{q}%")),
568+
SharedEnum.TypeDB.PostgreSQL => query1.Where(x => EF.Functions.ILike(x.a.GistFilename, $"%{q}%") || EF.Functions.ILike(x.a.GistRemark, $"%{q}%") || EF.Functions.ILike(x.a.GistContent, $"%{q}%")),
569+
_ => query1.Where(x => x.a.GistFilename.Contains(q) || x.a.GistRemark.Contains(q) || x.a.GistContent.Contains(q)),
570+
};
553571
}
554572

555573
//所属用户
@@ -576,11 +594,31 @@ orderby a.GistCreateTime descending
576594
{
577595
var query2 = query1.Select(x => new
578596
{
579-
SearchOrder = (x.a.GistFilename.Contains(q) ? 4 : 0) + (x.a.GistContent.Contains(q) ? 2 : 0) + (x.a.GistRemark.Contains(q) ? 1 : 0),
597+
SearchOrder = (x.a.GistFilename.Contains(q) ? 4 : 0) + (x.a.GistRemark.Contains(q) ? 2 : 0) + (x.a.GistContent.Contains(q) ? 1 : 0),
580598
x.Nickname,
581599
x.a
582600
}).OrderByDescending(x => x.SearchOrder);
583601

602+
switch (GlobalTo.TDB)
603+
{
604+
case SharedEnum.TypeDB.SQLite:
605+
query2 = query1.Select(x => new
606+
{
607+
SearchOrder = (EF.Functions.Like(x.a.GistFilename, $"%{q}%") ? 4 : 0) + (EF.Functions.Like(x.a.GistRemark, $"%{q}%") ? 2 : 0) + (EF.Functions.Like(x.a.GistContent, $"%{q}%") ? 1 : 0),
608+
x.Nickname,
609+
x.a
610+
}).OrderByDescending(x => x.SearchOrder);
611+
break;
612+
case SharedEnum.TypeDB.PostgreSQL:
613+
query2 = query1.Select(x => new
614+
{
615+
SearchOrder = (EF.Functions.Like(x.a.GistFilename, $"%{q}%") ? 4 : 0) + (EF.Functions.Like(x.a.GistRemark, $"%{q}%") ? 2 : 0) + (EF.Functions.Like(x.a.GistContent, $"%{q}%") ? 1 : 0),
616+
x.Nickname,
617+
x.a
618+
}).OrderByDescending(x => x.SearchOrder);
619+
break;
620+
}
621+
584622
query = query2.Select(x => new Gist
585623
{
586624
GistCode = x.a.GistCode,
@@ -686,7 +724,12 @@ orderby a.DsCreateTime descending
686724

687725
if (!string.IsNullOrWhiteSpace(q))
688726
{
689-
query = query.Where(x => x.DsName.Contains(q) || x.DsRemark.Contains(q));
727+
query = GlobalTo.TDB switch
728+
{
729+
SharedEnum.TypeDB.SQLite => query.Where(x => EF.Functions.Like(x.DsName, $"%{q}%") || EF.Functions.Like(x.DsRemark, $"%{q}%")),
730+
SharedEnum.TypeDB.PostgreSQL => query.Where(x => EF.Functions.ILike(x.DsName, $"%{q}%") || EF.Functions.ILike(x.DsRemark, $"%{q}%")),
731+
_ => query.Where(x => x.DsName.Contains(q) || x.DsRemark.Contains(q)),
732+
};
690733
}
691734

692735
var pag = new SharedPaginationVM
@@ -758,7 +801,12 @@ orderby a.RunCreateTime descending
758801

759802
if (!string.IsNullOrWhiteSpace(q))
760803
{
761-
query = query.Where(x => x.RunRemark.Contains(q));
804+
query = GlobalTo.TDB switch
805+
{
806+
SharedEnum.TypeDB.SQLite => query.Where(x => EF.Functions.Like(x.RunRemark, $"%{q}%")),
807+
SharedEnum.TypeDB.PostgreSQL => query.Where(x => EF.Functions.ILike(x.RunRemark, $"%{q}%")),
808+
_ => query.Where(x => x.RunRemark.Contains(q)),
809+
};
762810
}
763811

764812
var pag = new SharedPaginationVM
@@ -833,7 +881,12 @@ orderby a.DrCreateTime descending
833881

834882
if (!string.IsNullOrWhiteSpace(q))
835883
{
836-
query = query.Where(x => x.DrName.Contains(q) || x.DrRemark.Contains(q));
884+
query = GlobalTo.TDB switch
885+
{
886+
SharedEnum.TypeDB.SQLite => query.Where(x => EF.Functions.Like(x.DrName, $"%{q}%") || EF.Functions.Like(x.DrRemark, $"%{q}%")),
887+
SharedEnum.TypeDB.PostgreSQL => query.Where(x => EF.Functions.ILike(x.DrName, $"%{q}%") || EF.Functions.ILike(x.DrRemark, $"%{q}%")),
888+
_ => query.Where(x => x.DrName.Contains(q) || x.DrRemark.Contains(q)),
889+
};
837890
}
838891

839892
var pag = new SharedPaginationVM
@@ -1069,7 +1122,12 @@ join b in db.UserInfo on a.Uid equals b.UserId
10691122

10701123
if (!string.IsNullOrWhiteSpace(q))
10711124
{
1072-
query = query.Where(x => x.GrContent.Contains(q) || x.GrTag.Contains(q));
1125+
query = GlobalTo.TDB switch
1126+
{
1127+
SharedEnum.TypeDB.SQLite => query.Where(x => EF.Functions.Like(x.GrContent, $"%{q}%") || EF.Functions.Like(x.GrTag, $"%{q}%")),
1128+
SharedEnum.TypeDB.PostgreSQL => query.Where(x => EF.Functions.ILike(x.GrContent, $"%{q}%") || EF.Functions.ILike(x.GrTag, $"%{q}%")),
1129+
_ => query.Where(x => x.GrContent.Contains(q) || x.GrTag.Contains(q)),
1130+
};
10731131
}
10741132

10751133
var pag = new SharedPaginationVM

‎src/Netnr.P/Netnr.Blog.Data/Netnr.Blog.Data.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
1716
<PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.1" />
18-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.1" />
17+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
18+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.2" />
1919
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0" />
20-
<PackageReference Include="MySqlConnector" Version="2.1.0" />
21-
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.41" />
20+
<PackageReference Include="MySqlConnector" Version="2.1.2" />
21+
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.50" />
2222
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.1" />
23-
<PackageReference Include="Npgsql" Version="6.0.1" />
23+
<PackageReference Include="Npgsql" Version="6.0.2" />
2424
</ItemGroup>
2525

2626
<ItemGroup>

‎src/Netnr.P/Netnr.Blog.Web/Apps/LoginService.cs

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,24 @@ public static SharedResultVM CompleteInfoValid(HttpContext context)
129129
vm.Log.Add("验证邮箱");
130130
}
131131

132-
if (umo.UserCreateTime.Value.AddDays(3) > DateTime.Now)
132+
if (string.IsNullOrWhiteSpace(umo.UserPhone) || umo.UserPhone.Trim().Length != 11)
133133
{
134-
vm.Log.Add("新注册用户需 3 天以后才能操作");
134+
vm.Log.Add("填写手机号码");
135+
}
136+
137+
if (string.IsNullOrWhiteSpace(umo.OpenId1)
138+
&& string.IsNullOrWhiteSpace(umo.OpenId2)
139+
&& string.IsNullOrWhiteSpace(umo.OpenId3)
140+
&& string.IsNullOrWhiteSpace(umo.OpenId4)
141+
&& string.IsNullOrWhiteSpace(umo.OpenId5)
142+
&& string.IsNullOrWhiteSpace(umo.OpenId6))
143+
{
144+
vm.Log.Add("绑定一项授权关联");
145+
}
146+
147+
if (umo.UserCreateTime.Value.AddDays(15) > DateTime.Now)
148+
{
149+
vm.Log.Add("新注册用户需 15 天以后才能操作");
135150
}
136151
}
137152
}

‎src/Netnr.P/Netnr.Blog.Web/Areas/Draw/Views/Shared/_PartialDrawView.cshtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
@{
22
ViewData["Title"] = "draw";
33

4-
var mxBaseServer = "https://s1.netnr.com/mxgraph/javascript";
4+
var mxBaseServer = ViewContext.HttpContext.Request.Headers.Host.ToString().Contains("netnr.eu.org")
5+
? "https://s1.netnr.eu.org/mxgraph/javascript" : "https://s1.netnr.com/mxgraph/javascript";
56
}
67

78
@Html.Raw(Netnr.SharedApp.QuoteTo.Html("loading"))

‎src/Netnr.P/Netnr.Blog.Web/Areas/Draw/Views/Shared/_PartialMindView.cshtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
@{
22
ViewData["Title"] = "draw";
33

4-
var mindBaseServer = "https://s1.netnr.com/libs/kityminder/20190212"; ;
4+
var mindBaseServer = ViewContext.HttpContext.Request.Headers.Host.ToString().Contains("netnr.eu.org")
5+
? "https://s1.netnr.eu.org/libs/kityminder/20190212" : "https://s1.netnr.com/libs/kityminder/20190212";
56
}
67

78
@Html.Raw(Netnr.SharedApp.QuoteTo.Html("loading"))

‎src/Netnr.P/Netnr.Blog.Web/Controllers/AdminController.cs

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
using Microsoft.AspNetCore.Authorization;
2-
using Netnr.Blog.Data;
2+
using Microsoft.EntityFrameworkCore;
33
using Newtonsoft.Json.Linq;
4+
using Netnr.Blog.Data;
45
using Netnr.SharedLogging;
6+
using Netnr.SharedFast;
57

68
namespace Netnr.Blog.Web.Controllers
79
{
@@ -72,7 +74,12 @@ join b in db.UserInfo on a.Uid equals b.UserId
7274

7375
if (!string.IsNullOrWhiteSpace(ivm.Pe1))
7476
{
75-
query = query.Where(x => x.UwTitle.Contains(ivm.Pe1));
77+
query = GlobalTo.TDB switch
78+
{
79+
SharedEnum.TypeDB.SQLite => query.Where(x => EF.Functions.Like(x.UwTitle, $"%{ivm.Pe1}%")),
80+
SharedEnum.TypeDB.PostgreSQL => query.Where(x => EF.Functions.ILike(x.UwTitle, $"%{ivm.Pe1}%")),
81+
_ => query.Where(x => x.UwTitle.Contains(ivm.Pe1)),
82+
};
7683
}
7784

7885
Application.CommonService.QueryJoin(query, ivm, ref ovm);
@@ -163,7 +170,12 @@ from b in bg.DefaultIfEmpty()
163170

164171
if (!string.IsNullOrWhiteSpace(ivm.Pe1))
165172
{
166-
query = query.Where(x => x.UrContent.Contains(ivm.Pe1));
173+
query = GlobalTo.TDB switch
174+
{
175+
SharedEnum.TypeDB.SQLite => query.Where(x => EF.Functions.Like(x.UrContent, $"%{ivm.Pe1}%")),
176+
SharedEnum.TypeDB.PostgreSQL => query.Where(x => EF.Functions.ILike(x.UrContent, $"%{ivm.Pe1}%")),
177+
_ => query.Where(x => x.UrContent.Contains(ivm.Pe1)),
178+
};
167179
}
168180

169181
Application.CommonService.QueryJoin(query, ivm, ref ovm);

‎src/Netnr.P/Netnr.Blog.Web/Controllers/UserController.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Microsoft.AspNetCore.Authorization;
2+
using Microsoft.EntityFrameworkCore;
23
using Netnr.Blog.Data;
34
using Netnr.Core;
45
using Netnr.Login;
@@ -477,7 +478,12 @@ public string WriteList(string sort, string order, int page = 1, int rows = 30,
477478

478479
if (!string.IsNullOrWhiteSpace(pe1))
479480
{
480-
query = query.Where(x => x.UwTitle.Contains(pe1));
481+
query = GlobalTo.TDB switch
482+
{
483+
SharedEnum.TypeDB.SQLite => query.Where(x => EF.Functions.Like(x.UwTitle, $"%{pe1}%")),
484+
SharedEnum.TypeDB.PostgreSQL => query.Where(x => EF.Functions.ILike(x.UwTitle, $"%{pe1}%")),
485+
_ => query.Where(x => x.UwTitle.Contains(pe1)),
486+
};
481487
}
482488

483489
query = QueryableTo.OrderBy(query, sort, order);

0 commit comments

Comments
 (0)