Эх сурвалжийг харах

2019-12-31 / ct_chen

Actions:
1. 修改上傳檔案限制為128M
2. WebService修改無出廠預設值報錯的問題

Files:
1. EVSE/rootfs/etc/lighttpd/lighttpd.conf
   EVSE/rootfs/etc/php.ini
2. EVSE/Modularization/WebService.c
ct_chen 5 жил өмнө
parent
commit
c3f065eed0

+ 16 - 6
EVSE/Modularization/WebService.c

@@ -156,7 +156,7 @@ int ConnectorType(char* connector){
 		result= 4;//AC
 	}
 	else{
-
+		result= 0;
 	}
 	return result;
 }
@@ -235,7 +235,7 @@ int StoreUsrConfigData(struct SysConfigData *UsrData)
 	if (fd < 0)
 	{
 		#ifdef SystemLogMessage
-		StoreLogMsg("[main]StoreUsrConfigData: open /dev/mtdblock10 NG");
+		StoreLogMsg("[WebService]StoreUsrConfigData: open /dev/mtdblock10 NG");
 		#endif
 		return 0;
 	}
@@ -244,7 +244,7 @@ int StoreUsrConfigData(struct SysConfigData *UsrData)
 	if(wrd!=(sizeof(struct SysConfigData)))
 	{
 		#ifdef SystemLogMessage
-		StoreLogMsg("[main]StoreUsrConfigData: write /dev/mtdblock10 NG");
+		StoreLogMsg("[WebService]StoreUsrConfigData: write /dev/mtdblock10 NG");
 		#endif
 		return 0;
 	}
@@ -253,7 +253,7 @@ int StoreUsrConfigData(struct SysConfigData *UsrData)
 	if (fd < 0)
 	{
 		#ifdef SystemLogMessage
-		StoreLogMsg("[main]StoreUsrConfigData: open /dev/mtdblock11(backup) NG");
+		StoreLogMsg("[WebService]StoreUsrConfigData: open /dev/mtdblock11(backup) NG");
 		#endif
 		return 0;
 	}
@@ -262,7 +262,7 @@ int StoreUsrConfigData(struct SysConfigData *UsrData)
    	if(wrd!=(sizeof(struct SysConfigData)))
 	{
 		#ifdef SystemLogMessage
-		StoreLogMsg("[main]StoreUsrConfigData: write /dev/mtdblock11(backup) NG");
+		StoreLogMsg("[WebService]StoreUsrConfigData: write /dev/mtdblock11(backup) NG");
 		#endif
 		return 0;
 	}
@@ -565,7 +565,17 @@ int main(int argc, char *argv[]) {
 			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.ChargeBoxId,ChargeBoxId);
 		}
 
-		StoreUsrConfigData(&ShmSysConfigAndInfo->SysConfig);
+		int result = StoreUsrConfigData(&ShmSysConfigAndInfo->SysConfig);
+		if(result != 1){
+			#ifdef SystemLogMessage
+			StoreLogMsg("[WebService]StoreUsrConfigData: normal NG");
+			#endif
+		}
+		else{
+			#ifdef SystemLogMessage
+			StoreLogMsg("[WebService]StoreUsrConfigData: normal OK");
+			#endif
+		}
 
 		#ifdef SystemLogMessage
 			DEBUG_INFO("WebServiceConfig update OK");

+ 1 - 0
EVSE/rootfs/etc/lighttpd/lighttpd.conf

@@ -19,6 +19,7 @@ server.stat-cache-engine        = "simple"
 server.max-connections          = 1024
 server.follow-symlink           = "enable"
 server.upload-dirs              = ( "/mnt" )
+server.max-request-size = 131072 #128M
 
 ssl.engine = "enable"
 ssl.pemfile = "/etc/lighttpd/ssl/lighttpd.pem"

+ 2 - 2
EVSE/rootfs/etc/php.ini

@@ -657,7 +657,7 @@ auto_globals_jit = On
 ; Its value may be 0 to disable the limit. It is ignored if POST data reading
 ; is disabled through enable_post_data_reading.
 ; http://php.net/post-max-size
-post_max_size = 8M
+post_max_size = 128M
 
 ; Automatically add files before PHP document.
 ; http://php.net/auto-prepend-file
@@ -817,7 +817,7 @@ file_uploads = On
 
 ; Maximum allowed size for uploaded files.
 ; http://php.net/upload-max-filesize
-upload_max_filesize = 64M
+upload_max_filesize = 128M
 
 ; Maximum number of files that can be uploaded via a single request
 max_file_uploads = 20