Skip to content

Commit e7ff440

Browse files
anjoy8anjoy8
authored
Merge pull request #5 from anjoy8/master
merge 2021/12/20
2 parents a58c49e + f738b70 commit e7ff440

File tree

187 files changed

+11444
-1189
lines changed

Some content is hidden

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

187 files changed

+11444
-1189
lines changed

Diff for: ‎.docs/contents/Contribution/README.md

+40-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
欢迎一起完善文档，
55
参与打赏的小可爱名单如下（单位：元），你们的贡献是我继续的动力:
6-
(2021年1月14日 10点25分)
6+
(2021年9月9日 13点53分)
77

88

99
|序号|微信昵称|助力值|备注|
@@ -99,6 +99,44 @@
9999
|89|Mr * * 宋|50||
100100
|90|布 * * 布|10||
101101
|91|s * * s|6.6||
102-
|92|V * * V|50||
102+
|92|V * * V|50||
103+
|93|o**o|50||
104+
|94|书**6|6.6||
105+
|95|精**E|50||
106+
|96|有**幸|10||
107+
|97|r**y|10||
108+
|98|v**c|5||
109+
|99|j**n|20||
110+
|100|贾**琪|100||
111+
|101|a**s|20||
112+
|102|狂**牛|10||
113+
|103|风**宜|10||
114+
|104|鸠**夜|5||
115+
|105|大**灰|15||
116+
|106|不**懂|100||
117+
|107|圣**旨|50||
118+
|108|A**n|50||
119+
|109|薛**猫|100||
120+
|110|岁**叁|10||
121+
|111|K**g|100||
122+
|112|琛**田|30||
123+
|113|L**s|20||
124+
|114|小**哥|10||
125+
|115|G**e|10||
126+
|116|s**o|30||
127+
|117|大**白|50||
128+
|118|星**星|20||
129+
|119|沙**锋|200||
130+
|120|词**意|11||
131+
|121|A**N|20||
132+
|122|像**恋|10||
133+
|123|M**o|10||
134+
|124|风**虹|50||
135+
|125|健**诚|10||
136+
|126|**|5||
137+
|127|何**玖|6.66||
138+
|128|A**g|10||
139+
|129|高**广|20||
140+
103141

104142

Diff for: ‎.docs/contents/PressureTest/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
本地发布后的 `windows` 环境，直接用 `kestrel` 启动。
2121
线程数：100
2222
循环数：1000
23-
HTTP默认值：协议：`http`；服务器或IP：`localhost`；端口号：`8081`；
23+
HTTP默认值：协议：`http`；服务器或IP：`localhost`；端口号：`9291`；
2424
HTTP请求：方法：GET；路径：`/api/blog/ApacheTestUpdate`
2525
HTTP信息请求管理器：无
2626
响应断言：无

Diff for: ‎.docs/contents/Update/README.md

+34-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,39 @@
1-
1+

22
## 更新日志
33

4+
5+
### 2021-08-21
6+
7+
重要功能增加：项目增加 `Apollo` 配置中心；
8+
9+
### 2021-08-03
10+
11+
重要功能增加：项目增加 `ES` 搜索，增加 `Serilog` 使用 `tcp` 的方式自定义格式化,写入 `elk` 的实现；
12+
13+
### 2021-06-28
14+
15+
功能增加：项目增加 `nacos` 配置，支持将项目注册到 `nacos` 服务中心，搭建微服务之子服务；
16+
17+
### 2021-06-04
18+
19+
小功能更新：执行的时候，将 `Sql` 日志输出到控制台，方便查看，支持配置文件关闭；
20+
21+
### 2021-05-01
22+
23+
组件更新：多项日志中间件，由自写组件，转为使用`serilog`组件记录日志；
24+
25+
### 2021-03-03
26+
27+
项目目录调整：新增测试文件夹和模板文件夹；
28+
29+
### 2021-02-09
30+
31+
重大项目更新：新增建行聚合支付；
32+
33+
### 2021-01-11
34+
35+
更新：优化任务调度功能，新增暂停和停止；
36+
437
### 2020-12-02
538

639
更新：新增调用`MongoDB`功能，功能可用待完善中；

Diff for: ‎.docs/contents/guide/README.md

+14
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,20 @@ Blog.Core 是一个开箱即用的企业级权限管理应用框架。
55
采用最新的前后端完全分离技术【 ASP.NET Core Api 5.0 + Vue 2.x 】。
66
并结合 `IdentityServer4` ，可快速解决多客户端和多资源服务的统一认证与鉴权的问题。
77

