From 323458efdc2dde43dde06dedff93d5d6e161a156 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:41:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?!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=E5=A2=9E=E5=8A=A0do?= =?UTF-8?q?cker-compose=E9=83=A8=E7=BD=B2=20*=20Merge=20branch=20'develop'?= =?UTF-8?q?=20into=20dahuihui/develop=20*=20=E4=BF=AE=E5=A4=8D=E5=9B=A0lin?= =?UTF-8?q?ux=E4=B8=8B=E5=AD=98=E5=9C=A8=E6=95=B0=E6=8D=AE=E4=B8=8E?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0=E5=A4=A7=E5=B0=8F=E5=86=99?= =?UTF-8?q?=E4=B8=8D=E5=AF=B9=E5=BA=94=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=89=BE?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E7=89=B9=E9=87=8D=E6=96=B0=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E4=B8=80=E4=BB=BD=E8=A1=A8=E5=90=8D=E4=B8=8E=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E5=90=8D=E7=A7=B0=E4=B8=80=E4=B8=80=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E3=80=82=20*=20=E6=96=B0mysql=E8=A1=A8?= =?UTF-8?q?=E5=90=8D=E5=AD=98=E5=9C=A8=E5=A4=A7=E5=B0=8F=E5=86=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= 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】文件， ### ⚡ 进度及计划 From 669bf4d36bc11470a587cbf6af7e0a1ff8b711ba 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:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?!34=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=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=91=BD=E5=90=8D=20*=20=E5=A2=9E=E5=8A=A0docker-comp?= =?UTF-8?q?ose=E9=83=A8=E7=BD=B2=20*=20Merge=20branch=20'develop'=20into?= =?UTF-8?q?=20dahuihui/develop=20*=20=E4=BF=AE=E5=A4=8D=E5=9B=A0linux?= =?UTF-8?q?=E4=B8=8B=E5=AD=98=E5=9C=A8=E6=95=B0=E6=8D=AE=E4=B8=8E=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E7=A7=B0=E5=A4=A7=E5=B0=8F=E5=86=99=E4=B8=8D?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=89=BE=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E7=89=B9=E9=87=8D=E6=96=B0=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E4=B8=80=E4=BB=BD=E8=A1=A8=E5=90=8D=E4=B8=8E=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=B8=80=E4=B8=80=E5=AF=B9=E5=BA=94=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E3=80=82=20*=20=E6=96=B0mysql=E8=A1=A8=E5=90=8D?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E5=A4=A7=E5=B0=8F=E5=86=99=E9=97=AE=E9=A2=98?= 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 ++++++++++++------------ 核心商城.sln => CoreShop.sln | 0 README.md | 6 ++++++ 4 files changed, 29 insertions(+), 23 deletions(-) rename 核心商城.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/核心商城.sln b/CoreShop.sln similarity index 100% rename from 核心商城.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) 组织。 From a7cfa9a48fc48d2fd252688a6594432285cfd859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E7=A5=A5=E5=BE=B7?= Date: Wed, 23 Jun 2021 10:02:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?bug=20-=20=E3=80=90=E5=95=86=E5=93=81?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=91-=20[=E6=89=B9=E9=87=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BB=B7=E6=A0=BC]=20=E4=BF=AE=E5=A4=8Dids=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E9=80=9A=E8=BF=87=E8=A1=A8=E5=8D=95=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wwwroot/views/good/goods/batchModifyPrice.html | 1 - .../wwwroot/views/good/goods/batchModifyStock.html | 1 - CoreCms.Net.Web.Admin/wwwroot/views/good/goods/index.html | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/batchModifyPrice.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/batchModifyPrice.html index 2b1aa70..694ba7f 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/batchModifyPrice.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/batchModifyPrice.html @@ -16,7 +16,6 @@
-
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/batchModifyStock.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/batchModifyStock.html index 745b148..b3ca0a8 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/batchModifyStock.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/batchModifyStock.html @@ -5,7 +5,6 @@

当前选中{{ d.params.data.entity.id.length }}条数据

-
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/index.html index 757786d..8c9d247 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/index.html @@ -470,7 +470,7 @@ form.on('submit(LAY-app-CoreCmsGoods-batchModifyPrice-submit)', function (data) { var field = data.field; //获取提交的字段 - field.ids = field.ids.split(','); + field.ids = e.data.entity.id; if (debug) { console.log(field); } //开启调试返回数据 //return false; //提交 Ajax 成功后，关闭当前弹层并重载表格 @@ -507,7 +507,7 @@ form.on('submit(LAY-app-CoreCmsGoods-batchModifyStock-submit)', function (data) { var field = data.field; //获取提交的字段 - field.ids = field.ids.split(','); + field.ids = e.data.entity.id; if (debug) { console.log(field); } //开启调试返回数据 //return false; //提交 Ajax 成功后，关闭当前弹层并重载表格