Merge branch 'master' into test

UPGRADE_2.x.md

+# 2.0.80
+- 修复错误
+
 # 2.0.79
 # 2.0.79
 - 修改枚举名称
 - 修改枚举名称
 
 

src/Cmq/Topic.php

@@ -263,7 +263,7 @@ class Topic
 				$res = $this->publish_message($cryptMessage, $vTagList, $routingKey);
 				$res = $this->publish_message($cryptMessage, $vTagList, $routingKey);
 				if ($res['code'] == 0) break;
 				if ($res['code'] == 0) break;
 			} catch (\Throwable $e) {
 			} catch (\Throwable $e) {
-				App::error("[消息队列异常]:" . $e->getFile() . $e->getMessage(), $e->getLine());
+				App::error("[消息队列异常]:" . $e->getFile() . $e->getLine() . $e->getMessage());
 			}
 			}
 			$tryTimes++;
 			$tryTimes++;
 		} while ($tryTimes < 3);
 		} while ($tryTimes < 3);