8+
## 其他资料
9+
10+
博客园，早期架构搭建：[博客园](https://www.cnblogs.com/laozhang-is-phi/p/9495618.html)
11+
公众号，后期调整：[文章](https://mvp.neters.club/MVP_aspnetcore_2020/2020)
12+
视频：[B站](https://www.bilibili.com/video/BV1vC4y1p7Za)
13+
14+
15+
## 配套站点
16+
17+
本资源服务器，配合多个项目，构建前后端权限一体化平台，前端用 `VUE` 框架。
18+
前端-客户端：[预览](https://vueadmin.neters.club/)、[源码](https://github.com/anjoy8/Blog.Admin)
19+
前端-管理后台：[预览](http://vueblog.neters.club/)、[源码](https://github.com/anjoy8/Blog.Vue)
20+
认证平台：[预览](https://ids.neters.club/)、[源码](https://github.com/anjoy8/Blog.IdentityServer)
21+
822

923
### 为什么选择 ASPNET.Core
1024
1、【开源】`ASPNET.NET Core` 是由 `Microsoft` 和 `.NET` 社区在 `GitHub` 上开源并维护的一个跨平台（支持 Windows、macOS 和 Linux）的新一代高性能框架，

Diff for: ‎.docs/contents/guide/cheat-sheet.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ services.AddIpPolicyRateLimitSetup(Configuration);
158158
159159
```
160160

161-
然后在 `IdentityServer4` 项目中，做指定的修改，配置 `8081` 的回调地址：
161+
然后在 `IdentityServer4` 项目中，做指定的修改，配置 `9291` 的回调地址：
162162

163163
```
164164
new Client {
@@ -171,7 +171,7 @@ services.AddIpPolicyRateLimitSetup(Configuration);
171171
{
172172
"http://vueadmin.neters.club/callback",
173173
// 这里要配置回调地址
174-
"http://localhost:8081/oauth2-redirect.html"
174+
"http://localhost:9291/oauth2-redirect.html"
175175
},
176176
PostLogoutRedirectUris = { "http://vueadmin.neters.club" },
177177
AllowedCorsOrigins = { "http://vueadmin.neters.club" },

Diff for: ‎.docs/contents/guide/function-sheet.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ http {
212212
#access_log logs/host.access.log main;
213213
location / {
214214
root html;
215-
proxy_pass http://localhost:8081;
215+
proxy_pass http://localhost:9291;
216216
proxy_http_version 1.1;
217217
proxy_set_header Upgrade $http_upgrade;
218218
proxy_set_header Connection keep-alive;
@@ -253,7 +253,7 @@ http {
253253
location /api/ {
254254
rewrite ^.+apb/?(.*)$ /$1 break;
255255
include uwsgi_params;
256-
proxy_pass http://localhost:8081;
256+
proxy_pass http://localhost:9291;
257257
proxy_http_version 1.1;
258258
proxy_set_header Upgrade $http_upgrade;
259259
#proxy_set_header Connection "upgrade";
@@ -265,7 +265,7 @@ http {
265265
location /api2/ {
266266
rewrite ^.+apb/?(.*)$ /$1 break;
267267
include uwsgi_params;
268-
proxy_pass http://localhost:8081;
268+
proxy_pass http://localhost:9291;
269269
proxy_http_version 1.1;
270270
proxy_set_header Upgrade $http_upgrade;
271271
proxy_set_header Connection "upgrade";
@@ -276,7 +276,7 @@ http {
276276
277277
location /images/ {
278278
include uwsgi_params;
279-
proxy_pass http://localhost:8081;
279+
proxy_pass http://localhost:9291;
280280
proxy_http_version 1.1;
281281
proxy_set_header Upgrade $http_upgrade;
282282
#proxy_set_header Connection "upgrade";
@@ -361,15 +361,15 @@ http {
361361
location /api {
362362
rewrite ^.+apb/?(.*)$ /$1 break;
363363
include uwsgi_params;
364-
proxy_pass http://localhost:8081;
364+
proxy_pass http://localhost:9291;
365365
proxy_set_header X-Real-IP $remote_addr;
366366
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
367367
}
368368
369369
370370
location /images {
371371
include uwsgi_params;
372-
proxy_pass http://localhost:8081;
372+
proxy_pass http://localhost:9291;
373373
proxy_set_header X-Real-IP $remote_addr;
374374
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
375375
}

Diff for: ‎.docs/contents/guide/getting-started.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Gitee（国内） 下载 [https://gitee.com/laozhangIsPhi/Blog.Core](https://git
1414
## 编译与运行
1515
1、拿到项目后，双击 `Blog.Core.sln` 解决方案；
1616
2、首先 `F6` 编译，看是否有错误；
17-
3、然后 `F5` 运行，调起 `8081` 端口，浏览器查看效果；
17+
3、然后 `F5` 运行，调起 `9291` 端口，浏览器查看效果；
1818
4、因为系统默认的是 `sqlite` 数据库，如果你想换其他数据库，请看下边；
1919
5、注意：本系统是直接自动生成数据库和数据的，不用手动创建数据库；
2020

@@ -78,7 +78,7 @@ Gitee（国内） 下载 [https://gitee.com/laozhangIsPhi/Blog.Core](https://git
7878
```
7979

8080
## 如何配置项目端口号
81-
1、在 `Blog.Core` 层下的 `program.cs` 文件中，将 `8081`端口，修改为自己想要的端口号；
81+
1、在 `Blog.Core` 层下的 `program.cs` 文件中，将 `9291`端口，修改为自己想要的端口号；
8282
2、或者在 `launchSettings.json` 中设置(`注意，如果仅仅修改这里，publish后，端口访问无效`)；
8383

8484
## 如何项目重命名

Diff for: ‎.github/workflows/dotnetcore.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ jobs:
1212
- name: Setup .NET Core
1313
uses: actions/setup-dotnet@v1
1414
with:
15-
dotnet-version: 5.0.100
15+
dotnet-version: 6.0.x
1616
- name: Build with dotnet
1717
run: dotnet build --configuration Release
18+
- name: Build image
19+
run: docker build -f "Dockerfile" --force-rm -t laozhangisphi/apkimg .
20+
- name: Log into registry
21+
run: echo "${{ secrets.ACCESS_TOKEN }}" | docker login -u laozhangisphi --password-stdin
22+
- name: Push image
23+
run: docker push laozhangisphi/apkimg

Diff for: ‎Blog.Core.Api/Blog.Core.Api.csproj

+79-72
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,94 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

3-
<PropertyGroup>
3+
<PropertyGroup>
44

5-
<OutputType>Exe</OutputType>
5+
<OutputType>Exe</OutputType>
66

7-
<TargetFramework>net5.0</TargetFramework>
8-
<!--<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>-->
9-
<AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
10-
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
11-
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
12-
</PropertyGroup>
7+
<TargetFramework>net6.0</TargetFramework>
8+
<!--<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>-->
9+
<AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
10+
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
11+
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
12+
</PropertyGroup>
1313

14-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
15-
<DocumentationFile>..\Blog.Core.Api\Blog.Core.xml</DocumentationFile>
16-
<NoWarn>1701;1702;1591</NoWarn>
17-
</PropertyGroup>
14+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
15+
<DocumentationFile>..\Blog.Core.Api\Blog.Core.xml</DocumentationFile>
16+
<NoWarn>1701;1702;1591</NoWarn>
17+
</PropertyGroup>
1818

19-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
20-
<DocumentationFile>..\Blog.Core\Blog.Core.xml</DocumentationFile>
21-
<NoWarn>1701;1702;1591</NoWarn>
22-
</PropertyGroup>
23-
<PropertyGroup>
24-
<ServerGarbageCollection>false</ServerGarbageCollection>
25-
</PropertyGroup>
26-
<ItemGroup>
27-
<Compile Remove="Extensions\**" />
28-
<Compile Remove="Hubs\**" />
29-
<Compile Remove="Middlewares\**" />
30-
<Content Remove="Extensions\**" />
31-
<Content Remove="Hubs\**" />
32-
<Content Remove="Middlewares\**" />
33-
<EmbeddedResource Remove="Extensions\**" />
34-
<EmbeddedResource Remove="Hubs\**" />
35-
<EmbeddedResource Remove="Middlewares\**" />
36-
<None Remove="Extensions\**" />
37-
<None Remove="Hubs\**" />
38-
<None Remove="Middlewares\**" />
39-
</ItemGroup>
19+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
20+
<DocumentationFile>..\Blog.Core\Blog.Core.xml</DocumentationFile>
21+
<NoWarn>1701;1702;1591</NoWarn>
22+
</PropertyGroup>
23+
<PropertyGroup>
24+
<ServerGarbageCollection>false</ServerGarbageCollection>
25+
</PropertyGroup>
26+
<ItemGroup>
27+
<Compile Remove="Extensions\**" />
28+
<Compile Remove="Hubs\**" />
29+
<Compile Remove="Middlewares\**" />
30+
<Content Remove="Extensions\**" />
31+
<Content Remove="Hubs\**" />
32+
<Content Remove="Middlewares\**" />
33+
<EmbeddedResource Remove="Extensions\**" />
34+
<EmbeddedResource Remove="Hubs\**" />
35+
<EmbeddedResource Remove="Middlewares\**" />
36+
<None Remove="Extensions\**" />
37+
<None Remove="Hubs\**" />
38+
<None Remove="Middlewares\**" />
39+
</ItemGroup>
4040

41-
<ItemGroup>
42-
<None Remove="index.html" />
43-
</ItemGroup>
41+
<ItemGroup>
42+
<None Remove="index.html" />
43+
</ItemGroup>
4444

45-
<ItemGroup>
46-
47-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.9.10" />
48-
49-
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
50-
</ItemGroup>
45+
<ItemGroup>
46+
<PackageReference Include="log4mongo-netcore" Version="3.2.0" />
47+
<PackageReference Include="MicroKnights.Log4NetAdoNetAppender" Version="2.2.0" />
48+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.9.10" />
49+
<PackageReference Include="SkyAPM.Agent.AspNetCore" Version="1.3.0" />
50+
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
51+
</ItemGroup>
5152

52-
<ItemGroup>
53-
<ProjectReference Include="..\Blog.Core.Extensions\Blog.Core.Extensions.csproj" />
54-
</ItemGroup>
53+
<ItemGroup>
54+
<ProjectReference Include="..\Blog.Core.Extensions\Blog.Core.Extensions.csproj" />
55+
</ItemGroup>
5556

56-
<ItemGroup>
57-
<None Include="wwwroot\BlogCore.Data.json\BlogArticle.tsv" />
58-
<None Include="wwwroot\BlogCore.Data.json\Modules.tsv" />
59-
<None Include="wwwroot\BlogCore.Data.json\Permission.tsv" />
60-
<None Include="wwwroot\BlogCore.Data.json\Role.tsv" />
61-
<None Include="wwwroot\BlogCore.Data.json\RoleModulePermission.tsv" />
62-
<None Include="wwwroot\BlogCore.Data.json\sysUserInfo.tsv" />
63-
<None Include="wwwroot\BlogCore.Data.json\Topic.tsv" />
64-
<None Include="wwwroot\BlogCore.Data.json\TopicDetail.tsv" />
65-
<None Include="wwwroot\BlogCore.Data.json\UserRole.tsv" />
66-
</ItemGroup>
57+
<ItemGroup>
58+
<None Include="wwwroot\BlogCore.Data.json\BlogArticle.tsv" />
59+
<None Include="wwwroot\BlogCore.Data.json\Modules.tsv" />
60+
<None Include="wwwroot\BlogCore.Data.json\Permission.tsv" />
61+
<None Include="wwwroot\BlogCore.Data.json\Role.tsv" />
62+
<None Include="wwwroot\BlogCore.Data.json\RoleModulePermission.tsv" />
63+
<None Include="wwwroot\BlogCore.Data.json\sysUserInfo.tsv" />
64+
<None Include="wwwroot\BlogCore.Data.json\Topic.tsv" />
65+
<None Include="wwwroot\BlogCore.Data.json\TopicDetail.tsv" />
66+
<None Include="wwwroot\BlogCore.Data.json\UserRole.tsv" />
67+
</ItemGroup>
6768

68-
<ItemGroup>
69-
<EmbeddedResource Include="index.html" />
70-
</ItemGroup>
69+
<ItemGroup>
70+
<EmbeddedResource Include="index.html" />
71+
</ItemGroup>
7172

72-
<ItemGroup>
73-
<Content Update="appsettings.json">
74-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
75-
</Content>
76-
</ItemGroup>
73+
<ItemGroup>
74+
<Content Update="appsettings.json">
75+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
76+
</Content>
77+
</ItemGroup>
7778

78-
<ItemGroup>
79-
<None Update="Dockerfile">
80-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
81-
</None>
82-
<None Update="StopContainerImg.sh">
83-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
84-
</None>
85-
</ItemGroup>
79+
<ItemGroup>
80+
<None Update="Dockerfile">
81+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
82+
</None>
83+
<None Update="StopContainerImg.sh">
84+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
85+
</None>
86+
</ItemGroup>
87+
88+
<ProjectExtensions>
89+
<VisualStudio>
90+
<UserProperties appsettings_1json__JsonSchema="" />
91+
</VisualStudio>
92+
</ProjectExtensions>
8693

8794
</Project>

0 commit comments

Comments
 (0)