diff --git a/_config.butterfly.yml b/_config.butterfly.yml index b626291..e1e11d1 100644 --- a/_config.butterfly.yml +++ b/_config.butterfly.yml @@ -75,7 +75,8 @@ aplayerInject: inject: head: bottom: - -
+ # 7427714271 + -
- pjax: enable: true diff --git a/source/_posts/.Net 6.md b/source/_posts/.Net 6.md new file mode 100644 index 0000000..727fea1 --- /dev/null +++ b/source/_posts/.Net 6.md @@ -0,0 +1,40 @@ +# .Net 6 + +## 1. 部署到Docker + +### 1.1 安装.Net SDK 6.0环境 + +```shell +sudo rpm -Uvh https://packages.microsoft.com/config/centos/7/packages-microsoft-prod.rpm +sudo yum install dotnet-sdk-6.0 +dotnet --info +``` + +### 1.2 Visual Studio添加Docker支持 + +![image-20221121144928205](https://markdownhexo.oss-cn-hangzhou.aliyuncs.com/img/image-20221121144928205.png) + +### 1.3 Linux下构建Docker镜像 + +```shell +docker image build -f ./XiaodaERP/Dockerfile -t aspnetcore . +docker images +``` + +### 1.4 运行Docker镜像 + +```shell +docker run --name=aspnetcore -p 9001:80 -d aspnetcore +docker ps +``` + + + +```shell +cd /usr/local/jenkins_home/workspace/XiaodaERP_NetCore +echo $PWD +docker image build -f ./XiaodaERP/Dockerfile -t xiaodaerp/netcore . +docker images +docker run --name xiaodaerp/netcore -p 7274:80 -d xiaodaerp/netcore +``` + diff --git a/source/_posts/Docker.md b/source/_posts/Docker.md index b90e2e0..5261918 100644 --- a/source/_posts/Docker.md +++ b/source/_posts/Docker.md @@ -271,3 +271,39 @@ cert: false # 创建并启动容器 # -u 表示以 root用户运行 docker run -d -u root -p 8088:8080 --name code-server -v /usr/docker/codeserver/config.yaml:/root/.config/code-server/config.yaml -v /usr/docker/codeserver:/home/code codercom/code-server ``` + +## docker安装Jenkins + +搜索Jenkins镜像 + +```shell +docker search jenkins +``` + +![image-20221121125608385](https://markdownhexo.oss-cn-hangzhou.aliyuncs.com/img/image-20221121125608385.png) + +查看镜像 +```shell +docker images +``` + +![image-20221121131216876](https://markdownhexo.oss-cn-hangzhou.aliyuncs.com/img/image-20221121131216876.png) + +启动镜像 + +```shell +docker run -d -uroot -p 8889:8080 -p 50000:50000 --name jenkins -v /usr/bin/docker:/usr/bin/docker -v /var/run/docker.sock:/var/run/docker.sock -v /etc/sysconfig/docker:/etc/sysconfig/docker -v /usr/local/jenkins_home:/var/jenkins_home -v /etc/localtime:/etc/localtime jenkins/jenkins +``` + +启动后查看日志 + +```shell +docker logs jenkins +``` + +![image-20221121131635658](https://markdownhexo.oss-cn-hangzhou.aliyuncs.com/img/image-20221121131635658.png)可以找到初始密码 + +```shell +docker image build -f ./XiaodaERP/Dockerfile -t aspnetcore . +``` + diff --git a/source/_posts/Linux.md b/source/_posts/Linux.md index 116b763..bb9edd9 100644 --- a/source/_posts/Linux.md +++ b/source/_posts/Linux.md @@ -533,3 +533,12 @@ cd nginx-1.21.4/ make make install ``` + +## 安装.Net 6 SDK + +```shell +sudo rpm -Uvh https://packages.microsoft.com/config/centos/7/packages-microsoft-prod.rpm +sudo yum install dotnet-sdk-6.0 +dotnet --info +``` + diff --git a/source/_posts/Typora.md b/source/_posts/Typora.md index 4f49338..f6bf4c2 100644 --- a/source/_posts/Typora.md +++ b/source/_posts/Typora.md @@ -61,3 +61,32 @@ Windows Registry Editor Version 5.00 删除多余的文件（尤其是有一个什么Markdown File），只保留如下的两项。然后关闭注册表，即可修复bug ![img](http://markdownhexo.oss-cn-hangzhou.aliyuncs.com/img/img) + + + +## 上传图片至阿里云OSS + +模板 + +```json +{ + "picBed": { + "uploader": "aliyun", + "aliyun": { + "accessKeyId": "", + "accessKeySecret": "", + "bucket": "", // 存储空间名 + "area": "", // 存储区域代号 + "path": "img/", // 自定义存储路径 + "customUrl": "", // 自定义域名，注意要加 http://或者 https:// + "options": "" // 针对图片的一些后缀处理参数 PicGo 2.2.0+ PicGo-Core 1.4.0+ + } + }, + "picgoPlugins": {} +} +``` + + +![image-20221121130426162](https://markdownhexo.oss-cn-hangzhou.aliyuncs.com/img/image-20221121130426162.png) + +![image-20221121130857072](https://markdownhexo.oss-cn-hangzhou.aliyuncs.com/img/image-20221121130857072.png) diff --git a/source/_posts/image/Oracle/image-20221017111632399.png b/source/_posts/image/Oracle/image-20221017111632399.png deleted file mode 100644 index 06112b6..0000000 Binary files a/source/_posts/image/Oracle/image-20221017111632399.png and /dev/null differ diff --git a/source/_posts/image/Oracle/image-20221017112825105.png b/source/_posts/image/Oracle/image-20221017112825105.png deleted file mode 100644 index 3380e52..0000000 Binary files a/source/_posts/image/Oracle/image-20221017112825105.png and /dev/null differ diff --git a/source/_posts/image/Oracle/image-20221017123327552.png b/source/_posts/image/Oracle/image-20221017123327552.png deleted file mode 100644 index 47d9625..0000000 Binary files a/source/_posts/image/Oracle/image-20221017123327552.png and /dev/null differ diff --git a/source/_posts/image/Oracle/image-20221017145702216.png b/source/_posts/image/Oracle/image-20221017145702216.png deleted file mode 100644 index b297ea0..0000000 Binary files a/source/_posts/image/Oracle/image-20221017145702216.png and /dev/null differ diff --git a/source/_posts/image/Oracle/image-20221020141231505.png b/source/_posts/image/Oracle/image-20221020141231505.png deleted file mode 100644 index 6aac9a5..0000000 Binary files a/source/_posts/image/Oracle/image-20221020141231505.png and /dev/null differ diff --git a/source/_posts/image/Typora/image-20221118150139161.png b/source/_posts/image/Typora/image-20221118150139161.png deleted file mode 100644 index 24c343c..0000000 Binary files a/source/_posts/image/Typora/image-20221118150139161.png and /dev/null differ