|
@@ -60,17 +60,19 @@ func FormatSubscribeData(data map[string]interface{}) {
|
|
|
}
|
|
|
if types != "" {
|
|
|
if jy, ok := data[types].(map[string]interface{}); ok {
|
|
|
- if area, oks := jy["o_area"].(map[string]interface{}); oks {
|
|
|
- areaArr := []string{}
|
|
|
- for k, _ := range area {
|
|
|
- areaArr = append(areaArr, AreaCode[k])
|
|
|
- }
|
|
|
- if len(area) == 0 {
|
|
|
- areaArr = append(areaArr, AreaCode["全国"])
|
|
|
- }
|
|
|
- areaCodes = strings.Join(areaArr, ",")
|
|
|
- }
|
|
|
if types == "o_jy" {
|
|
|
+ //
|
|
|
+ if area, oks := jy["o_area"].(map[string]interface{}); oks {
|
|
|
+ areaArr := []string{}
|
|
|
+ for k, _ := range area {
|
|
|
+ areaArr = append(areaArr, AreaCode[k])
|
|
|
+ }
|
|
|
+ if len(area) == 0 {
|
|
|
+ areaArr = append(areaArr, AreaCode["全国"])
|
|
|
+ }
|
|
|
+ areaCodes = strings.Join(areaArr, ",")
|
|
|
+ }
|
|
|
+ //
|
|
|
akey, aok := jy["a_key"].([]map[string]interface{})
|
|
|
if !aok {
|
|
|
akeys, _ := jy["a_key"].([]interface{})
|
|
@@ -86,7 +88,53 @@ func FormatSubscribeData(data map[string]interface{}) {
|
|
|
keyArrs = append(keyArrs, key)
|
|
|
}
|
|
|
}
|
|
|
+ } else if types == "o_vipjy" {
|
|
|
+ if area, oks := jy["area"].(map[string]interface{}); oks {
|
|
|
+ areaArr := []string{}
|
|
|
+ for k, _ := range area {
|
|
|
+ areaArr = append(areaArr, AreaCode[k])
|
|
|
+ }
|
|
|
+ if len(area) == 0 {
|
|
|
+ areaArr = append(areaArr, AreaCode["全国"])
|
|
|
+ }
|
|
|
+ areaCodes = strings.Join(areaArr, ",")
|
|
|
+ }
|
|
|
+ items, aok := jy["items"].([]map[string]interface{})
|
|
|
+ if !aok {
|
|
|
+ itemss, _ := jy["items"].([]interface{})
|
|
|
+ items = common.ObjArrToMapArr(itemss)
|
|
|
+ }
|
|
|
+ for _, v := range items {
|
|
|
+ akey, iok := v["a_key"].([]map[string]interface{})
|
|
|
+ if !iok {
|
|
|
+ akeys, _ := v["a_key"].([]interface{})
|
|
|
+ akey = common.ObjArrToMapArr(akeys)
|
|
|
+ }
|
|
|
+ for _, v := range akey {
|
|
|
+ keysArr, asok := v["key"].([]string)
|
|
|
+ if !asok {
|
|
|
+ keysArr_s, _ := v["key"].([]interface{})
|
|
|
+ keysArr = common.ObjArrToStringArr(keysArr_s)
|
|
|
+ }
|
|
|
+ for _, key := range keysArr {
|
|
|
+ keyArrs = append(keyArrs, key)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
} else {
|
|
|
+ if area, oks := jy["o_area"].(map[string]interface{}); oks {
|
|
|
+ areaArr := []string{}
|
|
|
+ for k, _ := range area {
|
|
|
+ areaArr = append(areaArr, AreaCode[k])
|
|
|
+ }
|
|
|
+ if len(area) == 0 {
|
|
|
+ areaArr = append(areaArr, AreaCode["全国"])
|
|
|
+ }
|
|
|
+ areaCodes = strings.Join(areaArr, ",")
|
|
|
+ }
|
|
|
+ if jy["o_area"] == nil {
|
|
|
+ areaCodes = AreaCode["全国"]
|
|
|
+ }
|
|
|
items, aok := jy["a_items"].([]map[string]interface{})
|
|
|
if !aok {
|
|
|
itemss, _ := jy["a_items"].([]interface{})
|