简化数据库操作类；

ModuleSVNManager/ModuleSVNManager/DataImpl.cpp

@@ -99,42 +99,7 @@ INT CDataImpl::QueryModInfo(IN OUT std::vector<STModInfo> &vtModInfo)
 
 BOOL CDataImpl::InsertModInfo(IN STModInfo &stModInfo)
 {
-	if(m_psqlite3 == NULL)
-		return FALSE;
-
-	string strInsert = "INSERT INTO mod(mod_name,mod_addr,mod_ver) VALUES ('";
-#ifndef USE_UTF8
-	strInsert.append(stModInfo.strName);
-	strInsert.append("','");
-	strInsert.append(stModInfo.strAddress);
-	strInsert.append("','");
-	strInsert.append(stModInfo.strVersion);
-	strInsert.append("');");
-#else
-	string str;
-	CharEncoding::ASCII2UTF8(stModInfo.strName.c_str(),str);
-	strInsert.append(str);
-
-	strInsert.append("','");
-	CharEncoding::ASCII2UTF8(stModInfo.strAddress.c_str(),str);
-	strInsert.append(str);
-
-	strInsert.append("','");
-	CharEncoding::ASCII2UTF8(stModInfo.strVersion.c_str(),str);
-	strInsert.append(str);
-
-	strInsert.append("');");
-#endif
-
-	char* psqlite_error = NULL;
-	int sqlite_error = sqlite3_exec(m_psqlite3, strInsert.c_str(), NULL, 0, &psqlite_error);
-	if(SQLITE_OK != sqlite_error)
-	{
-		Global::WriteTextLog(_T("InsertModInfo:%s"), psqlite_error);
-		return FALSE;
-	}
-
-	return TRUE;
+	return InsertModInfo(stModInfo.strName.c_str(), stModInfo.strAddress.c_str(), stModInfo.strVersion.c_str());
 }
 
 BOOL CDataImpl::InsertModInfo(IN LPCSTR lpModName, IN LPCSTR lpModAddress, IN LPCSTR lpModVerion)
