From 3cbeb23b77dccce40322d076b04579dd62be3c3a Mon Sep 17 00:00:00 2001
From: hzq <huanguuq@163.com>
Date: Sat, 24 Dec 2022 23:21:06 +0800
Subject: [PATCH] .

---
 orm/cms/Article.sql                      |  2 +-
 orm/cms/include/articlebase.h            | 30 ++++-----
 orm/cms/include/userbase.h               | 10 +--
 vendor/httpcli/modelfun.hpp              | 85 ++++++++++++++++++++++--
 vendor/httpserver/include/mysqlmodel.hpp | 43 ++++++------
 5 files changed, 121 insertions(+), 49 deletions(-)

diff --git a/orm/cms/Article.sql b/orm/cms/Article.sql
index 721549d3..816ec9e9 100644
--- a/orm/cms/Article.sql
+++ b/orm/cms/Article.sql
@@ -20,4 +20,4 @@ CREATE TABLE `article` (
   `summary` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '文章摘要',
   `editauthor` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '文章编辑',
   PRIMARY KEY (`aid`)
-) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci
\ No newline at end of file
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci
\ No newline at end of file
diff --git a/orm/cms/include/articlebase.h b/orm/cms/include/articlebase.h
index 8d5cfbcf..8a1f6c18 100644
--- a/orm/cms/include/articlebase.h
+++ b/orm/cms/include/articlebase.h
@@ -2,7 +2,7 @@
 #define ORM_CMS_ARTICLEBASEMATA_H
 /*
 *This file is auto create from cli
-*本文件为自动生成 Fri, 23 Dec 2022 16:21:15 GMT
+*本文件为自动生成 Sat, 24 Dec 2022 15:17:41 GMT
 ***/
 #include <iostream>
 #include <cstdio>
@@ -530,14 +530,14 @@ tempsql<<"null";
 	tempsql<<std::to_string(data.aid);
 }
 if(data.classtype==0){
-tempsql<<"null";
+	tempsql<<",0";
  }else{ 
-	tempsql<<std::to_string(data.classtype);
+	tempsql<<","<<std::to_string(data.classtype);
 }
 if(data.userid==0){
-tempsql<<"null";
+	tempsql<<",0";
  }else{ 
-	tempsql<<std::to_string(data.userid);
+	tempsql<<","<<std::to_string(data.userid);
 }
 tempsql<<",'"<<stringaddslash(data.title)<<"'";
 tempsql<<",'"<<stringaddslash(data.keywords)<<"'";
@@ -546,31 +546,31 @@ tempsql<<",'"<<stringaddslash(data.author)<<"'";
 tempsql<<",'"<<stringaddslash(data.addip)<<"'";
 tempsql<<",'"<<stringaddslash(data.createtime)<<"'";
 if(data.addtime==0){
-tempsql<<"null";
+	tempsql<<",0";
  }else{ 
-	tempsql<<std::to_string(data.addtime);
+	tempsql<<","<<std::to_string(data.addtime);
 }
 if(data.readnum==0){
-tempsql<<"null";
+	tempsql<<",0";
  }else{ 
-	tempsql<<std::to_string(data.readnum);
+	tempsql<<","<<std::to_string(data.readnum);
 }
 if(data.review==0){
-tempsql<<"null";
+	tempsql<<",0";
  }else{ 
-	tempsql<<std::to_string(data.review);
+	tempsql<<","<<std::to_string(data.review);
 }
 tempsql<<",'"<<stringaddslash(data.icoimg)<<"'";
 tempsql<<",'"<<stringaddslash(data.content)<<"'";
 if(data.isopen==0){
-tempsql<<"null";
+	tempsql<<",0";
  }else{ 
-	tempsql<<std::to_string(data.isopen);
+	tempsql<<","<<std::to_string(data.isopen);
 }
 if(data.iscomment==0){
-tempsql<<"null";
+	tempsql<<",0";
  }else{ 
-	tempsql<<std::to_string(data.iscomment);
+	tempsql<<","<<std::to_string(data.iscomment);
 }
 tempsql<<",'"<<stringaddslash(data.fromlocal)<<"'";
 tempsql<<",'"<<stringaddslash(data.texturl)<<"'";
