script run调整为script debug;优化错误信息输出

cmd.pb.go

@@ -3388,6 +3388,8 @@ type DataSpace struct {
 	Did           []string               `protobuf:"bytes,1,rep,name=did,proto3" json:"did,omitempty"`       // 设备ID区
 	Wuid          []string               `protobuf:"bytes,2,rep,name=wuid,proto3" json:"wuid,omitempty"`     // OpenID区
 	Geo           []string               `protobuf:"bytes,7,rep,name=geo,proto3" json:"geo,omitempty"`       // GEO区
+	Geoip         []string               `protobuf:"bytes,8,rep,name=geoip,proto3" json:"geoip,omitempty"`   // GEOIP区
+	Geofac        []string               `protobuf:"bytes,9,rep,name=geofac,proto3" json:"geofac,omitempty"` // GEOFAC区(经常活动城市)
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -3443,6 +3445,20 @@ func (x *DataSpace) GetGeo() []string {
 	return nil
 }
 
+func (x *DataSpace) GetGeoip() []string {
+	if x != nil {
+		return x.Geoip
+	}
+	return nil
+}
+
+func (x *DataSpace) GetGeofac() []string {
+	if x != nil {
+		return x.Geofac
+	}
+	return nil
+}
+
 // InfoRes 账号信息返回
 type InfoRes struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
@@ -5277,11 +5293,13 @@ const file_cmd_proto_rawDesc = "" +
 	"\x12exp_grant_list_res\x18f \x01(\v2\x18.saasapi.ExpGrantListResH\x00R\x0fexpGrantListRes\x12>\n" +
 	"\x11exp_grant_add_res\x18g \x01(\v2\x11.saasapi.ExpGrantH\x00R\x0eexpGrantAddRes\x12D\n" +
 	"\x14exp_grant_delete_res\x18h \x01(\v2\x11.saasapi.ExpGrantH\x00R\x11expGrantDeleteResB\x05\n" +
-	"\x03res\"C\n" +
+	"\x03res\"q\n" +
 	"\tDataSpace\x12\x10\n" +
 	"\x03did\x18\x01 \x03(\tR\x03did\x12\x12\n" +
 	"\x04wuid\x18\x02 \x03(\tR\x04wuid\x12\x10\n" +
-	"\x03geo\x18\a \x03(\tR\x03geo\"X\n" +
+	"\x03geo\x18\a \x03(\tR\x03geo\x12\x14\n" +
+	"\x05geoip\x18\b \x03(\tR\x05geoip\x12\x16\n" +
+	"\x06geofac\x18\t \x03(\tR\x06geofac\"X\n" +
 	"\aInfoRes\x120\n" +
 	"\tdataspace\x18\x01 \x01(\v2\x12.saasapi.DataSpaceR\tdataspace\x12\x1b\n" +
 	"\ttarget_id\x18\x02 \x03(\tR\btargetId\"\x82\x01\n" +

cmd.proto

@@ -320,6 +320,8 @@ message DataSpace {
     repeated string did                          = 1;   // 设备ID区
     repeated string wuid                         = 2;   // OpenID区
     repeated string geo                          = 7;   // GEO区
+    repeated string geoip                        = 8;   // GEOIP区
+    repeated string geofac                       = 9;   // GEOFAC区(经常活动城市)
 }
 
 // InfoRes 账号信息返回

cmd/saastool/daemon.go

@@ -227,9 +227,9 @@ func (d *Daemon) parsePublicParams(r *http.Request) (*daemonPublicParams, error)
 
 	params.ds = strings.ToLower(strings.TrimSpace(q.Get("ds")))
 	switch params.ds {
-	case "did", "wuid", "geo":
+	case "did", "wuid", "geo", "geoip", "geofac":
 	default:
-		return nil, fmt.Errorf("ds must use did/wuid/geo. current is %v", params.ds)
+		return nil, fmt.Errorf("ds must use did/wuid/geo/geoip/geofac. current is %v", params.ds)
 	}
 
 	params.appid = strings.TrimSpace(q.Get("appid"))