diff --git a/CoreCms.Net.Uni-App/CoreShop/.hbuilderx/launch.json b/CoreCms.Net.Uni-App/CoreShop/.hbuilderx/launch.json index 81f13f4f4025c3f1d4a881de5addd979dff6ae15..32f4dc599fab99484f6d736d7e48460af54b1ac8 100644 --- a/CoreCms.Net.Uni-App/CoreShop/.hbuilderx/launch.json +++ b/CoreCms.Net.Uni-App/CoreShop/.hbuilderx/launch.json @@ -6,6 +6,10 @@ { "launchtype" : "local" }, + "h5" : + { + "launchtype" : "local" + }, "mp-weixin" : { "launchtype" : "local" diff --git a/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js b/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js index 2ffaf6d04e207bc5bf6a33af562de899915c3d9e..9d10c0633dab799d9628964e88cfd4c6c10f6728 100644 --- a/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js +++ b/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js @@ -4,7 +4,8 @@ */ //接口请求地址，如果需要不部署接口端的情况下测试uni-app，可以直接替换为官方测试接口：https://api.demo.coreshop.cn -export const apiBaseUrl = 'https://api.demo.coreshop.cn'; +export const apiBaseUrl = 'https://csi.actfuns.com'; +// export const apiBaseUrl = 'http://localhost:5000'; //项目静态资源请求地址，如果使用官方的静态文件地址可以直接替换为：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 d3a60f7730714147efcc15c3e71fe1a6aa33cc2b..5184d6488f824116532712487e2256ed3f37de6a 100644 --- a/CoreCms.Net.Uni-App/CoreShop/manifest.json +++ b/CoreCms.Net.Uni-App/CoreShop/manifest.json @@ -1,7 +1,7 @@ { - "name" : "核心商城系统", + "name" : "商城系统", "appid" : "__UNI__EAACF14", - "description" : "核心商城系统（CoreShop）是基于uni-app框架开发的商城应用程序", + "description" : "商城系统（CoreShop）是基于uni-app框架开发的商城应用程序", "versionName" : "1.0", "versionCode" : 1, "transformPx" : false, @@ -102,7 +102,7 @@ "quickapp" : {}, /* 快应用特有相关 */ "mp-weixin" : { - "appid" : "wx11d95cdaee6058f6", + "appid" : "wxfc07021f4aac80a2", "setting" : { "urlCheck" : true, "postcss" : true, diff --git a/CoreCms.Net.Web.Admin/NLog.config b/CoreCms.Net.Web.Admin/NLog.config index dd97751f2c87c16b2f8b29006354d4eaead82393..f19f37a6ad984c0df2820d4e67c495cdcf6b7c92 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/appsettings.json b/CoreCms.Net.Web.Admin/appsettings.json index f756f66d09777b3828c9b04fc21a7b8f5535b50f..0eb1c90d4130c0f5a3f3c17de8d7ecd064223dc2 100644 --- a/CoreCms.Net.Web.Admin/appsettings.json +++ b/CoreCms.Net.Web.Admin/appsettings.json @@ -1,11 +1,12 @@ { "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;" + "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;" + //"SqlConnection": "Server=127.0.0.1;Port=3306;Database=CoreShop;Uid=root;Pwd=206206A@b;CharSet=utf8;pooling=true;SslMode=None;Allow User Variables=true;Convert Zero Datetime=True;Allow Zero Datetime=True;" + "SqlConnection": "Server=127.0.0.1;Port=5407;Database=CoreShop;Uid=root;Pwd=206206A@b;CharSet=utf8;pooling=true;SslMode=None;Allow User Variables=true;Convert Zero Datetime=True;Allow Zero Datetime=True;" // Mysql数据库链接字符串，请保持后面的属性别少。经过测试，mysql版本需要5.7或以上 }, //定时任务管理面板的账户密码 @@ -14,8 +15,8 @@ "PassWord": "CoreShop" }, "AppConfig": { - "AppUrl": "https://admin.demo.coreshop.cn/", //后端管理地址 - "AppInterFaceUrl": "https://api.demo.coreshop.cn/" //接口请求地址 + "AppUrl": "https://csa.actfuns.com", //后端管理地址 + "AppInterFaceUrl": "https://csi.actfuns.com" //接口请求地址 }, //redis为必须启动项，请保持redis为正常可用 "RedisConfig": { @@ -163,8 +164,8 @@ "EncodingAESKey": "", "Token": "", //小程序 - "WxOpenAppId": "", - "WxOpenAppSecret": "", + "WxOpenAppId": "wxfc07021f4aac80a2", + "WxOpenAppSecret": "9bd86638e4cc07504c57ce354ccc9e83", "WxOpenToken": "", "WxOpenEncodingAESKey": "" } diff --git a/CoreCms.Net.Web.WebApi/NLog.config b/CoreCms.Net.Web.WebApi/NLog.config index 66ef6225bec5172bcec45072b25f5f7beb3f2d79..305416934f6559afbb17099e7bd789b09efd71d5 100644 --- a/CoreCms.Net.Web.WebApi/NLog.config +++ b/CoreCms.Net.Web.WebApi/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.WebApi/appsettings.json b/CoreCms.Net.Web.WebApi/appsettings.json index f756f66d09777b3828c9b04fc21a7b8f5535b50f..1846d35d92f2af3a5b5f376b8ef5f83d19499a19 100644 --- a/CoreCms.Net.Web.WebApi/appsettings.json +++ b/CoreCms.Net.Web.WebApi/appsettings.json @@ -1,11 +1,11 @@ { "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;" + "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;" + "SqlConnection": "Server=42.193.144.68;Port=5407;Database=CoreShop;Uid=root;Pwd=206206A@b;CharSet=utf8;pooling=true;SslMode=None;Allow User Variables=true;Convert Zero Datetime=True;Allow Zero Datetime=True;" // Mysql数据库链接字符串，请保持后面的属性别少。经过测试，mysql版本需要5.7或以上 }, //定时任务管理面板的账户密码 @@ -14,8 +14,8 @@ "PassWord": "CoreShop" }, "AppConfig": { - "AppUrl": "https://admin.demo.coreshop.cn/", //后端管理地址 - "AppInterFaceUrl": "https://api.demo.coreshop.cn/" //接口请求地址 + "AppUrl": "https://csa.actfuns.com", //后端管理地址 + "AppInterFaceUrl": "https://csi.actfuns.com" //接口请求地址 }, //redis为必须启动项，请保持redis为正常可用 "RedisConfig": { @@ -163,8 +163,8 @@ "EncodingAESKey": "", "Token": "", //小程序 - "WxOpenAppId": "", - "WxOpenAppSecret": "", + "WxOpenAppId": "wxfc07021f4aac80a2", + "WxOpenAppSecret": "9bd86638e4cc07504c57ce354ccc9e83", "WxOpenToken": "", "WxOpenEncodingAESKey": "" }