diff --git a/orm/cms/include/userbase.h b/orm/cms/include/userbase.h
index 42531603..0e59faf7 100644
--- a/orm/cms/include/userbase.h
+++ b/orm/cms/include/userbase.h
@@ -2,7 +2,7 @@
 #define ORM_CMS_USERBASEMATA_H
 /*
 *This file is auto create from cli
-*本文件为自动生成 Fri, 23 Dec 2022 16:21:15 GMT
+*本文件为自动生成 Sat, 24 Dec 2022 15:17:41 GMT
 ***/
 #include <iostream>
 #include <cstdio>
@@ -238,14 +238,14 @@ tempsql<<"null";
 tempsql<<",'"<<stringaddslash(data.name)<<"'";
 tempsql<<",'"<<stringaddslash(data.password)<<"'";
 if(data.isopen==0){
-tempsql<<"null";
+	tempsql<<",0";
  }else{ 
-	tempsql<<std::to_string(data.isopen);
+	tempsql<<","<<std::to_string(data.isopen);
 }
 if(data.level==0){
-tempsql<<"null";
+	tempsql<<",0";
  }else{ 
-	tempsql<<std::to_string(data.level);
+	tempsql<<","<<std::to_string(data.level);
 }
 tempsql<<")";
 
diff --git a/vendor/httpcli/modelfun.hpp b/vendor/httpcli/modelfun.hpp
index b13b0ac2..a79d672e 100755
--- a/vendor/httpcli/modelfun.hpp
+++ b/vendor/httpcli/modelfun.hpp
@@ -1471,25 +1471,98 @@ struct )";
         {
            if(table_type[j]!=7)
            {
+            if(j==0)
+            {
+                if(tablecollist[j]==tablepkname)
+                {
+                    insertstrem << "if(data." << tablecollist[j] << "==0){\n";
+                    insertstrem << "tempsql<<\"null\";\n";
+                    insertstrem << " }else{ \n";
+                    insertstrem << "\ttempsql<<std::to_string(data." << tablecollist[j] << ");\n";
+                    insertstrem << "}\n";
+                }
+                else 
+                {
+                    insertstrem << "if(data." << tablecollist[j] << "==0){\n";
+                    insertstrem << "\ttempsql<<\"0\";\n";
+                    insertstrem << " }else{ \n";
+                    insertstrem << "\ttempsql<<std::to_string(data." << tablecollist[j] << ");\n";
+                    insertstrem << "}\n";
+                }
+            }
+            else
+            {
+                if(tablecollist[j]==tablepkname)
+                {
+                    insertstrem << "if(data." << tablecollist[j] << "==0){\n";
+                    insertstrem << "tempsql<<\",null\";\n";
+                    insertstrem << " }else{ \n";
+                    insertstrem << "\ttempsql<<\",\"<<std::to_string(data." << tablecollist[j] << ");\n";
+                    insertstrem << "}\n";
+                }
+                else 
+                {
+                    insertstrem << "if(data." << tablecollist[j] << "==0){\n";
+                    insertstrem << "\ttempsql<<\",0\";\n";
+                    insertstrem << " }else{ \n";
+                    insertstrem << "\ttempsql<<\",\"<<std::to_string(data." << tablecollist[j] << ");\n";
+                    insertstrem << "}\n";
+                }
+            }
+
+
+            continue;
+           } 
+            
+        }
+                // 数字
+        if (j == 0)
+        {
+            if(tablecollist[j]==tablepkname)
+            {
             insertstrem << "if(data." << tablecollist[j] << "==0){\n";
             insertstrem << "tempsql<<\"null\";\n";
             insertstrem << " }else{ \n";
             insertstrem << "\ttempsql<<std::to_string(data." << tablecollist[j] << ");\n";
             insertstrem << "}\n";
+            }
+            else
+            {
+                if (colltypeshuzi[j] < 30)
+                {
+                    insertstrem << "if(data." << tablecollist[j] << "==0){\n";
+                    insertstrem << "\ttempsql<<\"0\";\n";
+                    insertstrem << " }else{ \n";
+                    insertstrem << "\ttempsql<<\"\"<<std::to_string(data." << tablecollist[j] << ");\n";
+                    insertstrem << "}\n";
+                }
+                else if (colltypeshuzi[j] == 60)
+                {
+                    insertstrem << "  \nif(data." << tablecollist[j] << ".size()==0){ \n";
+                    insertstrem << "tempsql<<\" CURRENT_TIMESTAMP \";\n";
+                    insertstrem << " }else{ \n tempsql<<\"'\"<<data." << tablecollist[j] << "<<\"'\";\n }\n";
+                }
+                else if (colltypeshuzi[j] == 61)
+                {
+                    insertstrem << "  \nif(data." << tablecollist[j] << ".size()==0){ \n";
+                    insertstrem << "tempsql<<\"CURRENT_DATE \";\n";
+                    insertstrem << " }else{ \n tempsql<<\"'\"<<data." << tablecollist[j] << "<<\"'\";\n }\n";
+                }
+                else
+                {
+
+                    insertstrem << "tempsql<<\"'\"<<stringaddslash(data." << tablecollist[j] << ")<<\"'\";\n";
+                }
+            }
+
             continue;
-           } 
-            
         }
         if (colltypeshuzi[j] < 30)
         {
             insertstrem << "if(data." << tablecollist[j] << "==0){\n";
-
             insertstrem << "\ttempsql<<\",0\";\n";
-
             insertstrem << " }else{ \n";
-
             insertstrem << "\ttempsql<<\",\"<<std::to_string(data." << tablecollist[j] << ");\n";
-
             insertstrem << "}\n";
         }
         else if (colltypeshuzi[j] == 60)
