Automatic merge from release/2.4.0 -> release/2.5.0

* commit 'b3f181df8f4bb11dbf5416cf1271686289dcd920':
  避免因secret为空，导致插入数据库时报错: Field 'secret' doesn't have a default value

pkg/compute/models/cloudaccounts.go

@@ -427,6 +427,7 @@ func (self *SCloudaccount) ImportSubAccount(ctx context.Context, userCred mcclie
 
 	newCloudprovider := SCloudprovider{}
 	newCloudprovider.Account = subAccount.Account
+	newCloudprovider.Secret = self.Secret
 	newCloudprovider.CloudaccountId = self.Id
 	newCloudprovider.Provider = self.Provider
 	newCloudprovider.AccessUrl = self.AccessUrl
@@ -685,6 +686,7 @@ func migrateCloudprovider(cloudprovider *SCloudprovider) error {
 	if err == sql.ErrNoRows {
 		account.AccessUrl = cloudprovider.AccessUrl
 		account.Account = mainAccount
+		account.Secret = cloudprovider.Secret
 		account.LastSync = cloudprovider.LastSync
 		// account.Sysinfo = cloudprovider.Sysinfo
 		account.Provider = cloudprovider.Provider