@@ -187,40 +152,7 @@ BOOL CDataImpl::InsertModInfo(IN LPCSTR lpModName, IN LPCSTR lpModAddress, IN LP
 
 BOOL CDataImpl::UpdateModInfo(IN STModInfo &stModInfo)
 {
-	if(m_psqlite3 == NULL)
-		return FALSE;
-
-	string strUpdate = "UPDATE mod SET mod_addr = '";
-#ifndef USE_UTF8
-	strUpdate.append(stModInfo.strAddress);
-	strUpdate.append("', mod_ver = '");
-	strUpdate.append(stModInfo.strVersion);
-	strUpdate.append("' WHERE mod_name = '");
-	strUpdate.append(stModInfo.strName);
-	strUpdate.append("';");
-#else
-	string str;
-	CharEncoding::ASCII2UTF8(stModInfo.strAddress.c_str(),str);
-	strUpdate.append(str);
-
-	strUpdate.append("', mod_ver = '");
-	CharEncoding::ASCII2UTF8(stModInfo.strVersion.c_str(),str);
-	strUpdate.append(str);
-
-	strUpdate.append("' WHERE mod_name = '");
-	strUpdate.append(stModInfo.strName);
-	strUpdate.append("';");
-#endif
-
-	char* psqlite_error = NULL;
-	int sqlite_error = sqlite3_exec(m_psqlite3, strUpdate.c_str(), NULL, 0, &psqlite_error);
-	if(SQLITE_OK != sqlite_error)
-	{
-		Global::WriteTextLog(_T("UpdateModInfo:%s"), psqlite_error);
-		return FALSE;
-	}
-
-	return TRUE;
+	return UpdateModInfo(stModInfo.strName.c_str(), stModInfo.strAddress.c_str(), stModInfo.strVersion.c_str());
 }
 
 BOOL CDataImpl::UpdateModInfo(IN LPCSTR lpModName, IN LPCSTR lpModAddress, IN LPCSTR lpModVerion)
@@ -271,22 +203,7 @@ BOOL CDataImpl::UpdateModInfo(IN LPCSTR lpModName, IN LPCSTR lpModAddress, IN LP
 
 BOOL CDataImpl::DeleteModInfo(IN STModInfo &stModInfo)
 {
-	if (m_psqlite3 == NULL)
-		return FALSE;
-
-	string strDelete = "DELETE FROM mod WHERE mod_name ='";
-	strDelete.append(stModInfo.strName);
-	strDelete.append("';");
-
-	char* psqlite_error = NULL;
-	int sqlite_error = sqlite3_exec(m_psqlite3, strDelete.c_str(), NULL, 0, &psqlite_error);
-	if (SQLITE_OK != sqlite_error)
-	{
-		Global::WriteTextLog(_T("DeleteModInfo:%s"), psqlite_error);
-		return FALSE;
-	}
-
-	return TRUE;
+	return DeleteModInfo(stModInfo.strName.c_str());
 }
 
 BOOL CDataImpl::DeleteModInfo(IN LPCSTR lpModName)

ModuleSVNManager/ModuleSVNManager/Global.cpp

@@ -36,14 +36,6 @@ namespace Global
 	DWORD g_dwSvrPort = 0;
 	DWORD g_dwDBPoolMaxCount = 1;						// 数据库连接池最大对象数;
 	DWORD g_dwDBPoolDef = 1;							// 数据库连接池默认对象数;
-	DWORD g_dwBalance = 100;
-	BOOL  g_bSendLog = FALSE;
-	TCHAR g_szAccount2[MAX_PATH] = {0};
-	TCHAR g_szAccount[MAX_PATH] = {0};
-	TCHAR g_szPassword[MAX_PATH] = {0};
-	TCHAR g_szSendTime[MAX_PATH] = {0};
-	TCHAR g_szExecDate[MAX_PATH] = {0};
-	TCHAR g_szReceivePhone[MAX_PATH] = {0};
 
 
 	/************************************************************************/
@@ -79,7 +71,7 @@ namespace Global
 		if (szPath != NULL && szIniName != NULL)
 			_stprintf_s(szIniPath, _T("%s%s"), szPath, szIniName);
 		else
-			_stprintf_s(szIniPath, _T("%ssms.ini"), g_szModulePath);
+			_stprintf_s(szIniPath, _T("%smod.ini"), g_szModulePath);
 
 		HANDLE hFile = CreateFile(szIniPath, 0/*GENERIC_READ*/, 0, NULL, OPEN_EXISTING, 0, NULL);
 		if (ERROR_FILE_NOT_FOUND == GetLastError())
@@ -90,21 +82,7 @@ namespace Global
 
 		// 获取服务器端信息;
 		GetPrivateProfileString(_T("NetWorkInfo"), _T("Host"), _T("liyafangzhou.eicp.net"), g_szSvrAddress, MAX_PATH, szIniPath);
-		GetPrivateProfileString(_T("NetWorkInfo"), _T("Account"), _T(""), g_szAccount, MAX_PATH, szIniPath);
-		GetPrivateProfileString(_T("NetWorkInfo"), _T("Password"), _T(""), g_szPassword, MAX_PATH, szIniPath);
-		g_dwSvrPort = GetPrivateProfileInt(_T("NetWorkInfo"), _T("SvrPort"), 8600, szIniPath);
-		g_dwBalance = GetPrivateProfileInt(_T("NetWorkInfo"), _T("Balance"), 500, szIniPath);
-
-		g_bSendLog = GetPrivateProfileInt(_T("SendLog"), _T("Enable"), 0, szIniPath);
-		GetPrivateProfileString(_T("SendLog"), _T("Account2"), _T(""), g_szAccount2, MAX_PATH, szIniPath);
-		GetPrivateProfileString(_T("SendLog"), _T("SendTime"), _T(""), g_szSendTime, MAX_PATH, szIniPath);
-		GetPrivateProfileString(_T("SendLog"), _T("ExecDate"), _T(""), g_szExecDate, MAX_PATH, szIniPath);
-		GetPrivateProfileString(_T("SendLog"), _T("ReceivePhone"), _T(""), g_szReceivePhone, MAX_PATH, szIniPath);
-
-		// 解密密码;
-		CString strResult;
-		//des_crypt((CString)g_szPassword, strResult, DES_DECRYPT);
-		_stprintf_s(g_szPassword, MAX_PATH, _T("%s"), strResult.GetString());
+		
 
 		if (!g_bStdOut)
 		{

ModuleSVNManager/ModuleSVNManager/Global.h

@@ -10,15 +10,6 @@
 #define DB_SW_CONN_WITHOUT_PORT		_T("Driver={SQL Server};Server=%s;Database=%s;Trusted_Connection=yes;")
 #define DB_SW_CONN_WITHOUT_PORT2	_T("Driver={SQL Server};Server=%s;Database=%d;Trusted_Connection=yes;")
 
-// 发送短信;
-#define SENDSMS						_T("http://%s:%d/webService/SendSmsMessage?account=%s&password=%s&phone=%s&content=%s&time=%s&t=%s")
-#define SENDSMSEX					_T("http://%s:%d/webService/SendSmsMessagePost?t=%s")
-#define POSTINFO					_T("account=%s&password=%s&phone=%s&content=%s&time=%s&t=%s")
-// 查询账号信息;
-#define QUERYACCOUNT				_T("http://%s:%d/webService/getuserinfo?account=%s&password=%s&t=%s")
-// 查询发送状态;
-#define QUERYSEND					_T("http://%s:%d/webService/QuerySendRecordInfo?account=%s&password=%s&sid=%s&t=%s")
-
 namespace Global
 {
 	// 控制台输出;
@@ -50,15 +41,6 @@ namespace Global
 	extern DWORD g_dwSvrPort;
 	extern DWORD g_dwDBPoolMaxCount;				// 数据库连接池最大对象数;
 	extern DWORD g_dwDBPoolDef;						// 数据库连接池默认对象数;
-	extern TCHAR g_szStudioID[64];
-	extern DWORD g_dwBalance;
-	extern BOOL  g_bSendLog;
-	extern TCHAR g_szAccount2[MAX_PATH] ;			// 爆客账号;
-	extern TCHAR g_szAccount[MAX_PATH] ;			// 短信账号;
-	extern TCHAR g_szPassword[MAX_PATH];			// 短信密码;
-	extern TCHAR g_szSendTime[MAX_PATH];			// 日志发送时间;
-	extern TCHAR g_szExecDate[MAX_PATH];
-	extern TCHAR g_szReceivePhone[MAX_PATH];		// 日志接收号码; 
 
 	extern int GetIniInfo(const TCHAR *szPath = NULL, const TCHAR *szIniName = NULL);
 	extern void WriteTextLog(const TCHAR *format, ...);