From 1069d0f57aa0672cde7f710175090348e9969e00 Mon Sep 17 00:00:00 2001
From: Yvan <406226161@qq.com>
Date: Tue, 13 Aug 2024 11:21:35 +0800
Subject: [PATCH] Update awscloud.py
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复AWS CPU计算错误bug
---
 flask-consul/units/cloud/awscloud.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/flask-consul/units/cloud/awscloud.py b/flask-consul/units/cloud/awscloud.py
index ad8d7a8..cd570e7 100644
--- a/flask-consul/units/cloud/awscloud.py
+++ b/flask-consul/units/cloud/awscloud.py
@@ -11,7 +11,7 @@ def exp(account,collect_days,notify_days,notify_amount):
 
 def group(account):
     try:
-        now = datetime.datetime.now().strftime('%m.%d/%H:%M')
+        现在 = datetime.datetime.now().strftime('%m.%d/%H:%M')
         group_dict = {"1": "1"} # AWS没有资产组概念
         consul_kv.put_kv(f'ConsulManager/assets/awscloud/group/{account}',group_dict)
         count = len(group_dict)
@@ -60,7 +60,7 @@ def ecs(account,region,isextip=False):
                 ecs_dict_temp[InstanceId]["status"] = instances["State"]["Name"]
                 ecs_dict_temp[InstanceId]["region"] = region
                 ecs_dict_temp[InstanceId]["ip"] = instances["PrivateIpAddress"]
-                ecs_dict_temp[InstanceId]["cpu"] = f'{instances["CpuOptions"]["CoreCount"]}核'
+                ecs_dict_temp[InstanceId]["cpu"] = f'{instances["CpuOptions"]["CoreCount"]*instances["CpuOptions"]["ThreadsPerCore"]}核'
                 ecs_dict_temp[InstanceId]["mem"] = "无"
                 ecs_dict_temp[InstanceId]["exp"] = "按量" # AWS仅按量 
                 if isextip: