소스 검색

版本:2.4.39.3
优化日志输出的文件结构;

scbc.sat2 5 년 전
부모
커밋
d2d2c2907e
3개의 변경된 파일8개의 추가작업 그리고 8개의 파일을 삭제
  1. 5 5
      SATService/SATService/Global.cpp
  2. 1 1
      SATService/SATService/SATDevices.cpp
  3. 2 2
      SATService/SATService/SATService.rc

+ 5 - 5
SATService/SATService/Global.cpp

@@ -1111,18 +1111,18 @@ namespace GLOBAL
 		// ½âÎö³öÈÕ־·¾¶;
 		TCHAR szlogpath[MAX_PATH] = { 0 };
 		if ( logType == SAT_EXE ) {
-			_stprintf_s(szlogpath, _T("%s%04d-%02d-%02d\\%s-Exector.txt"), g_szCurModuleDir, gmtm.tm_year + 1900, gmtm.tm_mon + 1, gmtm.tm_mday, g_szFna);
+			_stprintf_s(szlogpath, _T("%s%s\\Exector-%04d-%02d.txt"), g_szCurModuleDir, "log", gmtm.tm_year + 1900, gmtm.tm_mon + 1);
 		}
 		else if ( logType == SAT_DEV ) {
-			_stprintf_s(szlogpath, _T("%s%04d-%02d-%02d\\%s-Device.txt"), g_szCurModuleDir, gmtm.tm_year + 1900, gmtm.tm_mon + 1, gmtm.tm_mday, g_szFna);
+			_stprintf_s(szlogpath, _T("%s%s\\Device-%04d-%02d.txt"), g_szCurModuleDir, "log", gmtm.tm_year + 1900, gmtm.tm_mon + 1);
 		}
 		else if ( logType == SAT_PYE ) {
-			_stprintf_s(szlogpath, _T("%s%04d-%02d-%02d\\%s-PyExecutor.txt"), g_szCurModuleDir, gmtm.tm_year + 1900, gmtm.tm_mon + 1, gmtm.tm_mday, g_szFna);
+			_stprintf_s(szlogpath, _T("%s%s\\PyExecutor-%04d-%02d.txt"), g_szCurModuleDir, "log", gmtm.tm_year + 1900, gmtm.tm_mon + 1);
 		}
 		else if ( logType == SAT_TCP ) {
-			_stprintf_s(szlogpath, _T("%s%04d-%02d-%02d\\%s-TCP.txt"), g_szCurModuleDir, gmtm.tm_year + 1900, gmtm.tm_mon + 1, gmtm.tm_mday, g_szFna);
+			_stprintf_s(szlogpath, _T("%s%s\\TCP-%04d-%02d.txt"), g_szCurModuleDir, "log", gmtm.tm_year + 1900, gmtm.tm_mon + 1);
 		} else {
-			_stprintf_s(szlogpath, _T("%s%04d-%02d-%02d\\%s.txt"), g_szCurModuleDir, gmtm.tm_year + 1900, gmtm.tm_mon + 1, gmtm.tm_mday, g_szFna);
+			_stprintf_s(szlogpath, _T("%s%s\\%s-%04d-%02d.txt"), g_szCurModuleDir, "log", g_szFna, gmtm.tm_year + 1900, gmtm.tm_mon + 1);
 		}
 
 		if ( !PathFileExists(szlogpath) )

+ 1 - 1
SATService/SATService/SATDevices.cpp

@@ -396,7 +396,7 @@ void CSATDevices::GetCurrentDevices(std::vector<SATDEV::STDevice> &vtDevices)
 		else if ( (npos = it->find("unauthorized")) != std::string::npos ) // 未认证也做为离线的一种;
 		{
 			stDevice.nStatus = SATDEV::Unauthorized;
-			GLOBAL::WriteTextLog("找到unauthorized状态的设备");
+			GLOBAL::WriteTextLog(GLOBAL::SAT_DEV,"找到unauthorized状态的设备");
 		}
 		// 获取设备名;
 		stDevice.strName = it->substr(0, npos);

+ 2 - 2
SATService/SATService/SATService.rc

@@ -62,7 +62,7 @@ IDI_MICON               ICON                    "main.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,39,2
+ FILEVERSION 2,4,39,3
  PRODUCTVERSION 2,0,0,1
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
@@ -79,7 +79,7 @@ BEGIN
         BLOCK "080404b0"
         BEGIN
             VALUE "FileDescription", "SATServi Ó¦ÓóÌÐò"
-            VALUE "FileVersion", "2, 4, 39, 2"
+            VALUE "FileVersion", "2, 4, 39, 3"
             VALUE "InternalName", "SATServi"
             VALUE "LegalCopyright", "Copyright (C) 2020"
             VALUE "OriginalFilename", "SATServi.exe"