From e363a51c88a2d8d97c9591d042e9a0c40f02cfa8 Mon Sep 17 00:00:00 2001 From: kang <843893414@qq.com> Date: Thu, 13 Jul 2023 22:26:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1=E3=80=81=E5=BE=AE=E4=BF=A1=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E9=85=8D=E7=BD=AE=202=E3=80=81layui=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E5=90=8E=20=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E6=94=B9?= =?UTF-8?q?=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index dcdea0d..0275bf3 100644 --- a/.gitignore +++ b/.gitignore @@ -368,4 +368,5 @@ FodyWeavers.xsd node_modules/ .project unpackage/ -.DS_Store \ No newline at end of file +.DS_Store +/CoreCms.Net.Web.Admin/wwwroot/files -- Gitee From 630da6e4830a94bce5661d3f8c244f10c3ea42ba Mon Sep 17 00:00:00 2001 From: kang <843893414@qq.com> Date: Thu, 13 Jul 2023 22:34:04 +0800 Subject: [PATCH 2/4] =?UTF-8?q?1=E3=80=81=E5=BE=AE=E4=BF=A1=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E9=85=8D=E7=BD=AE=202=E3=80=81layui=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E5=90=8E=20=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E6=94=B9?= =?UTF-8?q?=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/setting/constVarsHelper.js | 2 +- CoreCms.Net.Uni-App/CoreShop/manifest.json | 319 ++++++++--------- CoreCms.Net.Uni-App/CoreShop/pages.json | 40 +-- .../CoreShop/pages/index/member/member.vue | 4 +- CoreCms.Net.Web.Admin/NLog.config | 2 +- .../WxPayCert/apiclient_cert.p12 | Bin 0 -> 2774 bytes .../WxPayCert/apiclient_cert.pem | 25 ++ .../WxPayCert/apiclient_key.pem | 28 ++ CoreCms.Net.Web.Admin/appsettings.json | 330 +++++++++--------- .../wwwroot/views/order/orders/index.html | 21 +- CoreCms.Net.Web.WebApi/Doc.xml | 58 +-- CoreCms.Net.Web.WebApi/NLog.config | 2 +- .../WxPayCert/1614195192_20230629_cert.zip | Bin 0 -> 6545 bytes .../apiclient_cert.p12 | Bin 0 -> 2774 bytes .../apiclient_cert.pem | 25 ++ .../apiclient_key.pem | 28 ++ ...4\347\222\207\345\255\230\346\247\221.txt" | 18 + .../WxPayCert/apiclient_cert.p12 | Bin 0 -> 2774 bytes .../WxPayCert/apiclient_cert.pem | 25 ++ .../WxPayCert/apiclient_key.pem | 28 ++ CoreCms.Net.Web.WebApi/appsettings.json | 330 +++++++++--------- CoreCms.Net.Web.WebApi/start.bat | 2 + 22 files changed, 708 insertions(+), 579 deletions(-) create mode 100644 CoreCms.Net.Web.Admin/WxPayCert/apiclient_cert.p12 create mode 100644 CoreCms.Net.Web.Admin/WxPayCert/apiclient_cert.pem create mode 100644 CoreCms.Net.Web.Admin/WxPayCert/apiclient_key.pem create mode 100644 CoreCms.Net.Web.WebApi/WxPayCert/1614195192_20230629_cert.zip create mode 100644 CoreCms.Net.Web.WebApi/WxPayCert/1614195192_20230629_cert/apiclient_cert.p12 create mode 100644 CoreCms.Net.Web.WebApi/WxPayCert/1614195192_20230629_cert/apiclient_cert.pem create mode 100644 CoreCms.Net.Web.WebApi/WxPayCert/1614195192_20230629_cert/apiclient_key.pem create mode 100644 "CoreCms.Net.Web.WebApi/WxPayCert/1614195192_20230629_cert/\347\222\207\344\275\267\345\212\237\346\265\243\350\267\250\346\225\244\347\222\207\345\255\230\346\247\221.txt" create mode 100644 CoreCms.Net.Web.WebApi/WxPayCert/apiclient_cert.p12 create mode 100644 CoreCms.Net.Web.WebApi/WxPayCert/apiclient_cert.pem create mode 100644 CoreCms.Net.Web.WebApi/WxPayCert/apiclient_key.pem create mode 100644 CoreCms.Net.Web.WebApi/start.bat diff --git a/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js b/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js index 9b97878..233ac65 100644 --- a/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js +++ b/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js @@ -4,7 +4,7 @@ */ //接口请求地址，如果需要不部署接口端的情况下测试uni-app，可以直接替换为官方测试接口：https://api.demo.coreshop.cn -export const apiBaseUrl = 'https://api.demo.coreshop.cn'; +export const apiBaseUrl = 'https://api.suyine.vip'; //项目静态资源请求地址，如果使用官方的静态文件地址可以直接替换为：https://files.cdn.coreshop.cn export const apiFilesUrl = 'https://files.cdn.coreshop.cn'; diff --git a/CoreCms.Net.Uni-App/CoreShop/manifest.json b/CoreCms.Net.Uni-App/CoreShop/manifest.json index 133dc90..def540d 100644 --- a/CoreCms.Net.Uni-App/CoreShop/manifest.json +++ b/CoreCms.Net.Uni-App/CoreShop/manifest.json @@ -1,169 +1,172 @@ { - "name": "核心商城系统", - "appid": "__UNI__EAACF14", - "description": "核心商城系统（CoreShop）是基于uni-app框架开发的商城应用程序", - "versionName": "1.0", - "versionCode": 1, - "transformPx": false, - "app-plus": { - /* 5+App特有相关 */ - "modules": { - "Payment": {}, - "VideoPlayer": {} - }, - /* 模块配置 */ - "distribute": { - /* 应用发布信息 */ - "android": { - /* android打包配置 */ - "permissions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ], - "abiFilters": [ "armeabi-v7a", "arm64-v8a", "x86" ] - }, - "ios": {}, - /* ios打包配置 */ - "sdkConfigs": { - "payment": { - "weixin": { - "appid": "wxd56f71964a318e5d" - }, - "alipay": { - "scheme": "" - } + "name" : "核心商城系统", + "appid" : "__UNI__07D27B2", + "description" : "核心商城系统（CoreShop）是基于uni-app框架开发的商城应用程序", + "versionName" : "1.0", + "versionCode" : 1, + "transformPx" : false, + "app-plus" : { + /* 5+App特有相关 */ + "modules" : { + "Payment" : {}, + "VideoPlayer" : {} }, - "ad": {}, - "maps": {}, - "oauth": { - "univerify": {} - } - }, - "icons": { - "android": { - "hdpi": "unpackage/res/icons/72x72.png", - "xhdpi": "unpackage/res/icons/96x96.png", - "xxhdpi": "unpackage/res/icons/144x144.png", - "xxxhdpi": "unpackage/res/icons/192x192.png" + /* 模块配置 */ + "distribute" : { + /* 应用发布信息 */ + "android" : { + /* android打包配置 */ + "permissions" : [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ] + }, + "ios" : {}, + /* ios打包配置 */ + "sdkConfigs" : { + "payment" : { + "weixin" : { + "appid" : "wxd56f71964a318e5d" + }, + "alipay" : { + "scheme" : "" + } + }, + "ad" : {}, + "maps" : {}, + "oauth" : { + "univerify" : {} + } + }, + "icons" : { + "android" : { + "hdpi" : "unpackage/res/icons/72x72.png", + "xhdpi" : "unpackage/res/icons/96x96.png", + "xxhdpi" : "unpackage/res/icons/144x144.png", + "xxxhdpi" : "unpackage/res/icons/192x192.png" + }, + "ios" : { + "appstore" : "unpackage/res/icons/1024x1024.png", + "ipad" : { + "app" : "unpackage/res/icons/76x76.png", + "app@2x" : "unpackage/res/icons/152x152.png", + "notification" : "unpackage/res/icons/20x20.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "proapp@2x" : "unpackage/res/icons/167x167.png", + "settings" : "unpackage/res/icons/29x29.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "spotlight" : "unpackage/res/icons/40x40.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png" + }, + "iphone" : { + "app@2x" : "unpackage/res/icons/120x120.png", + "app@3x" : "unpackage/res/icons/180x180.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "notification@3x" : "unpackage/res/icons/60x60.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "settings@3x" : "unpackage/res/icons/87x87.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png", + "spotlight@3x" : "unpackage/res/icons/120x120.png" + } + } + } }, - "ios": { - "appstore": "unpackage/res/icons/1024x1024.png", - "ipad": { - "app": "unpackage/res/icons/76x76.png", - "app@2x": "unpackage/res/icons/152x152.png", - "notification": "unpackage/res/icons/20x20.png", - "notification@2x": "unpackage/res/icons/40x40.png", - "proapp@2x": "unpackage/res/icons/167x167.png", - "settings": "unpackage/res/icons/29x29.png", - "settings@2x": "unpackage/res/icons/58x58.png", - "spotlight": "unpackage/res/icons/40x40.png", - "spotlight@2x": "unpackage/res/icons/80x80.png" - }, - "iphone": { - "app@2x": "unpackage/res/icons/120x120.png", - "app@3x": "unpackage/res/icons/180x180.png", - "notification@2x": "unpackage/res/icons/40x40.png", - "notification@3x": "unpackage/res/icons/60x60.png", - "settings@2x": "unpackage/res/icons/58x58.png", - "settings@3x": "unpackage/res/icons/87x87.png", - "spotlight@2x": "unpackage/res/icons/80x80.png", - "spotlight@3x": "unpackage/res/icons/120x120.png" - } + "splashscreen" : { + "waiting" : true } - } - }, - "splashscreen": { - "waiting": true - } - }, - /* SDK配置 */ - "quickapp": {}, - /* 快应用特有相关 */ - "mp-weixin": { - "appid": "wx6fc139d4de0b470f", - "setting": { - "urlCheck": true, - "postcss": true, - "minified": true, - "es6": true, - "checkSiteMap": false - }, - "permission": { - "scope.userFuzzyLocation": { - "desc": "你的位置信息将用于小程序定位" - } }, - "optimization": { - "subPackages": true - }, - "requiredPrivateInfos": [ "getFuzzyLocation" ] - }, - "h5": { - "title": "核心商城系统", - "domain": "https://h5.demo.coreshop.com.cn/", - "router": { - "base": "./", - "mode": "hash" - }, - "template": "index.html", - "devServer": { - "port": 80, - "disableHostCheck": true, - "https": true + /* SDK配置 */ + "quickapp" : {}, + /* 快应用特有相关 */ + "mp-weixin" : { + "appid" : "wx2310e63ecbcd43df", + "setting" : { + "urlCheck" : true, + "postcss" : true, + "minified" : true, + "es6" : true, + "checkSiteMap" : false + }, + "permission" : { + "scope.userFuzzyLocation" : { + "desc" : "你的位置信息将用于小程序定位" + }, + "scope.userLocation" : { + "desc" : "用于获取附近的门店列表。" + } + }, + "optimization" : { + "subPackages" : true + }, + "requiredPrivateInfos" : [ "getFuzzyLocation" ] }, - "sdkConfigs": { - "maps": { - "qqmap": { - "key": "XXXXX-XXXXX-XXXXX-XXXXX-XXXXX-XXXXX" + "h5" : { + "title" : "核心商城系统", + "domain" : "https://h5.demo.coreshop.com.cn/", + "router" : { + "base" : "./", + "mode" : "hash" + }, + "template" : "index.html", + "devServer" : { + "port" : 80, + "disableHostCheck" : true, + "https" : true + }, + "sdkConfigs" : { + "maps" : { + "qqmap" : { + "key" : "XXXXX-XXXXX-XXXXX-XXXXX-XXXXX-XXXXX" + } + } + }, + "optimization" : { + "treeShaking" : { + "enable" : false + } } - } }, - "optimization": { - "treeShaking": { - "enable": false - } - } - }, - "mp-toutiao": { - "setting": { - "es6": true, - "postcss": true, - "minified": true + "mp-toutiao" : { + "setting" : { + "es6" : true, + "postcss" : true, + "minified" : true + }, + "appid" : "" }, - "appid": "" - }, - "mp-qq": { - "setting": { - "es6": true, - "postcss": true, - "minified": true + "mp-qq" : { + "setting" : { + "es6" : true, + "postcss" : true, + "minified" : true + }, + "optimization" : { + "subPackages" : true + } }, - "optimization": { - "subPackages": true - } - }, - "mp-alipay": {}, - "mp-baidu": {} + "mp-alipay" : {}, + "mp-baidu" : {} } diff --git a/CoreCms.Net.Uni-App/CoreShop/pages.json b/CoreCms.Net.Uni-App/CoreShop/pages.json index fdb8d6e..f710a59 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages.json +++ b/CoreCms.Net.Uni-App/CoreShop/pages.json @@ -83,26 +83,26 @@ } ] }, - { - "root": "pages/serviceGoods", - "name": "serviceGoods", - "pages": [ - { - "path": "index/index", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "服务商品列表" - } - }, - { - "path": "details/details", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "服务商品详情" - } - } - ] - }, + // { + // "root": "pages/serviceGoods", + // "name": "serviceGoods", + // "pages": [ + // { + // "path": "index/index", + // "style": { + // "navigationBarTextStyle": "black", + // "navigationBarTitleText": "服务商品列表" + // } + // }, + // { + // "path": "details/details", + // "style": { + // "navigationBarTextStyle": "black", + // "navigationBarTitleText": "服务商品详情" + // } + // } + // ] + // }, { "root": "pages/map", "name": "map", diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.vue b/CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.vue index b69bfde..d14be4e 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.vue @@ -188,10 +188,12 @@ import { commonUse, articles } from '@/common/mixins/mixinsHelper.js'; import { mapMutations, mapActions, mapState } from 'vuex'; import copyright from '@/components/coreshop-copyright/coreshop-copyright.vue'; + import img from '@/components/coreshop-modal-img/coreshop-modal-img.vue'; export default { mixins: [commonUse, articles], components: { - copyright + copyright, + img }, data() { return { diff --git a/CoreCms.Net.Web.Admin/NLog.config b/CoreCms.Net.Web.Admin/NLog.config index 1a2906c..cd3c2ab 100644 --- a/CoreCms.Net.Web.Admin/NLog.config +++ b/CoreCms.Net.Web.Admin/NLog.config @@ -14,7 +14,7 @@ dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient" connectionString="Server=127.0.0.1;Database=BaseMIS;User ID=sa;Password=123456" --> - + INSERT INTO SysNLogRecords (LogDate,LogLevel,LogType,LogTitle,Logger,Message,MachineName,MachineIp,NetRequestMethod diff --git a/CoreCms.Net.Web.Admin/WxPayCert/apiclient_cert.p12 b/CoreCms.Net.Web.Admin/WxPayCert/apiclient_cert.p12 new file mode 100644 index 0000000000000000000000000000000000000000..a80e7015853c1f5651d727d4cecc65aa529448c1 GIT binary patch literal 2774 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 literal 0 HcmV?d00001 diff --git a/CoreCms.Net.Web.Admin/WxPayCert/apiclient_cert.pem b/CoreCms.Net.Web.Admin/WxPayCert/apiclient_cert.pem new file mode 100644 index 0000000..ae80def --- /dev/null +++ b/CoreCms.Net.Web.Admin/WxPayCert/apiclient_cert.pem @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIEKDCCAxCgAwIBAgIUIRwt2Y/g+Pt1ztobZGc4WzSK6nowDQYJKoZIhvcNAQEL +BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT +FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg +Q0EwHhcNMjMwNjI5MTU0MzMwWhcNMjgwNjI3MTU0MzMwWjCBgTETMBEGA1UEAwwK +MTYxNDE5NTE5MjEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMS0wKwYDVQQL +DCTlkIjogqXluILonIDlsbHljLrntKDlpo3ljJblpoblk4HlupcxCzAJBgNVBAYM +AkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBALk9lcf24sv/Yxg8FStU7OGgX8g1LyEVzegyEQf9k0Wos8DYD2xYM3+V +fDf+alCZ1aXC+DqERviQYJLZB50uGi41W7gKq7T2JBozx+z9LeDHNjGNxARrvWZ0 +wChbnoL3yElL1sgJ2YCk+jpDyXgyshO8zHSQZ/vHyAmCSBap5mtL9mElgKJbTeqf +bhBf3BxOvxzD3QRril1F4d4qsSMRNc7QP0t1qqSnfPNqoZaLdqTkUddjE4BQrwJc +HcaJxwWaivt+rBGBPlXyIakVZWAWvQXSHAxARSF4DMej9+w1AOXdK4ZCuX0P/IBa +euMw4PbmBYm1Y3AQApKRP+dEk4nPjTMCAwEAAaOBuTCBtjAJBgNVHRMEAjAAMAsG +A1UdDwQEAwID+DCBmwYDVR0fBIGTMIGQMIGNoIGKoIGHhoGEaHR0cDovL2V2Y2Eu +aXRydXMuY29tLmNuL3B1YmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRC +MDZBRDM5NzU0OTg0NkMwMUMzRThFQkQyJnNnPUhBQ0M0NzFCNjU0MjJFMTJCMjdB +OUQzM0E4N0FEMUNERjU5MjZFMTQwMzcxMA0GCSqGSIb3DQEBCwUAA4IBAQCdRczZ +xLg2WmMlB6k4o7d0rbpzodvMGjbekqLKYb9GbhGu100rKICaKv6VH4OYdZVCLl7M +QrKJPk+8/vLEfuuyxkWUVe1oyWVy9KhKMNHyRkgUv/z3uXfQ4fYtzMrySQb6ndLv +lYaQez1Oy/ekapxroFqgOrH55qdB6z8jCCs8/RS7f7ZmWKpoWTrhlzJ8iNrSjW6r +rybPif332qciMFAGQ9EF5WbrJHdfFUdcVQX08IpLuwuiB75P9AT0/XfP2FUM6Skw +/P9WcjNNaM+dP0j9TjqmOjI+vKDsnuJceAZ1NiedsZ0aWXo//g7f0jEYLN9h8YbG +5Gm2YMQ9gNJhbSNa +-----END CERTIFICATE----- diff --git a/CoreCms.Net.Web.Admin/WxPayCert/apiclient_key.pem b/CoreCms.Net.Web.Admin/WxPayCert/apiclient_key.pem new file mode 100644 index 0000000..ca593fc --- /dev/null +++ b/CoreCms.Net.Web.Admin/WxPayCert/apiclient_key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC5PZXH9uLL/2MY +PBUrVOzhoF/INS8hFc3oMhEH/ZNFqLPA2A9sWDN/lXw3/mpQmdWlwvg6hEb4kGCS +2QedLhouNVu4Cqu09iQaM8fs/S3gxzYxjcQEa71mdMAoW56C98hJS9bICdmApPo6 +Q8l4MrITvMx0kGf7x8gJgkgWqeZrS/ZhJYCiW03qn24QX9wcTr8cw90Ea4pdReHe +KrEjETXO0D9Ldaqkp3zzaqGWi3ak5FHXYxOAUK8CXB3GiccFmor7fqwRgT5V8iGp +FWVgFr0F0hwMQEUheAzHo/fsNQDl3SuGQrl9D/yAWnrjMOD25gWJtWNwEAKSkT/n +RJOJz40zAgMBAAECggEBAKVfgbR/iIIugb1FBnEk5EWZ82i9clHLMYQ2DlZf33a0 +4aUsPrivFWq1faxPiYJjlATkRs+W//Uwj8cJ0m5UljLil/t6K0jm5dwuljHQ5YBi +2NLsiS6ZMQGjAVoGUUEDDN/CwQDdKjxbDLmvgtG4EJrmVnFJ6ksxVDiJAuqYy4jF +RmGuaf4K616AMYQ73bx5nhHQ/GITAGLzR+ZP7KHY2jcBLHUDHZw76rTRqwDmcj/P +eyrRiGq5u5QvEtxDQUTr8uL89d272ix9wqehk+RnQ/YJj8Eq6woOFSCMiv6FsLSs +Q4Uiejlnr+xP1DHuIhBo5ofG1VyD4+KhsKaezmZUkGECgYEA6e4SSEbnmWyULUFb +0UbRYeEFAzhcgKEJB0ST7ej5DoG/c1Dho2LQSendenKuF0yN7DedXiWYl9UFR52+ +JgI94jq96l5Q7ehT6BOGpbSmhqQCtqLQ+HOggrIIiCDd2Z288ENBUikK5DI6N3R+ +1OEo+IlwJkQ8LoYxocqsW10Rsd0CgYEAyreOc8qnqXW//rg9YyoYvBiWny/6y4rm +v+uNDb3/4M3Y3PatXA6APLZu7Yw0YMU1iGzfrz6936KgDRVKANpHmvLYEL6BQsH6 +N/NQbTWr/0xGstiB663sr2wBs8IYsU8I74Zlf+s6T/YOwmIi7zIYlxr9aABLeCuA +oRpoxHKGsk8CgYEAquwdhZvxKuPv3KUtvlqdMIQmknTC+eUv4JSV9bZNC/F3fn1x +cF0JzYfIIOjcFQAFjrwQCrMzrHSkN/Ck98aZisva6fzh6wLfE+n4bujw5928cc/D +GlX5yKTmoPhKwO+FFpQ9jReZ8qRUbyJ6bXba5cYeIIeo5WF9sDaS+uqkvC0CgYEA +oOzanz1PoA0j31fvE5vFivySBckW9SJNUCn0Dea5DIMdFzyUHrI8RvYkVVup8PBd +MPINGJdcL/5vxDMUTlz53x3NPG2fO5m1w1jajfe/lKm+rheF+8xUSmYZa9Q3ufoe +A9fTF5tq7TNOQC2bwfso3jvE0xz4zGrsb/gBF4I7P60CgYARU8LMxsDcThv6tBv4 +KtE1IlRSLvfZ+/0QOZkN9QesSYXNRmj3uDn9o7/2Lw2k1mOE7xO5YWrA0+zsKFtk +vB/KODjeVXVvRuwQgCOvh/mWMzxJVxBc7zGqPAPY7W3nezE1x9v8eA4hx5RwF/G/ +0aPet+mcj2g45KZ0iGr3mQ8Fiw== +-----END PRIVATE KEY----- diff --git a/CoreCms.Net.Web.Admin/appsettings.json b/CoreCms.Net.Web.Admin/appsettings.json index f756f66..59b62b9 100644 --- a/CoreCms.Net.Web.Admin/appsettings.json +++ b/CoreCms.Net.Web.Admin/appsettings.json @@ -1,171 +1,171 @@ { - "ConnectionStrings": { - "DbType": "SqlServer", //数据库将支持两种模式【SqlServer,MySql】 - "SqlConnection": "Server=127.0.0.1;uid=CoreShop;pwd=CoreShop;Database=CoreShop;MultipleActiveResultSets=true;pooling=true;min pool size=5;max pool size=32767;connect timeout=20;Encrypt=True;TrustServerCertificate=True;" - //SqlServer数据库连接字符串，需要开启数据库连接复用【MultipleActiveResultSets=true】 + "ConnectionStrings": { + "DbType": "MySql", //数据库将支持两种模式【SqlServer,MySql】 + //"SqlConnection": "Server=127.0.0.1;uid=CoreShop;pwd=CoreShop;Database=CoreShop;MultipleActiveResultSets=true;pooling=true;min pool size=5;max pool size=32767;connect timeout=20;Encrypt=True;TrustServerCertificate=True;" + //SqlServer数据库连接字符串，需要开启数据库连接复用【MultipleActiveResultSets=true】 - // 如果采用容器化部署Service 要写成mysql的服务名，否则写地址 - //"SqlConnection": "Server=127.0.0.1;Port=3306;Database=CoreShop;Uid=CoreShop;Pwd=CoreShop;CharSet=utf8;pooling=true;SslMode=None;Allow User Variables=true;Convert Zero Datetime=True;Allow Zero Datetime=True;" - // Mysql数据库链接字符串，请保持后面的属性别少。经过测试，mysql版本需要5.7或以上 - }, - //定时任务管理面板的账户密码 - "HangFire": { - "Login": "CoreShop", - "PassWord": "CoreShop" - }, - "AppConfig": { - "AppUrl": "https://admin.demo.coreshop.cn/", //后端管理地址 - "AppInterFaceUrl": "https://api.demo.coreshop.cn/" //接口请求地址 - }, - //redis为必须启动项，请保持redis为正常可用 - "RedisConfig": { - "UseCache": true, //启用redis作为内存选择 - "UseTimedTask": true, //启用redis作为定时任务 - // 如果采用容器化部署Service 要写成redis的服务名，否则写地址 - "ConnectionString": "127.0.0.1:6379,password=CoreShop,connectTimeout=3000,connectRetry=1,syncTimeout=10000,DefaultDatabase=10" //redis数据库连接字符串 - }, - //jwt授权认证的一些设置 - "JwtConfig": { - "SecretKey": "8kh2luzmp0oq9wfbdeasygj647vr531n", - "Issuer": "CoreShop", - "Audience": "CoreCms" - }, - //跨域设置 - "Cors": { - "PolicyName": "CorsIpAccess", //策略名称 - "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" - }, - //中间件 - "Middleware": { - //记录请求和响应数据 - "RequestResponseLog": { - "Enabled": false + // 如果采用容器化部署Service 要写成mysql的服务名，否则写地址 + "SqlConnection": "Server=106.52.124.214;Port=3306;Database=CoreShop;Uid=rootor;Pwd=058052d9-5814-11ed-afe5-5254006ab13f;CharSet=utf8;pooling=true;SslMode=None;Allow User Variables=true;Convert Zero Datetime=True;Allow Zero Datetime=True;" + // Mysql数据库链接字符串，请保持后面的属性别少。经过测试，mysql版本需要5.7或以上 }, - //记录用户方访问数据 - "RecordAccessLogs": { - "Enabled": false, - "IgnoreApis": "/api/Home/GetNav,/api/Home/GetIds4Users" + //定时任务管理面板的账户密码 + "HangFire": { + "Login": "CoreShop", + "PassWord": "CoreShop" }, - //记录IP请求数据 - "IPLog": { - "Enabled": false - } - }, - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" + "AppConfig": { + "AppUrl": "https://admin.suyine.vip/", //后端管理地址 + "AppInterFaceUrl": "https://api.suyine.vip/" //接口请求地址 + }, + //redis为必须启动项，请保持redis为正常可用 + "RedisConfig": { + "UseCache": true, //启用redis作为内存选择 + "UseTimedTask": true, //启用redis作为定时任务 + // 如果采用容器化部署Service 要写成redis的服务名，否则写地址 + "ConnectionString": "106.52.124.214:6379,password=123456,connectTimeout=3000,connectRetry=1,syncTimeout=10000,DefaultDatabase=10" //redis数据库连接字符串 + }, + //jwt授权认证的一些设置 + "JwtConfig": { + "SecretKey": "8kh2luzmp0oq9wfbdeasygj647vr531n", + "Issuer": "CoreShop", + "Audience": "CoreCms" + }, + //跨域设置 + "Cors": { + "PolicyName": "CorsIpAccess", //策略名称 + "EnableAllIPs": true, //是否应用所有的IP，如设置为true，则取消跨域限制 + // 支持多个域名端口，注意端口号后不要带/斜杆：比如localhost:8000/，是错的 + // 注意，http://127.0.0.1:1818 和 http://localhost:1818 是不一样的 + "IPs": "http://127.0.0.1:2364,http://localhost:2364" + }, + //中间件 + "Middleware": { + //记录请求和响应数据 + "RequestResponseLog": { + "Enabled": false + }, + //记录用户方访问数据 + "RecordAccessLogs": { + "Enabled": false, + "IgnoreApis": "/api/Home/GetNav,/api/Home/GetIds4Users" + }, + //记录IP请求数据 + "IPLog": { + "Enabled": false + } + }, + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + }, + "AllowedHosts": "*", + //易联云打印机设置【很不错的一个网络打印机，价格也很便宜https://www.yilianyun.net/】 + "YiLianYunConfig": { + //是否开启 + "Enabled": false, + //应用id + "ClientId": "", + //应用密钥 string + "ClientSecret": "", + //打印机设备号 + "MachineCode": "", + //打印机终端密钥 + "Msign": "", + //打印机名称 + "PrinterName": "", + //打印机设置联系电话 + "Phone": "" + }, + // 微信支付 + // 更多配置，请查看WeChatPayOptions类 + "WeChatPay": { + // 应用号 + // 如：微信公众平台AppId、微信开放平台AppId、微信小程序AppId、企业微信CorpId等 + "AppId": "wx2310e63ecbcd43df", //操作密码 911116 + // 商户号 + // 为微信支付商户平台的商户号 + "MchId": "1614195192", + // API密钥 + // 为微信支付商户平台的API密钥，请注意不是APIv3密钥 + "APIKey": "e3a31183749d09c3cf9ef31c9f09a747", + // APIv3密钥 + // 为微信支付商户平台的APIv3密钥，请注意不是API密钥，v3接口必填 + "APIv3Key": "", + // API证书(.p12) + // 为微信支付商户平台的API证书(.p12)，v3接口必填 + // 可为证书文件(.p12)路径 / 证书文件(.p12)的base64字符串 + //以下格式为windows服务器下路径格式，linux下格式为 WxPayCert/apiclient_cert.p12 + "Certificate": "WxPayCert\\apiclient_cert.p12", + // RSA公钥 + // 目前仅调用"企业付款到银行卡API"时使用，执行本示例中的"获取RSA加密公钥API"即可获取。 + "RsaPublicKey": "" + }, + // 支付宝（暂未开通） + // 更多配置，请查看AlipayOptions类 + "Alipay": { + // 注意: + // 若涉及资金类支出接口(如转账、红包等)接入，必须使用“公钥证书”方式。不涉及到资金类接口，也可以使用“普通公钥”方式进行加签。 + // 本示例默认的加签方式为“公钥证书”方式，并调用 CertificateExecuteAsync 方法 执行API。 + // 若使用“普通公钥”方式，除了遵守下方注释的规则外，调用 CertificateExecuteAsync 也需改成 ExecuteAsync。 + // 支付宝后台密钥/证书官方配置教程：https://opendocs.alipay.com/open/291/105971 + // 密钥格式：请选择 PKCS1(非JAVA适用)，切记 切记 切记 + // 应用Id + // 为支付宝开放平台-APPID + "AppId": "", + // 支付宝公钥 RSA公钥 + // 为支付宝开放平台-支付宝公钥 + // “公钥证书”方式时，留空 + // “普通公钥”方式时，必填 + "AlipayPublicKey": "", + // 应用私钥 RSA私钥 + // 为“支付宝开放平台开发助手”所生成的应用私钥 + "AppPrivateKey": "", + // 服务网关地址 + // 默认为正式环境地址 + "ServerUrl": "https://openapi.alipay.com/gateway.do", + // 签名类型 + // 支持：RSA2(SHA256WithRSA)、RSA1(SHA1WithRSA) + // 默认为RSA2 + "SignType": "RSA2", + // 应用公钥证书 + // 可为证书文件路径 / 证书文件的base64字符串 + // “公钥证书”方式时，必填 + // “普通公钥”方式时，留空 + "AppPublicCert": "", + // 支付宝公钥证书 + // 可为证书文件路径 / 证书文件的base64字符串 + // “公钥证书”方式时，必填 + // “普通公钥”方式时，留空 + "AlipayPublicCert": "", + // 支付宝根证书 + // 可为证书文件路径 / 证书文件的base64字符串 + // “公钥证书”方式时，必填 + // “普通公钥”方式时，留空 + "AlipayRootCert": "" + }, + "PayCallBack": { + //微信支付回调 + "WeChatPayUrl": "https://api.suyine.vip/Notify/WeChatPay/Unifiedorder", + //微信退款回调 + "WeChatRefundUrl": "https://api.suyine.vip/Notify/WeChatPay/Refund", + //支付宝支付回调 + "AlipayUrl": "", + //支付宝退款回调 + "AlipayRefundUrl": "" + }, + "WeChatOptions": { + //公众号 + "WeiXinAppId": "wx2310e63ecbcd43df", + "WeiXinAppSecret": "e3a31183749d09c3cf9ef31c9f09a747", + "EncodingAESKey": "", + "Token": "", + //小程序 + "WxOpenAppId": "wx2310e63ecbcd43df", + "WxOpenAppSecret": "e3a31183749d09c3cf9ef31c9f09a747", + "WxOpenToken": "e3a31183749d09c3cf9ef31c9f09a747", + "WxOpenEncodingAESKey": "102TV1Wqf563VV1pIOnfg4dI1mYnmKeBtJZFKDXQ9Sy" } - }, - "AllowedHosts": "*", - //易联云打印机设置【很不错的一个网络打印机，价格也很便宜https://www.yilianyun.net/】 - "YiLianYunConfig": { - //是否开启 - "Enabled": false, - //应用id - "ClientId": "", - //应用密钥 string - "ClientSecret": "", - //打印机设备号 - "MachineCode": "", - //打印机终端密钥 - "Msign": "", - //打印机名称 - "PrinterName": "", - //打印机设置联系电话 - "Phone": "" - }, - // 微信支付 - // 更多配置，请查看WeChatPayOptions类 - "WeChatPay": { - // 应用号 - // 如：微信公众平台AppId、微信开放平台AppId、微信小程序AppId、企业微信CorpId等 - "AppId": "", - // 商户号 - // 为微信支付商户平台的商户号 - "MchId": "", - // API密钥 - // 为微信支付商户平台的API密钥，请注意不是APIv3密钥 - "APIKey": "", - // APIv3密钥 - // 为微信支付商户平台的APIv3密钥，请注意不是API密钥，v3接口必填 - "APIv3Key": "", - // API证书(.p12) - // 为微信支付商户平台的API证书(.p12)，v3接口必填 - // 可为证书文件(.p12)路径 / 证书文件(.p12)的base64字符串 - //以下格式为windows服务器下路径格式，linux下格式为 WxPayCert/apiclient_cert.p12 - "Certificate": "WxPayCert\\apiclient_cert.p12", - // RSA公钥 - // 目前仅调用"企业付款到银行卡API"时使用，执行本示例中的"获取RSA加密公钥API"即可获取。 - "RsaPublicKey": "" - }, - // 支付宝（暂未开通） - // 更多配置，请查看AlipayOptions类 - "Alipay": { - // 注意: - // 若涉及资金类支出接口(如转账、红包等)接入，必须使用“公钥证书”方式。不涉及到资金类接口，也可以使用“普通公钥”方式进行加签。 - // 本示例默认的加签方式为“公钥证书”方式，并调用 CertificateExecuteAsync 方法 执行API。 - // 若使用“普通公钥”方式，除了遵守下方注释的规则外，调用 CertificateExecuteAsync 也需改成 ExecuteAsync。 - // 支付宝后台密钥/证书官方配置教程：https://opendocs.alipay.com/open/291/105971 - // 密钥格式：请选择 PKCS1(非JAVA适用)，切记 切记 切记 - // 应用Id - // 为支付宝开放平台-APPID - "AppId": "", - // 支付宝公钥 RSA公钥 - // 为支付宝开放平台-支付宝公钥 - // “公钥证书”方式时，留空 - // “普通公钥”方式时，必填 - "AlipayPublicKey": "", - // 应用私钥 RSA私钥 - // 为“支付宝开放平台开发助手”所生成的应用私钥 - "AppPrivateKey": "", - // 服务网关地址 - // 默认为正式环境地址 - "ServerUrl": "https://openapi.alipay.com/gateway.do", - // 签名类型 - // 支持：RSA2(SHA256WithRSA)、RSA1(SHA1WithRSA) - // 默认为RSA2 - "SignType": "RSA2", - // 应用公钥证书 - // 可为证书文件路径 / 证书文件的base64字符串 - // “公钥证书”方式时，必填 - // “普通公钥”方式时，留空 - "AppPublicCert": "", - // 支付宝公钥证书 - // 可为证书文件路径 / 证书文件的base64字符串 - // “公钥证书”方式时，必填 - // “普通公钥”方式时，留空 - "AlipayPublicCert": "", - // 支付宝根证书 - // 可为证书文件路径 / 证书文件的base64字符串 - // “公钥证书”方式时，必填 - // “普通公钥”方式时，留空 - "AlipayRootCert": "" - }, - "PayCallBack": { - //微信支付回调 - "WeChatPayUrl": "https://api.demo.coreshop.cn/Notify/WeChatPay/Unifiedorder", - //微信退款回调 - "WeChatRefundUrl": "https://api.demo.coreshop.cn/Notify/WeChatPay/Refund", - //支付宝支付回调 - "AlipayUrl": "", - //支付宝退款回调 - "AlipayRefundUrl": "" - }, - "WeChatOptions": { - //公众号 - "WeiXinAppId": "", - "WeiXinAppSecret": "", - "EncodingAESKey": "", - "Token": "", - //小程序 - "WxOpenAppId": "", - "WxOpenAppSecret": "", - "WxOpenToken": "", - "WxOpenEncodingAESKey": "" - } } \ No newline at end of file diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html index d2d80c1..5bccc2c 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html @@ -82,7 +82,7 @@ @@ -113,7 +113,7 @@ @@ -135,7 +135,7 @@
-
+
@@ -144,7 +144,7 @@
-
+
@@ -152,7 +152,7 @@
-
+
@@ -160,7 +160,7 @@
-
+
@@ -168,7 +168,7 @@
-
+
@@ -263,6 +263,7 @@ table.render({ //id: 'orderTable', elem: '#LAY-app-CoreCmsOrder-tableBox', + escape: false, // 不开启 HTML 编码 url: layui.setter.apiUrl + 'Api/CoreCmsOrder/GetPageList', method: 'POST', height: 'full-130', //无面包屑127,搜索框189,1行62 @@ -280,7 +281,7 @@ cols: [ [ { type: 'checkbox' }, - { field: 'operating', title: '操作', width: 60, align: 'center' }, + { field: 'operating', title: '操作', width: 100, align: 'center' }, { field: 'orderId', title: '订单号', @@ -316,7 +317,7 @@ field: 'orderId', title: '打印', align: 'center', - width: 80, + width: 120, templet: function (data) { var html = '购物单
'; html += '配送单
'; @@ -1363,7 +1364,7 @@