diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index e3b70c6b7..e7ec4a97f 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -6126,7 +6126,7 @@ func SetStoreAutoCallRider(vendorOrgCode string, openIDs, closeIDs []int64) (str } //辅助函数 -func String2Array(data string) (retVal []int64) { +func String2ArrayInt64(data string) (retVal []int64) { temp := strings.Split(data, ",") for _, v := range temp { retVal = append(retVal, utils.Str2Int64(v)) diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 424ed3944..3dd74d6bc 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -1557,8 +1557,8 @@ func (c *StoreController) SetStoreAutoCallRider() { c.callSetStoreAutoCallRider(func(params *tStoreSetStoreAutoCallRiderParams) (retVal interface{}, errCode string, err error) { openIDs := make([]int64, 0) closeIDs := make([]int64, 0) - openIDs = cms.String2Array(params.OpenIDs) - closeIDs = cms.String2Array(params.CloseIDs) + openIDs = cms.String2ArrayInt64(params.OpenIDs) + closeIDs = cms.String2ArrayInt64(params.CloseIDs) retVal, err = cms.SetStoreAutoCallRider(params.VendorOrgCode, openIDs, closeIDs) return retVal, "", err }) @@ -1575,7 +1575,7 @@ func (c *StoreController) SetStoreAutoCallRider() { func (c *StoreController) GetStoreAutoCallRiderInfo() { c.callGetStoreAutoCallRiderInfo(func(params *tStoreGetStoreAutoCallRiderInfoParams) (retVal interface{}, errCode string, err error) { storeIDs := make([]int64, 0) - storeIDs = cms.String2Array(params.StoreIDs) + storeIDs = cms.String2ArrayInt64(params.StoreIDs) retVal, err = tiktok_store.GetStoreAutoCallRiderInfo(params.VendorOrgCode, storeIDs) return retVal, "", err }) diff --git a/globals/beegodb/beegodb.go b/globals/beegodb/beegodb.go index e73f63809..b2b3d56a8 100644 --- a/globals/beegodb/beegodb.go +++ b/globals/beegodb/beegodb.go @@ -6,24 +6,25 @@ import ( "git.rosy.net.cn/jx-callback/business/model/legacymodel" "git.rosy.net.cn/jx-callback/globals" "github.com/astaxie/beego/client/orm" + "github.com/astaxie/beego/server/web" ) func Init() { // set default database // orm.RegisterDataBase(aliasName, driverName, dataSource, params) - - //orm.RegisterDataBase("default", "mysql", web.AppConfig.DefaultString("dbConnectStr", "")) - //orm.RegisterDataBase("c4beta", "mysql", "ubuntu:WebServer@1@tcp(111.231.218.230:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") - //orm.RegisterDataBase("api", "mysql", "root:WebServer@1@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true") + //正式服务器 + orm.RegisterDataBase("default", "mysql", web.AppConfig.DefaultString("dbConnectStr", "")) + orm.RegisterDataBase("c4beta", "mysql", "ubuntu:WebServer@1@tcp(111.231.218.230:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") + orm.RegisterDataBase("api", "mysql", "root:WebServer@1@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true") // 本地测试服调试 // orm.RegisterDataBase("default", "mysql", web.AppConfig.DefaultString("dbConnectStr", "")) //orm.RegisterDataBase("api", "mysql", "root:WebServer@1@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true") //orm.RegisterDataBase("c4beta", "mysql", "ubuntu:WebServer@1@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") //本地服务器测试用 -ysq - orm.RegisterDataBase("default", "mysql", "root:123456@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") - orm.RegisterDataBase("c4beta", "mysql", "root:123456@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") - orm.RegisterDataBase("api", "mysql", "root:123456@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true") + //orm.RegisterDataBase("default", "mysql", "root:123456@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") + //orm.RegisterDataBase("c4beta", "mysql", "root:123456@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true") + //orm.RegisterDataBase("api", "mysql", "root:123456@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true") // 开启sql打印 //orm.Debug = true