lichangdong 1 долоо хоног өмнө
parent
commit
3b94caad1c

+ 2 - 2
internal/pkg/wechat_ws/wecom_ws_client.go

@@ -281,8 +281,8 @@ func (c *WecomWsClient) DeviceAuth() error {
 		"AccessToken": "",
 		"MsgType":     "DeviceAuthReq",
 		"Content": map[string]interface{}{
-			"AuthType":   3,
-			"Credential": "",
+			"AuthType":   2,
+			"Credential": "bGNka2Y6QWExMjM0NTY=",
 		},
 	}
 	transportMessageJSON, err := json.Marshal(message)

+ 2 - 2
proto/wecom/WContactPushNotice.proto

@@ -27,7 +27,7 @@ message ContactMessage {
     string Mobile = 7;
     string UnionId = 8;
     string Gender = 9;
-    repeated int64 DepartIds = 10; // 所属部门id
-    int64 Attr = 11; // 属性 (attr & 64) == 64 || (attr & 33554432) == 33554432 已激活企业微信
+    repeated string DepartIds = 10; // 所属部门id
+    string Attr = 11; // 属性 (attr & 64) == 64 || (attr & 33554432) == 33554432 已激活企业微信
     //int64 CorpId = 12;
 }

+ 15 - 15
workphone/wecom/WContactPushNotice.pb.go

@@ -114,16 +114,16 @@ type ContactMessage struct {
 	// RemoteId>>48==39 群机器人;
 	// RemoteId>>48==30 内部客服;
 	// RemoteId>>48==32 VIP客户;
-	AcctId        string  `protobuf:"bytes,2,opt,name=AcctId,proto3" json:"AcctId,omitempty"` // 企业内部id
-	Name          string  `protobuf:"bytes,3,opt,name=Name,proto3" json:"Name,omitempty"`     //
-	Alias         string  `protobuf:"bytes,4,opt,name=Alias,proto3" json:"Alias,omitempty"`
-	Avatar        string  `protobuf:"bytes,5,opt,name=Avatar,proto3" json:"Avatar,omitempty"`
-	Job           string  `protobuf:"bytes,6,opt,name=Job,proto3" json:"Job,omitempty"` // 职位
-	Mobile        string  `protobuf:"bytes,7,opt,name=Mobile,proto3" json:"Mobile,omitempty"`
-	UnionId       string  `protobuf:"bytes,8,opt,name=UnionId,proto3" json:"UnionId,omitempty"`
-	Gender        string  `protobuf:"bytes,9,opt,name=Gender,proto3" json:"Gender,omitempty"`
-	DepartIds     []int64 `protobuf:"varint,10,rep,packed,name=DepartIds,proto3" json:"DepartIds,omitempty"` // 所属部门id
-	Attr          int64   `protobuf:"varint,11,opt,name=Attr,proto3" json:"Attr,omitempty"`                  // 属性 (attr & 64) == 64 || (attr & 33554432) == 33554432 已激活企业微信
+	AcctId        string   `protobuf:"bytes,2,opt,name=AcctId,proto3" json:"AcctId,omitempty"` // 企业内部id
+	Name          string   `protobuf:"bytes,3,opt,name=Name,proto3" json:"Name,omitempty"`     //
+	Alias         string   `protobuf:"bytes,4,opt,name=Alias,proto3" json:"Alias,omitempty"`
+	Avatar        string   `protobuf:"bytes,5,opt,name=Avatar,proto3" json:"Avatar,omitempty"`
+	Job           string   `protobuf:"bytes,6,opt,name=Job,proto3" json:"Job,omitempty"` // 职位
+	Mobile        string   `protobuf:"bytes,7,opt,name=Mobile,proto3" json:"Mobile,omitempty"`
+	UnionId       string   `protobuf:"bytes,8,opt,name=UnionId,proto3" json:"UnionId,omitempty"`
+	Gender        string   `protobuf:"bytes,9,opt,name=Gender,proto3" json:"Gender,omitempty"`
+	DepartIds     []string `protobuf:"bytes,10,rep,name=DepartIds,proto3" json:"DepartIds,omitempty"` // 所属部门id
+	Attr          string   `protobuf:"bytes,11,opt,name=Attr,proto3" json:"Attr,omitempty"`           // 属性 (attr & 64) == 64 || (attr & 33554432) == 33554432 已激活企业微信
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -221,18 +221,18 @@ func (x *ContactMessage) GetGender() string {
 	return ""
 }
 
-func (x *ContactMessage) GetDepartIds() []int64 {
+func (x *ContactMessage) GetDepartIds() []string {
 	if x != nil {
 		return x.DepartIds
 	}
 	return nil
 }
 
-func (x *ContactMessage) GetAttr() int64 {
+func (x *ContactMessage) GetAttr() string {
 	if x != nil {
 		return x.Attr
 	}
-	return 0
+	return ""
 }
 
 var File_wecom_WContactPushNotice_proto protoreflect.FileDescriptor
@@ -258,8 +258,8 @@ const file_wecom_WContactPushNotice_proto_rawDesc = "" +
 	"\aUnionId\x18\b \x01(\tR\aUnionId\x12\x16\n" +
 	"\x06Gender\x18\t \x01(\tR\x06Gender\x12\x1c\n" +
 	"\tDepartIds\x18\n" +
-	" \x03(\x03R\tDepartIds\x12\x12\n" +
-	"\x04Attr\x18\v \x01(\x03R\x04AttrB\x13Z\x11./workphone/wecomb\x06proto3"
+	" \x03(\tR\tDepartIds\x12\x12\n" +
+	"\x04Attr\x18\v \x01(\tR\x04AttrB\x13Z\x11./workphone/wecomb\x06proto3"
 
 var (
 	file_wecom_WContactPushNotice_proto_rawDescOnce sync.Once