From 3053e2e293f0f0ea6a97322b9f7f0cbe62f0c6d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= Date: Sun, 20 Jun 2021 21:42:23 +0800 Subject: [PATCH 1/4] =?UTF-8?q?!33=20=E5=A2=9E=E5=8A=A0docker=20compose?= =?UTF-8?q?=E8=AF=B4=E6=98=8E=E4=BB=8B=E7=BB=8D=20*=20!32=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0docker=20compose=E8=AF=B4=E6=98=8E=E4=BB=8B=E7=BB=8D?= =?UTF-8?q?=20*=20!31=20add=20docker-compse=20deplay?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 77e74b7..0288e58 100644 --- a/README.md +++ b/README.md @@ -203,7 +203,8 @@ https://api.coreshop.corecms.net/job - [ ] （可选）易联云网络打印机 ### ⛵ 安装及说明文档 -- 由于文档内容较多，请加QQ群【70494974】后群内下载安装文档，或git源代码从其目录【文档】中获取。 +- 由于文档内容较多，请加QQ群 【[70494974](https://jq.qq.com/?_wv=1027&k=y83TiQC7)】 后群附内下载多种文档，或git源代码从其目录【文档】中获取。 +- 已经支持linux下docker-compose部署，可实现一键部署coreshop应用、mysql、redis，请获取代码中【docker-compose.yaml】文件， ### ⚡ 进度及计划 -- Gitee From 453f3fb0996df5232001326722f1d9148cfba46c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= Date: Sun, 20 Jun 2021 23:34:36 +0800 Subject: [PATCH 2/4] =?UTF-8?q?!35=20docker-compose=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E5=91=BD=E5=90=8D=20*=20!34=20docke?= =?UTF-8?q?r-compose=E9=83=A8=E7=BD=B2=EF=BC=8C=E8=B0=83=E6=95=B4=E5=91=BD?= =?UTF-8?q?=E5=90=8D=20*=20!32=20=E5=A2=9E=E5=8A=A0docker=20compose?= =?UTF-8?q?=E8=AF=B4=E6=98=8E=E4=BB=8B=E7=BB=8D=20*=20!31=20add=20docker-c?= =?UTF-8?q?ompse=20deplay?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CoreCms.Net.Web.Admin/appsettings.json | 22 ++++++++--------- CoreCms.Net.Web.WebApi/appsettings.json | 24 +++++++++---------- ...5\225\206\345\237\216.sln" => CoreShop.sln | 0 README.md | 6 +++++ 4 files changed, 29 insertions(+), 23 deletions(-) rename "\346\240\270\345\277\203\345\225\206\345\237\216.sln" => CoreShop.sln (100%) diff --git a/CoreCms.Net.Web.Admin/appsettings.json b/CoreCms.Net.Web.Admin/appsettings.json index bce6688..2f58d4b 100644 --- a/CoreCms.Net.Web.Admin/appsettings.json +++ b/CoreCms.Net.Web.Admin/appsettings.json @@ -1,21 +1,21 @@ { "ConnectionStrings": { "DbType": "MySql", //数据库将支持两种模式【SqlServer,MySql】 - //"SqlConnection": "Server=127.0.0.1;uid=coreshop;pwd=coreshop;Database=coreshop;MultipleActiveResultSets=true;" + //"SqlConnection": "Server=127.0.0.1;uid=CoreShop;pwd=CoreShop;Database=CoreShop;MultipleActiveResultSets=true;" //SqlServer数据库连接字符串，需要开启数据库连接复用【MultipleActiveResultSets=true】 // 如果采用容器化部署Service 要写成mysql的服务名，否则写地址 - "SqlConnection": "Server=mysql;Port=3306;Database=coreshop;Uid=root;Pwd=admin" + "SqlConnection": "Server=mysql;Port=3306;Database=CoreShop;Uid=root;Pwd=admin" // Mysql数据库链接字符串，请保持后面的属性别少。经过测试，mysql版本需要5.7或以上 }, //定时任务管理面板的账户密码 "HangFire": { - "Login": "coreshop", - "PassWord": "coreshop" + "Login": "CoreShop", + "PassWord": "CoreShop" }, "AppConfig": { - "AppUrl": "https://admin.demo.coreshop.com.cn/", //后端管理地址 - "AppInterFaceUrl": "https://api.demo.coreshop.com.cn/" //接口请求地址 + "AppUrl": "https://admin.demo.CoreShop.com.cn/", //后端管理地址 + "AppInterFaceUrl": "https://api.demo.CoreShop.com.cn/" //接口请求地址 }, //redis为必须启动项，请保持redis为正常可用 "RedisConfig": { @@ -27,13 +27,13 @@ //jwt授权认证的一些设置 "JwtConfig": { "SecretKey": "8kh2luzmp0oq9wfbdeasygj647vr531n", - "Issuer": "coreshop", - "Audience": "corecms" + "Issuer": "CoreShop", + "Audience": "CoreCms" }, //跨域设置 "Cors": { "PolicyName": "CorsIpAccess", //策略名称 - "EnableAllIPs": false, //是否应用所有的IP + "EnableAllIPs": false, //是否应用所有的IP，如设置为true，则取消跨域限制 // 支持多个域名端口，注意端口号后不要带/斜杆：比如localhost:8000/，是错的 // 注意，http://127.0.0.1:1818 和 http://localhost:1818 是不一样的 "IPs": "http://127.0.0.1:2364,http://localhost:2364" @@ -147,9 +147,9 @@ }, "PayCallBack": { //微信支付回调 - "WeChatPayUrl": "https://api.demo.coreshop.com.cn/Notify/WeChatPay/Unifiedorder", + "WeChatPayUrl": "https://api.demo.CoreShop.com.cn/Notify/WeChatPay/Unifiedorder", //微信退款回调 - "WeChatRefundUrl": "https://api.demo.coreshop.com.cn/Notify/WeChatPay/Refund", + "WeChatRefundUrl": "https://api.demo.CoreShop.com.cn/Notify/WeChatPay/Refund", //支付宝支付回调 "AlipayUrl": "", //支付宝退款回调 diff --git a/CoreCms.Net.Web.WebApi/appsettings.json b/CoreCms.Net.Web.WebApi/appsettings.json index b0c42c1..df77b28 100644 --- a/CoreCms.Net.Web.WebApi/appsettings.json +++ b/CoreCms.Net.Web.WebApi/appsettings.json @@ -1,20 +1,20 @@ { "ConnectionStrings": { "DbType": "MySql", //数据库将支持两种模式【SqlServer,MySql】 - //"SqlConnection": "Server=127.0.0.1;uid=coreshop;pwd=coreshop;Database=coreshop;MultipleActiveResultSets=true;" + //"SqlConnection": "Server=127.0.0.1;uid=CoreShop;pwd=CoreShop;Database=CoreShop;MultipleActiveResultSets=true;" //SqlServer数据库连接字符串，需要开启数据库连接复用【MultipleActiveResultSets=true】 - "SqlConnection": "Server=mysql;Port=3306;Database=coreshop;Uid=root;Pwd=admin" - // Mysql数据库链接字符串，请保持后面的属性别少。经过测试，mysql版本需要5.7或以上 + "SqlConnection": "Server=mysql;Port=3306;Database=CoreShop;Uid=root;Pwd=admin" + // Mysql数据库链接字符串，请保持后面的属性别少。经过测试，mysql版本需要5.7或以上， }, //定时任务管理面板的账户密码 "HangFire": { - "Login": "coreshop", - "PassWord": "coreshop" + "Login": "CoreShop", + "PassWord": "CoreShop" }, "AppConfig": { - "AppUrl": "https://admin.demo.coreshop.com.cn/", //后端管理地址 - "AppInterFaceUrl": "https://api.demo.coreshop.com.cn/" //接口请求地址 + "AppUrl": "https://admin.demo.CoreShop.com.cn/", //后端管理地址 + "AppInterFaceUrl": "https://api.demo.CoreShop.com.cn/" //接口请求地址 }, //redis为必须启动项，请保持redis为正常可用 "RedisConfig": { @@ -25,13 +25,13 @@ //jwt授权认证的一些设置 "JwtConfig": { "SecretKey": "8kh2luzmp0oq9wfbdeasygj647vr531n", - "Issuer": "coreshop", - "Audience": "corecms" + "Issuer": "CoreShop", + "Audience": "CoreCms" }, //跨域设置 "Cors": { "PolicyName": "CorsIpAccess", //策略名称 - "EnableAllIPs": false, //是否应用所有的IP + "EnableAllIPs": false, //是否应用所有的IP，如设置为true，则取消跨域限制 // 支持多个域名端口，注意端口号后不要带/斜杆：比如localhost:8000/，是错的 // 注意，http://127.0.0.1:1818 和 http://localhost:1818 是不一样的 "IPs": "http://127.0.0.1:2364,http://localhost:2364" @@ -145,9 +145,9 @@ }, "PayCallBack": { //微信支付回调 - "WeChatPayUrl": "https://api.demo.coreshop.com.cn/Notify/WeChatPay/Unifiedorder", + "WeChatPayUrl": "https://api.demo.CoreShop.com.cn/Notify/WeChatPay/Unifiedorder", //微信退款回调 - "WeChatRefundUrl": "https://api.demo.coreshop.com.cn/Notify/WeChatPay/Refund", + "WeChatRefundUrl": "https://api.demo.CoreShop.com.cn/Notify/WeChatPay/Refund", //支付宝支付回调 "AlipayUrl": "", //支付宝退款回调 diff --git "a/\346\240\270\345\277\203\345\225\206\345\237\216.sln" b/CoreShop.sln similarity index 100% rename from "\346\240\270\345\277\203\345\225\206\345\237\216.sln" rename to CoreShop.sln diff --git a/README.md b/README.md index 0288e58..518c1c2 100644 --- a/README.md +++ b/README.md @@ -233,6 +233,12 @@ https://api.coreshop.corecms.net/job 2. 欢迎提交 [issue](https://gitee.com/CoreUnion/CoreShop/issues)，请写清楚遇到问题的原因、开发环境、复显步骤以及期望达到的效果。 +### 💘 支持开源 +- 希望CoreShop对您有用，您的支持也是CoreShop开源的动力，CoreShop有你更精彩！ +![感谢您的支持](https://files.cdn.corecms.net/coreshop/images/PayeeCode.jpg "PayeeCode.png") + + + ### ☀️ 组织 - CoreShop 项目已加入 [dotNET China](https://gitee.com/dotnetchina) 组织。 -- Gitee From 57500661bda1d66251b2b549a2ecdd0d0a1a98d3 Mon Sep 17 00:00:00 2001 From: chazjon Date: Mon, 21 Jun 2021 17:51:43 +0800 Subject: [PATCH 3/4] no message --- .gitignore | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index dcdea0d..fecd846 100644 --- a/.gitignore +++ b/.gitignore @@ -368,4 +368,8 @@ FodyWeavers.xsd node_modules/ .project unpackage/ -.DS_Store \ No newline at end of file +.DS_Store +vcs.xml +.idea/ +Dockerfile + -- Gitee From 6f903acefc6d4ae5f537bd130e4f060029024c0e Mon Sep 17 00:00:00 2001 From: chazjon Date: Thu, 24 Jun 2021 15:39:45 +0800 Subject: [PATCH 4/4] no message --- Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..86202f9 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,5 @@ +FROM mcr.microsoft.com/dotnet/sdk:5.0 +WORKDIR /app +EXPOSE 80 +COPY adminpublish/ . +ENTRYPOINT ["dotnet", "CoreCms.Net.Web.Admin.dll","--urls","http://*:80"] \ No newline at end of file -- Gitee