diff --git a/vendor/httpserver/include/mysqlmodel.hpp b/vendor/httpserver/include/mysqlmodel.hpp
index 587308ab..706f9654 100755
--- a/vendor/httpserver/include/mysqlmodel.hpp
+++ b/vendor/httpserver/include/mysqlmodel.hpp
@@ -71,7 +71,7 @@ namespace orm
                 std::unique_ptr<MYSQL, decltype(&mysql_close)> conn = http::get_mysqlselectexecute(dbhash);
                 MYSQL_RES *resultone = nullptr;
                 mysql_ping(conn.get());
-                int readnum = mysql_query(conn.get(), &countsql[0]);
+                long long readnum = mysql_real_query(conn.get(), &sqlstring[0],sqlstring.size());
 
                 if (readnum != 0)
                 {
@@ -164,9 +164,9 @@ namespace orm
 
             try
             {
-                std::unique_ptr<MYSQL, decltype(&mysql_close)> conn = http::get_mysqlselectexecute(dbhash);
+                std::unique_ptr<MYSQL, decltype(&mysql_close)> conn = http::get_mysqleditexecute(dbhash);
                 mysql_ping(conn.get());
-                long long readnum = mysql_query(conn.get(), &countsql[0]);
+                long long readnum = mysql_real_query(conn.get(), &sqlstring[0],sqlstring.size());
                 readnum = mysql_affected_rows(conn.get());
                 try
                 {
@@ -1285,7 +1285,7 @@ namespace orm
                 std::unique_ptr<MYSQL, decltype(&mysql_close)> conn = http::get_mysqlselectexecute(dbhash);
                 MYSQL_RES *resultall = nullptr;
                 mysql_ping(conn.get());
-                int readnum = mysql_query(conn.get(), &sqlstring[0]);
+                long long readnum = mysql_real_query(conn.get(), &sqlstring[0],sqlstring.size());
 
                 if (readnum != 0)
                 {
@@ -1390,7 +1390,7 @@ namespace orm
                 std::unique_ptr<MYSQL, decltype(&mysql_close)> conn = http::get_mysqlselectexecute(dbhash);
                 MYSQL_RES *resultall = nullptr;
                 mysql_ping(conn.get());
-                int readnum = mysql_query(conn.get(), &sqlstring[0]);
+                long long readnum = mysql_real_query(conn.get(), &sqlstring[0],sqlstring.size());
 
                 if (readnum != 0)
                 {
@@ -1506,7 +1506,7 @@ namespace orm
                 std::unique_ptr<MYSQL, decltype(&mysql_close)> conn = http::get_mysqlselectexecute(dbhash);
                 MYSQL_RES *resultall = nullptr;
                 mysql_ping(conn.get());
-                int readnum = mysql_query(conn.get(), &sqlstring[0]);
+                long long readnum = mysql_real_query(conn.get(), &sqlstring[0],sqlstring.size());
 
                 if (readnum != 0)
                 {
@@ -1642,7 +1642,7 @@ namespace orm
                 std::unique_ptr<MYSQL, decltype(&mysql_close)> conn = http::get_mysqlselectexecute(dbhash);
                 MYSQL_RES *resultall = nullptr;
                 mysql_ping(conn.get());
-                int readnum = mysql_query(conn.get(), &sqlstring[0]);
+                long long readnum = mysql_real_query(conn.get(), &sqlstring[0],sqlstring.size());
 
                 if (readnum != 0)
                 {
@@ -1721,7 +1721,7 @@ namespace orm
                 std::unique_ptr<MYSQL, decltype(&mysql_close)> conn = http::get_mysqlselectexecute(dbhash);
                 MYSQL_RES *resultone = nullptr;
                 mysql_ping(conn.get());
-                int readnum = mysql_query(conn.get(), &sqlstring[0]);
+                long long readnum = mysql_real_query(conn.get(), &sqlstring[0],sqlstring.size());
 
                 if (readnum != 0)
                 {
@@ -1806,9 +1806,9 @@ namespace orm
             }
             try
             {
-                std::unique_ptr<MYSQL, decltype(&mysql_close)> conn = http::get_mysqlselectexecute(dbhash);
+                std::unique_ptr<MYSQL, decltype(&mysql_close)> conn = http::get_mysqleditexecute(dbhash);
                 mysql_ping(conn.get());
-                long long readnum = mysql_query(conn.get(), &sqlstring[0]);
+                long long readnum = mysql_real_query(conn.get(), &sqlstring[0],sqlstring.size());
                 readnum = mysql_affected_rows(conn.get());
                 try
                 {
@@ -1856,9 +1856,9 @@ namespace orm
             }
             try
             {
-                std::unique_ptr<MYSQL, decltype(&mysql_close)> conn = http::get_mysqlselectexecute(dbhash);
+                std::unique_ptr<MYSQL, decltype(&mysql_close)> conn = http::get_mysqleditexecute(dbhash);
                 mysql_ping(conn.get());
-                long long readnum = mysql_query(conn.get(), &sqlstring[0]);
+                long long readnum = mysql_real_query(conn.get(), &sqlstring[0],sqlstring.size());
                 readnum = mysql_affected_rows(conn.get());
                 try
                 {
@@ -1904,9 +1904,9 @@ namespace orm
             }
             try
             {
-                std::unique_ptr<MYSQL, decltype(&mysql_close)> conn = http::get_mysqlselectexecute(dbhash);
+                std::unique_ptr<MYSQL, decltype(&mysql_close)> conn = http::get_mysqleditexecute(dbhash);
                 mysql_ping(conn.get());
-                long long readnum = mysql_query(conn.get(), &sqlstring[0]);
+                long long readnum = mysql_real_query(conn.get(), &sqlstring[0],sqlstring.size());
                 readnum = mysql_affected_rows(conn.get());
                 try
                 {
@@ -1937,9 +1937,9 @@ namespace orm
 
             try
             {
-                std::unique_ptr<MYSQL, decltype(&mysql_close)> conn = http::get_mysqlselectexecute(dbhash);
+                std::unique_ptr<MYSQL, decltype(&mysql_close)> conn = http::get_mysqleditexecute(dbhash);
                 mysql_ping(conn.get());
-                long long readnum = mysql_query(conn.get(), &sqlstring[0]);
+                long long readnum = mysql_real_query(conn.get(), &sqlstring[0],sqlstring.size());
                 readnum = mysql_affected_rows(conn.get());
                 try
                 {
@@ -1991,10 +1991,9 @@ namespace orm
 
                 try
                 {
-                    std::unique_ptr<MYSQL, decltype(&mysql_close)> conn = http::get_mysqlselectexecute(dbhash);
+                    std::unique_ptr<MYSQL, decltype(&mysql_close)> conn = http::get_mysqleditexecute(dbhash);
                     mysql_ping(conn.get());
-                    long long readnum = mysql_query(conn.get(), &sqlstring[0]);
-
+                    long long readnum = mysql_real_query(conn.get(), &sqlstring[0],sqlstring.size());
                     if (readnum != 0)
                     {
                         error_msg = std::string(mysql_error(conn.get()));
@@ -2029,10 +2028,10 @@ namespace orm
 
                 try
                 {
-                    std::unique_ptr<MYSQL, decltype(&mysql_close)> conn = http::get_mysqlselectexecute(dbhash);
+                    sqlstring = base::_makeinsertsql();
+                    std::unique_ptr<MYSQL, decltype(&mysql_close)> conn = http::get_mysqleditexecute(dbhash);
                     mysql_ping(conn.get());
-                    long long readnum = mysql_query(conn.get(), &sqlstring[0]);
-
+                    long long readnum = mysql_real_query(conn.get(), &sqlstring[0],sqlstring.size());
                     if (readnum != 0)
                     {
                         error_msg = std::string(mysql_error(conn.get()));