opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 10:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #352 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-duplicate-azure-resource to release/2.2.0

Browse Source 
* commit 'a5be2a406ae5089711d71d9167157b8f753851e6':
  避免因中文问题导致同步时出现相同的Azure资源
This commit is contained in:
邱剑
2018-10-24 10:43:36 +08:00
parent 8772a93010 a5be2a406a
commit 9855229014
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/standalone.go
+1 -1
View File
@@ -20,7 +20,7 @@ type SStandaloneResourceBase struct {
Id string `width:"128" charset:"ascii" primary:"true" list:"user"`
Name string `width:"128" charset:"utf8" nullable:"false" index:"true" list:"user" update:"user" create:"required"`
ExternalId string `width:"256" charset:"ascii" index:"true" list:"admin" create:"admin_optional"`
ExternalId string `width:"256" charset:"utf8" index:"true" list:"admin" create:"admin_optional"`
Description string `width:"256" charset:"utf8" get:"user" list:"user" update:"user" create:"optional"`
pkg/compute/models/storagecachedimages.go
+1 -1
View File
@@ -57,7 +57,7 @@ type SStoragecachedimage struct {
StoragecacheId string `width:"36" charset:"ascii" nullable:"false" list:"admin" create:"admin_required" key_index:"true"`
CachedimageId string `width:"36" charset:"ascii" nullable:"false" list:"admin" create:"admin_required" key_index:"true"`
ExternalId string `width:"256" charset:"ascii" nullable:"false" get:"admin"`
ExternalId string `width:"256" charset:"utf8" nullable:"false" get:"admin"`
Status string `width:"32" charset:"ascii" nullable:"false" default:"init" list:"admin" update:"admin" create:"admin_required"` // = Column(VARCHAR(32, charset='ascii'), nullable=False,
Path string `width:"256" charset:"utf8" nullable:"true" list:"admin" update:"admin" create:"admin_optional"` // = Column(VARCHAR(256, charset='utf8'), nullable=True)