1、修复mysql数据库下,报表统计sql的语法错误。2、为方便前端在不部署接口及后端的情况下测试uni-app前端，默认增加了测试接口地址，3、mysql数据库字符串增加用户自定义变量支持

4 years ago · d7f6bed9ac
parent b0c11a0c45
commit d7f6bed9ac
5 changed files with 26 additions and 38 deletions
--- a/CoreCms.Net.Services/Financial/CoreCmsReportsServices.cs
+++ b/CoreCms.Net.Services/Financial/CoreCmsReportsServices.cs
@ -79,8 +79,8 @@ namespace CoreCms.Net.Services
                (SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9 UNION SELECT 10) x2,
                (SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9 UNION SELECT 10) x3,
                (SELECT @xi:=-1) x0 limit 0," + num + @") tmp_x
-                left join(
-                    select* from CoreCmsOrder
+                left join (
+                    select * from CoreCmsOrder
                where 1 = 1
                " + where + @"
                    ) o on tmp_x.x = ((cast(date(o." + joinVal + @") as signed) - " + sTime.ToString("yyyy-MM-dd") + @") div(" + section + @"))
@ -90,10 +90,6 @@ namespace CoreCms.Net.Services


            var sp = new List<SugarParameter>();
-            //sp.Add(section == 3600 ? new SugarParameter("@dataType", "HOUR") : new SugarParameter("@dataType", "DAY"));
-            //sp.Add(new SugarParameter("@sTime", sTime.ToString("yyyy-MM-dd HH:mm:ss")));
-            //sp.Add(new SugarParameter("@where", where));
-            //sp.Add(new SugarParameter("@num", num));

            var list = _dal.SqlQuery(sqlStr, sp);

@ -140,10 +136,10 @@ namespace CoreCms.Net.Services
                (SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9 UNION SELECT 10) x1,
                (SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9 UNION SELECT 10) x2,
                (SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9 UNION SELECT 10) x3,
-                (SELECT @xi:=-1) x0 limit 0," + num + @") tmp_x
-                left join(
-                    select* from CoreCmsBillPayments
-                where 1 = 1
+                (SELECT @xi:=-1) x0 limit 0," + num + @") tmp_x 
+            left join (
+                    select * from CoreCmsBillPayments 
+            where 1 = 1
                " + where + @"
                    ) o on tmp_x.x = ((cast(date(o." + joinVal + @") as signed) - " + sTime.ToString("yyyy-MM-dd") + @") div(" + section + @"))
                group by tmp_x.x
@ -151,10 +147,7 @@ namespace CoreCms.Net.Services
            }

            var sp = new List<SugarParameter>();
-            //sp.Add(section == 3600 ? new SugarParameter("@dataType", "HOUR") : new SugarParameter("@dataType", "DAY"));
-            //sp.Add(new SugarParameter("@sTime", sTime.ToString("yyyy-MM-dd HH:mm:ss")));
-            //sp.Add(new SugarParameter("@where", where));
-            //sp.Add(new SugarParameter("@num", num));
+

            var list = _dal.SqlQuery(sqlStr, sp);

@ -214,10 +207,7 @@ namespace CoreCms.Net.Services
            }

            var sp = new List<SugarParameter>();
-            //sp.Add(section == 3600 ? new SugarParameter("@dataType", "HOUR") : new SugarParameter("@dataType", "DAY"));
-            //sp.Add(new SugarParameter("@sTime", sTime.ToString("yyyy-MM-dd HH:mm:ss")));
-            //sp.Add(new SugarParameter("@where", where));
-            //sp.Add(new SugarParameter("@num", num));
+
            var list = _dal.SqlQuery(sqlStr, sp);

            return list;
@ -263,10 +253,10 @@ namespace CoreCms.Net.Services
                (SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9 UNION SELECT 10) x1,
                (SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9 UNION SELECT 10) x2,
                (SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9 UNION SELECT 10) x3,
-                (SELECT @xi:=-1) x0 limit 0," + num + @") tmp_x
-                left join(
-                    select* from CoreCmsUserTocash
-                where 1 = 1
+                (SELECT @xi:=-1) x0 limit 0," + num + @") tmp_x 
+            left join (
+                    select * from CoreCmsUserTocash 
+            where 1 = 1
                " + where + @"
                    ) o on tmp_x.x = ((cast(date(o." + joinVal + @") as signed) - " + sTime.ToString("yyyy-MM-dd") + @") div(" + section + @"))
                group by tmp_x.x
@ -274,10 +264,6 @@ namespace CoreCms.Net.Services
            }

            var sp = new List<SugarParameter>();
-            //sp.Add(section == 3600 ? new SugarParameter("@dataType", "HOUR") : new SugarParameter("@dataType", "DAY"));
-            //sp.Add(new SugarParameter("@sTime", sTime.ToString("yyyy-MM-dd HH:mm:ss")));
-            //sp.Add(new SugarParameter("@where", where));
-            sp.Add(new SugarParameter("@xi", num));

            var list = _dal.SqlQuery(sqlStr, sp);

--- a/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js
+++ b/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js
@ -2,8 +2,8 @@
 *  CoreShop全局配置文件
 *  @version 1.0.0
 */
