Merge branch 'backend_manual' into 'backend_uu'

Backend manual

See merge request kylin-desktop/update-manager-group/kylin-system-updater!467

backend/SystemUpdater/Core/DataAcquisition.py

@@ -326,6 +326,11 @@ class MessageSend():
             elif retval == self.ERR_UPLOADMSG_CTS:
                 result = "The createTimeStamp field of UploadedMessage is abnormal"
                 logging.debug("Sent Status: false - packageName: %s : result: %s.", PackageInfo['packageName'], result)
+            elif retval == self.ERR_UPLOADMSG_CTS:
+                result = "Invalid key included in \"uploadedMessage\" or \"packageInfo\": <@timestamp>,<_id>,<_index>,<_type>,<createTime>,<highlight>,<sn>,<sort>, check upload field"
+                logging.debug("Sent Status: false - packageName: %s : result: %s.", PackageInfo['packageName'], result)
+            else:
+                logging.debug("Sent Status: false - packageName: %s : retval: %s.", PackageInfo['packageName'], retval)
             # 上传失败写入本地json
             if retval != self.ERR_NO_LOACLTID or retval == self.ERR_NO_LOACLTID:
                 self.WriteToJson(PackageInfo['messageType'], json_PackageInfo, json_UploadMessage, encodeMsg)

backend/SystemUpdater/Core/Database.py

@@ -271,7 +271,7 @@ class Sqlite3Server(object):
                 InstallInfos.update({"status":status})
                 InstallInfos.update({"errorCode":str(error_string+" "+error_desc)})
                 self.window_main.collector.Upgrade_Process_Msg("finish-install", InstallInfos.copy())
-                # 软件商店获取中文名insert_into_displayr(pkgname))
+                # 软件商店获取中文名
                 appname_cn = self.get_cn_appname(str(pkgname))
                 #FIXME: 临时方案 PHP
                 PHPSeverSend(_send_log = self.window_main.configs_uncover.getWithDefault("SystemStatus", "upload_upgrade_log", False), _appname=pkgname, _appversion=pkgversion, _statue=status, _errorcode="10000100")

debian/changelog

@@ -1,4 +1,4 @@
-kylin-system-updater (2.0.5.3.2) v101; urgency=medium
+kylin-system-updater (2.0.5.4.0) v101; urgency=medium
 
   * BUG: # 无
   * 需求号: #15034  【更新升级】更新历史中新增自动更新结果显示