-//接口请求地址
-export const apiBaseUrl = 'https://api.demo.coreshop.com.cn';
+//接口请求地址，如果需要不部署接口端的情况下测试uni-app，可以直接替换为官方测试接口：https://api.coreshop.corecms.net
+export const apiBaseUrl = 'https://api.coreshop.corecms.net';
 //项目静态资源请求地址，如果使用官方的静态文件地址可以直接替换为：https://files.coreshop.corecms.net
 export const apiFilesUrl = 'https://files.coreshop.corecms.net';

--- 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"
    -->
-    <target name="log_database" xsi:type="Database" dbProvider="MySql.Data.MySqlClient.MySqlConnection,Mysql.Data" connectionString="Server=mysql;Port=3306;Database=coreshop;Uid=root;Pwd=admin">
+    <target name="log_database" xsi:type="Database" dbProvider="MySql.Data.MySqlClient.MySqlConnection,Mysql.Data" connectionString="Server=panel.corecms.net;Port=3306;Database=CoreShopMysql;Uid=CoreShopMysql;Pwd=sstV0Qvbo7T9Zi7;CharSet=utf8;pooling=true;SslMode=None;Allow User Variables=true">
      <commandText>
        INSERT INTO SysNLogRecords
        (LogDate,LogLevel,LogType,LogTitle,Logger,Message,MachineName,MachineIp,NetRequestMethod
--- a/CoreCms.Net.Web.Admin/appsettings.json
+++ b/CoreCms.Net.Web.Admin/appsettings.json
@ -5,7 +5,7 @@
    //SqlServer数据库连接字符串，需要开启数据库连接复用【MultipleActiveResultSets=true】

    // 如果采用容器化部署Service 要写成mysql的服务名，否则写地址
-    "SqlConnection": "Server=mysql;Port=3306;Database=CoreShop;Uid=root;Pwd=admin"
+    "SqlConnection": "Server=127.0.0.1;Port=3306;Database=CoreShop;Uid=CoreShop;Pwd=CoreShop;CharSet=utf8;pooling=true;SslMode=None;Allow User Variables=true"
    // Mysql数据库链接字符串，请保持后面的属性别少。经过测试，mysql版本需要5.7或以上
  },
  //定时任务管理面板的账户密码
@ -14,15 +14,15 @@
    "PassWord": "CoreShop"
  },
  "AppConfig": {
-    "AppUrl": "https://admin.demo.CoreShop.com.cn/", //后端管理地址
-    "AppInterFaceUrl": "https://api.demo.CoreShop.com.cn/" //接口请求地址
+    "AppUrl": "https://admin.coreshop.corecms.net/", //后端管理地址
+    "AppInterFaceUrl": "https://api.coreshop.corecms.net/" //接口请求地址
  },
  //redis为必须启动项，请保持redis为正常可用
  "RedisConfig": {
    "Enabled": false, //启用redis作为内存选择
    "UseRedisMessageQueue": false, //启用redis作为队列选择
    // 如果采用容器化部署Service 要写成redis的服务名，否则写地址
-    "ConnectionString": "redis:6379,password=123456,connectTimeout=1000,connectRetry=1,syncTimeout=10000,DefaultDatabase=8" //redis数据库连接字符串
+    "ConnectionString": "127.0.0.1:6379,password=CoreShop,connectTimeout=3000,connectRetry=1,syncTimeout=10000,DefaultDatabase=10" //redis数据库连接字符串
  },
  //jwt授权认证的一些设置
  "JwtConfig": {
--- a/CoreCms.Net.Web.WebApi/appsettings.json
+++ b/CoreCms.Net.Web.WebApi/appsettings.json
@ -4,8 +4,9 @@
    //"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或以上，
+    // 如果采用容器化部署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"
+    // Mysql数据库链接字符串，请保持后面的属性别少。经过测试，mysql版本需要5.7或以上
  },
  //定时任务管理面板的账户密码
  "HangFire": {
@ -13,14 +14,15 @@
    "PassWord": "CoreShop"
  },
  "AppConfig": {
-    "AppUrl": "https://admin.demo.CoreShop.com.cn/", //后端管理地址
-    "AppInterFaceUrl": "https://api.demo.CoreShop.com.cn/" //接口请求地址
+    "AppUrl": "https://admin.coreshop.corecms.net/", //后端管理地址
+    "AppInterFaceUrl": "https://api.coreshop.corecms.net/" //接口请求地址
  },
  //redis为必须启动项，请保持redis为正常可用
  "RedisConfig": {
    "Enabled": false, //启用redis作为内存选择
    "UseRedisMessageQueue": false, //启用redis作为队列选择
-    "ConnectionString": "redis:6379,password=123456,connectTimeout=1000,connectRetry=1,syncTimeout=10000,DefaultDatabase=8" //redis数据库连接字符串
+    // 如果采用容器化部署Service 要写成redis的服务名，否则写地址
+    "ConnectionString": "127.0.0.1:6379,password=CoreShop,connectTimeout=3000,connectRetry=1,syncTimeout=10000,DefaultDatabase=10" //redis数据库连接字符串
  },
  //jwt授权认证的一些设置
  "JwtConfig": {