diff --git a/api/v1/config.pb.go b/api/v1/config.pb.go index 786b2c4..63ed855 100644 --- a/api/v1/config.pb.go +++ b/api/v1/config.pb.go @@ -839,6 +839,7 @@ type EnvDependent struct { CheckedAt *time.Time `protobuf:"bytes,5,opt,name=checked_at,json=checkedAt,proto3,stdtime" json:"checked_at,omitempty"` Cmd string `protobuf:"bytes,6,opt,name=cmd,proto3" json:"cmd,omitempty"` IsRequired bool `protobuf:"varint,7,opt,name=is_required,json=isRequired,proto3" json:"is_required,omitempty"` + Version string `protobuf:"bytes,8,opt,name=version,proto3" json:"version,omitempty"` } func (m *EnvDependent) Reset() { *m = EnvDependent{} } @@ -923,6 +924,13 @@ func (m *EnvDependent) GetIsRequired() bool { return false } +func (m *EnvDependent) GetVersion() string { + if m != nil { + return m.Version + } + return "" +} + // 依赖项列表 type Envs struct { Envs []*EnvDependent `protobuf:"bytes,1,rep,name=envs,proto3" json:"envs,omitempty"` @@ -1403,124 +1411,125 @@ func init() { func init() { proto.RegisterFile("api/v1/config.proto", fileDescriptor_321614cd6c9c1b8a) } var fileDescriptor_321614cd6c9c1b8a = []byte{ - // 1870 bytes of a gzipped FileDescriptorProto + // 1876 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0xdd, 0x6f, 0x1b, 0xb9, 0x11, 0x8f, 0xbe, 0x2c, 0x69, 0x24, 0x4b, 0x0e, 0xfd, 0x11, 0x45, 0x49, 0x1d, 0x67, 0x7b, 0xd7, 0xf3, 0x05, 0x85, 0x75, 0x71, 0xbf, 0x80, 0xb6, 0xc0, 0xc1, 0xb1, 0x7d, 0xa9, 0x81, 0xeb, 0xc1, 0xa5, 0xcf, 0xe8, 0xc7, 0xcb, 0x82, 0xde, 0xa5, 0x25, 0xd6, 0xab, 0xe5, 0x1e, 0x49, 0x29, 0x56, - 0x5e, 0x8a, 0xde, 0x53, 0x1f, 0xaf, 0x28, 0xd0, 0xfe, 0x4b, 0x2d, 0xfa, 0x72, 0x40, 0x5f, 0xfa, - 0xd6, 0x22, 0x69, 0xff, 0x80, 0xfe, 0x05, 0x2d, 0x38, 0xe4, 0xae, 0x24, 0x1b, 0x06, 0x02, 0xf4, - 0x8d, 0x33, 0xf3, 0xe3, 0x70, 0x38, 0xf3, 0xe3, 0x90, 0xbb, 0xb0, 0xce, 0x32, 0x31, 0x98, 0x3e, - 0x1f, 0x44, 0x32, 0xbd, 0x14, 0xc3, 0xbd, 0x4c, 0x49, 0x23, 0xc9, 0x0a, 0xcb, 0xc4, 0xde, 0xf4, - 0x79, 0xff, 0xc9, 0x50, 0xca, 0x61, 0xc2, 0x07, 0xa8, 0xbd, 0x98, 0x5c, 0x0e, 0x8c, 0x18, 0x73, - 0x6d, 0xd8, 0x38, 0x73, 0xc0, 0xfe, 0xc6, 0x50, 0x0e, 0x25, 0x0e, 0x07, 0x76, 0xe4, 0xb5, 0x8f, - 0xfd, 0x34, 0xeb, 0x9a, 0xa5, 0xa9, 0x34, 0xcc, 0x08, 0x99, 0x6a, 0x6f, 0x7d, 0x74, 0xd3, 0x29, - 0x1f, 0x67, 0x66, 0xe6, 0x8c, 0xc1, 0xbf, 0xcb, 0xb0, 0x72, 0x88, 0xa1, 0x90, 0x0e, 0x94, 0x45, - 0xdc, 0x2b, 0xed, 0x94, 0x76, 0x2b, 0xb4, 0x2c, 0x62, 0xb2, 0x01, 0xb5, 0x84, 0x5d, 0xf0, 0xa4, - 0x57, 0xde, 0x29, 0xed, 0x36, 0xa9, 0x13, 0x08, 0x81, 0x6a, 0xca, 0xc6, 0xbc, 0x57, 0x41, 0x25, - 0x8e, 0x2d, 0x72, 0xca, 0x92, 0x09, 0xef, 0x55, 0x1d, 0x12, 0x05, 0xb2, 0x03, 0xad, 0x2c, 0x61, - 0x11, 0x1f, 0xc9, 0x24, 0xe6, 0xaa, 0x57, 0x43, 0xdb, 0xa2, 0x8a, 0x7c, 0x03, 0x40, 0xa4, 0xd9, - 0xc4, 0x84, 0x66, 0x96, 0xf1, 0xde, 0x0a, 0x02, 0x9a, 0xa8, 0xf9, 0x7c, 0x96, 0x71, 0xd2, 0x87, - 0x46, 0xc4, 0x0c, 0x1f, 0x4a, 0x35, 0xeb, 0xd5, 0xd1, 0x58, 0xc8, 0x36, 0x0c, 0x2d, 0x95, 0xe9, - 0x35, 0x76, 0x4a, 0xbb, 0x35, 0x8a, 0x63, 0xd2, 0x83, 0xba, 0xcc, 0x70, 0xe7, 0xbd, 0x26, 0xc2, - 0x73, 0x91, 0x7c, 0x0c, 0x10, 0x29, 0xce, 0x0c, 0x8f, 0x43, 0x66, 0x7a, 0xb0, 0x53, 0xda, 0x6d, - 0xed, 0xf7, 0xf7, 0x5c, 0x5e, 0xf6, 0xf2, 0xbc, 0xec, 0x7d, 0x9e, 0x27, 0xfb, 0x45, 0xf5, 0xab, - 0x7f, 0x3c, 0x29, 0xd1, 0xa6, 0x9f, 0x73, 0x60, 0xac, 0x83, 0x49, 0x16, 0xe7, 0x0e, 0x5a, 0xef, - 0xea, 0xc0, 0xcf, 0x39, 0x30, 0xc1, 0x00, 0xee, 0x7f, 0x2a, 0xb4, 0x71, 0xa9, 0xa6, 0xfc, 0x8b, - 0x09, 0xd7, 0x66, 0x69, 0x83, 0xa5, 0x9d, 0xca, 0xe2, 0x06, 0x83, 0xe7, 0x50, 0x77, 0x60, 0x4d, - 0xbe, 0x05, 0x2b, 0x8e, 0x2d, 0x08, 0x6a, 0xed, 0x77, 0xf6, 0x1c, 0x5d, 0xf6, 0xbc, 0x37, 0x6f, - 0x0d, 0x04, 0xac, 0x3a, 0xcd, 0x21, 0xcb, 0x4c, 0x34, 0x62, 0x64, 0x0b, 0x56, 0x12, 0x9e, 0x0e, - 0xcd, 0x08, 0xab, 0x5a, 0xa3, 0x5e, 0xb2, 0xf5, 0x7a, 0x25, 0x62, 0x33, 0xc2, 0xca, 0xd6, 0xa8, - 0x13, 0x2c, 0x7a, 0xc4, 0xc5, 0x70, 0x64, 0xb0, 0xb6, 0x35, 0xea, 0x25, 0x9b, 0x6a, 0xac, 0x8f, - 0x2b, 0x2e, 0x8e, 0x83, 0xff, 0x56, 0xa0, 0xed, 0xd6, 0x3a, 0x9b, 0x69, 0xc3, 0xc7, 0x76, 0x72, - 0x2c, 0xc7, 0x4c, 0xa4, 0xb8, 0x54, 0x93, 0x7a, 0xc9, 0x2e, 0x65, 0x84, 0x49, 0x78, 0x4e, 0x22, - 0x14, 0xec, 0xc6, 0xaf, 0xf8, 0xec, 0x95, 0x54, 0xb1, 0xf6, 0x44, 0x2a, 0x64, 0x4b, 0x9b, 0x98, - 0xeb, 0x48, 0x09, 0xac, 0x9d, 0x5f, 0x75, 0x51, 0x65, 0x03, 0x4a, 0xe4, 0x50, 0x7a, 0x46, 0xe1, - 0xd8, 0xd6, 0xfe, 0x92, 0x4d, 0x45, 0x24, 0x53, 0xcf, 0xa3, 0x5c, 0x24, 0x6b, 0x50, 0x11, 0x51, - 0xe6, 0x09, 0x64, 0x87, 0xe4, 0x31, 0x34, 0x59, 0xca, 0x92, 0x99, 0x11, 0x91, 0x46, 0x02, 0x35, - 0xe9, 0x5c, 0x61, 0x63, 0xd3, 0xc2, 0x70, 0x24, 0xb9, 0xa3, 0x51, 0x21, 0x93, 0x8f, 0x60, 0x23, - 0x92, 0xd9, 0x4c, 0xd9, 0xbc, 0x84, 0xda, 0x30, 0x65, 0xc2, 0x19, 0x67, 0x0a, 0x19, 0xd5, 0xa4, - 0xa4, 0xb0, 0x9d, 0x59, 0xd3, 0x2f, 0x39, 0x53, 0x64, 0x00, 0xeb, 0x8a, 0x0f, 0x85, 0x36, 0x5c, - 0x85, 0x17, 0x2c, 0xba, 0x1a, 0x2a, 0x39, 0x49, 0x63, 0x64, 0x50, 0x93, 0x92, 0xdc, 0xf4, 0xa2, - 0xb0, 0x90, 0x0f, 0x61, 0x2d, 0x91, 0x43, 0x91, 0x2e, 0xa2, 0xdb, 0x88, 0xee, 0xa2, 0x7e, 0x01, - 0xfa, 0x01, 0x74, 0x15, 0x8f, 0xe4, 0x78, 0xcc, 0xd3, 0x38, 0x74, 0xc9, 0x5c, 0x45, 0x16, 0x75, - 0x0a, 0xf5, 0xcf, 0x31, 0xa5, 0x3d, 0xa8, 0x4f, 0xb9, 0xd2, 0x36, 0x9d, 0x1d, 0x97, 0x1c, 0x2f, - 0x92, 0x27, 0xd0, 0x8a, 0x14, 0x8f, 0x85, 0x09, 0x71, 0xbf, 0x5d, 0xb4, 0x82, 0x53, 0x7d, 0x66, - 0x77, 0xfc, 0x00, 0xea, 0x9a, 0x47, 0xa1, 0xcd, 0xe0, 0x9a, 0x2b, 0xac, 0xe6, 0xd1, 0x49, 0x94, - 0x05, 0x7f, 0x2c, 0xe5, 0x0c, 0xf8, 0x44, 0x4a, 0xc3, 0x95, 0xad, 0x34, 0xbb, 0x90, 0x13, 0xe3, - 0x09, 0xe0, 0x04, 0xbb, 0x74, 0x24, 0x53, 0xc3, 0x22, 0xe3, 0x19, 0x90, 0x8b, 0x58, 0x85, 0xa1, - 0xe2, 0x7c, 0xcc, 0x53, 0xe3, 0x49, 0x30, 0x57, 0x58, 0x6b, 0x91, 0x4d, 0xcf, 0x81, 0xb9, 0xc2, - 0xd6, 0xe8, 0x92, 0xf3, 0xd8, 0xa6, 0xc8, 0xb3, 0xa0, 0x90, 0x83, 0xdf, 0x97, 0xf3, 0x63, 0x70, - 0x24, 0x74, 0x96, 0xb0, 0x19, 0xf9, 0x01, 0xf4, 0xf4, 0x48, 0xbe, 0x0a, 0x8b, 0x42, 0x4c, 0x34, - 0x57, 0x61, 0x24, 0x27, 0xa9, 0x0b, 0xb6, 0x41, 0x37, 0xad, 0x9d, 0x7a, 0xf3, 0xb9, 0xe6, 0xea, - 0xd0, 0x1a, 0xc9, 0x3e, 0xa0, 0x21, 0x14, 0x69, 0xcc, 0xaf, 0x43, 0x7f, 0x34, 0x05, 0xd7, 0xb8, - 0x95, 0x06, 0x5d, 0xb7, 0xc6, 0x13, 0x6b, 0x3b, 0x2c, 0x4c, 0xe4, 0x3d, 0xe8, 0x64, 0x6c, 0xc8, - 0x75, 0x98, 0x71, 0x15, 0x2a, 0xce, 0x62, 0x7f, 0x9a, 0xda, 0xa8, 0x3d, 0xe5, 0x8a, 0x72, 0x16, - 0x5b, 0x5a, 0x2c, 0x11, 0xc9, 0xb8, 0x34, 0x54, 0x6f, 0xf3, 0xc8, 0x59, 0xc8, 0x8f, 0xa1, 0x8f, - 0xa1, 0xc4, 0x32, 0x9a, 0x58, 0x45, 0xb8, 0x70, 0x20, 0x34, 0xe6, 0xa0, 0x41, 0x71, 0x97, 0x47, - 0x1e, 0x70, 0xb4, 0x60, 0x0f, 0xfe, 0x54, 0x85, 0x8e, 0x3f, 0xae, 0x3c, 0x9a, 0x28, 0x61, 0x66, - 0xe4, 0x21, 0x34, 0x84, 0x0e, 0xa3, 0x44, 0x6a, 0xee, 0x93, 0x50, 0x17, 0xfa, 0xd0, 0x8a, 0x96, - 0x57, 0xa8, 0x5f, 0x08, 0xcc, 0xd5, 0xae, 0x83, 0xea, 0x79, 0x50, 0x1f, 0x40, 0x97, 0xa7, 0xec, - 0x22, 0xe1, 0x45, 0x6a, 0x71, 0xb3, 0x0d, 0xda, 0x71, 0xea, 0x3c, 0xa3, 0xf6, 0xdc, 0x78, 0x60, - 0xe4, 0x5a, 0x53, 0x88, 0x5c, 0xc6, 0xfd, 0x36, 0x28, 0x71, 0x36, 0xdf, 0xb5, 0x3e, 0xb5, 0x16, - 0xf2, 0x7d, 0x78, 0x70, 0x63, 0x46, 0xb1, 0x84, 0xdb, 0xec, 0xe6, 0xd2, 0xa4, 0x62, 0xa5, 0xef, - 0xc2, 0xd6, 0x8d, 0x79, 0xee, 0x24, 0x18, 0x6c, 0x0b, 0x0d, 0xba, 0xb1, 0x34, 0xed, 0xd0, 0xd9, - 0xc8, 0xc7, 0xf0, 0xf8, 0xc6, 0xac, 0x4b, 0x91, 0xc6, 0x61, 0xc6, 0xb4, 0xb6, 0xe7, 0x0a, 0x9b, - 0x47, 0x83, 0x3e, 0x5c, 0x9a, 0xfb, 0x89, 0x48, 0xe3, 0x53, 0x0f, 0xb0, 0x4c, 0xb9, 0xe1, 0x60, - 0x92, 0x25, 0x92, 0xc5, 0xd8, 0x5e, 0x1a, 0x74, 0x7d, 0x69, 0xe6, 0x39, 0x9a, 0xc8, 0x33, 0xb8, - 0x3f, 0x66, 0xd7, 0xf3, 0x8a, 0x6a, 0xf1, 0xda, 0x75, 0x9c, 0x1a, 0xed, 0x8e, 0xd9, 0x75, 0x5e, - 0xc8, 0x33, 0xf1, 0x1a, 0x1b, 0x4f, 0x81, 0x63, 0x49, 0x22, 0x5f, 0xf1, 0x38, 0xe4, 0xd7, 0xf6, - 0x2a, 0xb3, 0xe7, 0x9d, 0xe4, 0xb6, 0x03, 0x67, 0x3a, 0xbe, 0x36, 0xe4, 0x7d, 0xe8, 0xb8, 0x3e, - 0xa2, 0xf8, 0x17, 0x13, 0xa1, 0xb8, 0xeb, 0x39, 0x0d, 0xba, 0x8a, 0x5a, 0xea, 0x95, 0xc1, 0x5f, - 0x4b, 0xd0, 0x38, 0xe3, 0xc6, 0x88, 0x74, 0xa8, 0xc9, 0xb7, 0x61, 0x45, 0x63, 0x3b, 0x47, 0x46, - 0xb4, 0xf6, 0x37, 0x96, 0x2f, 0x1a, 0xd7, 0xea, 0xa9, 0xc7, 0x58, 0xf4, 0x25, 0x1e, 0x7d, 0x64, - 0xc7, 0x2d, 0xb4, 0x6b, 0x0b, 0xd4, 0x63, 0xc8, 0x3e, 0x34, 0xb4, 0xe7, 0x1e, 0x92, 0xa4, 0xb5, - 0xbf, 0x75, 0xc3, 0xbb, 0xb7, 0xd2, 0x02, 0x47, 0x06, 0x50, 0x8f, 0xdd, 0x19, 0x46, 0xa6, 0xb4, - 0xf6, 0x37, 0x97, 0xa7, 0xf8, 0x03, 0x4e, 0x73, 0x54, 0xf0, 0x9f, 0x12, 0xb4, 0x8f, 0xd3, 0xe9, - 0x11, 0xcf, 0x78, 0x1a, 0xdb, 0xc2, 0xe6, 0xaf, 0x95, 0xd2, 0xc2, 0x6b, 0xe5, 0xc6, 0x05, 0x53, - 0xbe, 0x7d, 0xc1, 0x3c, 0x85, 0xb6, 0xd0, 0xa1, 0x48, 0xb5, 0x61, 0x49, 0xc2, 0x63, 0x4f, 0xea, - 0x96, 0xd0, 0x27, 0xb9, 0xca, 0x76, 0x3b, 0xae, 0x94, 0x54, 0xf9, 0x93, 0x07, 0x05, 0x7c, 0x67, - 0x8c, 0x78, 0x74, 0xe5, 0x9e, 0x09, 0xb5, 0x77, 0x7e, 0x67, 0xb8, 0x39, 0x07, 0xc6, 0x5e, 0x56, - 0xd1, 0x38, 0xf6, 0x57, 0x98, 0x1d, 0xda, 0x0e, 0x2d, 0xf4, 0xbc, 0x88, 0x8e, 0x89, 0x20, 0x74, - 0x51, 0xc1, 0x8f, 0xa0, 0x7a, 0x9c, 0x4e, 0x35, 0xd9, 0x85, 0x2a, 0x4f, 0xa7, 0xda, 0xbf, 0x11, - 0x8a, 0x62, 0x2c, 0xa6, 0x83, 0x22, 0x22, 0xf8, 0x5d, 0x05, 0x6a, 0xf6, 0x10, 0x6b, 0xfb, 0x00, - 0xbb, 0xd1, 0x0b, 0x2b, 0xb4, 0x39, 0x29, 0xfa, 0xdf, 0xfb, 0xd0, 0x29, 0x58, 0xe7, 0x20, 0x65, - 0x84, 0xac, 0xe6, 0xda, 0x02, 0x96, 0x3f, 0x5b, 0x3c, 0xac, 0xe2, 0x60, 0xb9, 0xd6, 0xc1, 0xbe, - 0x09, 0xab, 0x4c, 0x19, 0x11, 0xd9, 0x43, 0x82, 0xa8, 0x2a, 0xa2, 0xda, 0x5e, 0x59, 0x80, 0xfc, - 0x81, 0xf5, 0xa0, 0x9a, 0x03, 0x79, 0xa5, 0x03, 0x3d, 0x85, 0xf6, 0x05, 0x4b, 0xd3, 0x22, 0xf0, - 0x15, 0xc4, 0xb4, 0x9c, 0xce, 0x41, 0x3e, 0x84, 0xb5, 0x4b, 0x25, 0x78, 0x1a, 0x27, 0x22, 0xbd, - 0xf2, 0xb0, 0x3a, 0xc2, 0xba, 0x73, 0xbd, 0x83, 0x76, 0xa0, 0x2c, 0xf3, 0x77, 0x40, 0x59, 0x2e, - 0xdd, 0x96, 0xcd, 0xe5, 0xdb, 0x92, 0x40, 0x75, 0xc4, 0xf4, 0xc8, 0x5f, 0xf7, 0x38, 0xb6, 0x7d, - 0xf4, 0x62, 0x22, 0x92, 0xe2, 0x5d, 0xd8, 0xa4, 0x75, 0x94, 0x0f, 0x30, 0x4c, 0xc5, 0x33, 0xa9, - 0xf2, 0xad, 0xb4, 0x5d, 0x98, 0x4e, 0x87, 0x6b, 0x07, 0xbf, 0x86, 0xfa, 0xe1, 0xe9, 0xf9, 0x49, - 0x7a, 0x29, 0x2d, 0xa3, 0x22, 0xa9, 0xb8, 0xf6, 0x6f, 0x35, 0x27, 0xd8, 0x0a, 0x8d, 0x65, 0xcc, - 0x13, 0x77, 0x3f, 0x3b, 0xae, 0x36, 0x51, 0x83, 0xd7, 0xf3, 0x1a, 0x54, 0xc6, 0xa3, 0xd7, 0x98, - 0xef, 0x32, 0xb5, 0x43, 0x1b, 0x7d, 0xc6, 0x55, 0x94, 0xdf, 0x26, 0x65, 0x9a, 0x8b, 0xc1, 0x97, - 0x25, 0x80, 0x9f, 0xf2, 0xb1, 0x54, 0xb3, 0x7c, 0x3d, 0x23, 0x0d, 0x4b, 0x7c, 0xd9, 0x9d, 0x80, - 0xb7, 0xf2, 0x94, 0x89, 0xc4, 0xb6, 0x2b, 0x5f, 0xed, 0xb9, 0xc2, 0x26, 0x60, 0xa2, 0xfd, 0x81, - 0xa8, 0x50, 0x1c, 0x5b, 0xdd, 0xa5, 0xe2, 0xdc, 0x57, 0x13, 0xc7, 0x8b, 0x41, 0xd4, 0x96, 0x83, - 0xf8, 0x0d, 0x34, 0x8e, 0x84, 0xbe, 0xc2, 0x08, 0x1e, 0x41, 0x33, 0x16, 0xfa, 0x2a, 0x5c, 0x38, - 0xa1, 0x0d, 0xab, 0xf8, 0xcc, 0x7f, 0x53, 0xb8, 0xf0, 0xca, 0x8b, 0xe1, 0xfd, 0xff, 0x01, 0xfc, - 0xb6, 0x04, 0x70, 0xc4, 0xa7, 0x22, 0xe2, 0x18, 0xc3, 0x53, 0xa8, 0x44, 0xd9, 0xc4, 0xf7, 0xbb, - 0x6e, 0xd1, 0x5e, 0x5c, 0x4d, 0xa8, 0xb5, 0x91, 0x67, 0xb0, 0x32, 0xc6, 0xb4, 0xf9, 0x3e, 0x47, - 0x72, 0xd4, 0x3c, 0x99, 0xd4, 0x23, 0xc8, 0x7b, 0x50, 0xb5, 0x3b, 0xe8, 0x55, 0xf0, 0x10, 0xae, - 0xe5, 0xc8, 0x7c, 0xcb, 0x14, 0xad, 0xfb, 0x7f, 0xa9, 0x42, 0xd3, 0x75, 0xb0, 0x83, 0xd3, 0x13, - 0xf2, 0x33, 0x68, 0xbd, 0xe4, 0xa6, 0x68, 0xc2, 0x5b, 0xb7, 0xfa, 0xc5, 0xb1, 0xfd, 0x5e, 0xeb, - 0x17, 0xce, 0x72, 0x64, 0xd0, 0xfb, 0xf2, 0x6f, 0xff, 0xfa, 0x43, 0x99, 0x90, 0xb5, 0x81, 0xff, - 0xa6, 0xd4, 0xb9, 0x0f, 0x0a, 0xed, 0x73, 0xfc, 0xf4, 0xf0, 0x9f, 0x76, 0xdd, 0xe5, 0xbe, 0xa9, - 0xfb, 0x77, 0x2c, 0x12, 0x3c, 0x44, 0x97, 0xeb, 0xfd, 0xce, 0x60, 0xe9, 0x33, 0xf5, 0x87, 0xa5, - 0x67, 0xe4, 0x1c, 0x60, 0xfe, 0x05, 0x43, 0x1e, 0xe6, 0x1e, 0x6f, 0x7d, 0xd5, 0xf4, 0x6f, 0x2e, - 0x16, 0x3c, 0x42, 0xa7, 0x9b, 0x64, 0x7d, 0xd9, 0xe9, 0x20, 0x11, 0xda, 0x90, 0x9f, 0x40, 0xc3, - 0xee, 0x1e, 0xdb, 0xd1, 0x5d, 0x5b, 0x5f, 0x2d, 0xb6, 0x6e, 0x61, 0xc1, 0x26, 0xfa, 0xeb, 0x92, - 0xd5, 0x62, 0xdf, 0x38, 0xfb, 0x18, 0xea, 0x2f, 0xb9, 0xc1, 0x5e, 0x78, 0x97, 0xa3, 0xf6, 0x42, - 0x57, 0xd4, 0xc1, 0x06, 0xfa, 0xe9, 0x90, 0x76, 0xee, 0xc7, 0x76, 0x47, 0xf2, 0x0b, 0x58, 0x75, - 0xb9, 0x3b, 0x13, 0x86, 0x8f, 0x59, 0x76, 0xa7, 0xb3, 0xbb, 0x72, 0xf8, 0x00, 0xdd, 0xde, 0xef, - 0x77, 0x8b, 0xf0, 0xbc, 0xa3, 0x33, 0x58, 0x7d, 0xc9, 0xcd, 0x02, 0xf9, 0xee, 0xf2, 0x5c, 0x30, - 0x6c, 0x8e, 0x0d, 0xb6, 0xd0, 0xeb, 0x1a, 0x29, 0x2a, 0x13, 0xa3, 0xed, 0xc5, 0xf7, 0xfe, 0xfc, - 0x66, 0xbb, 0xf4, 0xf5, 0x9b, 0xed, 0xd2, 0x3f, 0xdf, 0x6c, 0x97, 0xbe, 0x7a, 0xbb, 0x7d, 0xef, - 0xeb, 0xb7, 0xdb, 0xf7, 0xfe, 0xfe, 0x76, 0xfb, 0x1e, 0xf8, 0x9f, 0x0a, 0xa7, 0xa5, 0x5f, 0xdd, - 0x1f, 0x4b, 0xc5, 0x63, 0x19, 0xf9, 0xa9, 0x3f, 0x9a, 0x3e, 0xbf, 0x58, 0xc1, 0x25, 0xbf, 0xf3, - 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x79, 0xb7, 0x26, 0x50, 0x8f, 0x10, 0x00, 0x00, + 0x5e, 0x8a, 0xde, 0x53, 0x81, 0xbe, 0x5c, 0x51, 0xa0, 0xfd, 0x97, 0x5a, 0xf4, 0xe5, 0x80, 0xbe, + 0xf4, 0xad, 0x45, 0xd2, 0xfe, 0x1d, 0x2d, 0x38, 0xe4, 0xae, 0x24, 0x1b, 0x06, 0x02, 0xf4, 0x8d, + 0x33, 0xf3, 0xe3, 0x70, 0x38, 0xf3, 0xe3, 0x90, 0xbb, 0xb0, 0xce, 0x32, 0x31, 0x98, 0x3e, 0x1f, + 0x44, 0x32, 0xbd, 0x14, 0xc3, 0xbd, 0x4c, 0x49, 0x23, 0xc9, 0x0a, 0xcb, 0xc4, 0xde, 0xf4, 0x79, + 0xff, 0xc9, 0x50, 0xca, 0x61, 0xc2, 0x07, 0xa8, 0xbd, 0x98, 0x5c, 0x0e, 0x8c, 0x18, 0x73, 0x6d, + 0xd8, 0x38, 0x73, 0xc0, 0xfe, 0xc6, 0x50, 0x0e, 0x25, 0x0e, 0x07, 0x76, 0xe4, 0xb5, 0x8f, 0xfd, + 0x34, 0xeb, 0x9a, 0xa5, 0xa9, 0x34, 0xcc, 0x08, 0x99, 0x6a, 0x6f, 0x7d, 0x74, 0xd3, 0x29, 0x1f, + 0x67, 0x66, 0xe6, 0x8c, 0xc1, 0x7f, 0xca, 0xb0, 0x72, 0x88, 0xa1, 0x90, 0x0e, 0x94, 0x45, 0xdc, + 0x2b, 0xed, 0x94, 0x76, 0x2b, 0xb4, 0x2c, 0x62, 0xb2, 0x01, 0xb5, 0x84, 0x5d, 0xf0, 0xa4, 0x57, + 0xde, 0x29, 0xed, 0x36, 0xa9, 0x13, 0x08, 0x81, 0x6a, 0xca, 0xc6, 0xbc, 0x57, 0x41, 0x25, 0x8e, + 0x2d, 0x72, 0xca, 0x92, 0x09, 0xef, 0x55, 0x1d, 0x12, 0x05, 0xb2, 0x03, 0xad, 0x2c, 0x61, 0x11, + 0x1f, 0xc9, 0x24, 0xe6, 0xaa, 0x57, 0x43, 0xdb, 0xa2, 0x8a, 0x7c, 0x03, 0x40, 0xa4, 0xd9, 0xc4, + 0x84, 0x66, 0x96, 0xf1, 0xde, 0x0a, 0x02, 0x9a, 0xa8, 0xf9, 0x7c, 0x96, 0x71, 0xd2, 0x87, 0x46, + 0xc4, 0x0c, 0x1f, 0x4a, 0x35, 0xeb, 0xd5, 0xd1, 0x58, 0xc8, 0x36, 0x0c, 0x2d, 0x95, 0xe9, 0x35, + 0x76, 0x4a, 0xbb, 0x35, 0x8a, 0x63, 0xd2, 0x83, 0xba, 0xcc, 0x70, 0xe7, 0xbd, 0x26, 0xc2, 0x73, + 0x91, 0x7c, 0x0c, 0x10, 0x29, 0xce, 0x0c, 0x8f, 0x43, 0x66, 0x7a, 0xb0, 0x53, 0xda, 0x6d, 0xed, + 0xf7, 0xf7, 0x5c, 0x5e, 0xf6, 0xf2, 0xbc, 0xec, 0x7d, 0x9e, 0x27, 0xfb, 0x45, 0xf5, 0xab, 0x7f, + 0x3e, 0x29, 0xd1, 0xa6, 0x9f, 0x73, 0x60, 0xac, 0x83, 0x49, 0x16, 0xe7, 0x0e, 0x5a, 0xef, 0xea, + 0xc0, 0xcf, 0x39, 0x30, 0xc1, 0x00, 0xee, 0x7f, 0x2a, 0xb4, 0x71, 0xa9, 0xa6, 0xfc, 0x8b, 0x09, + 0xd7, 0x66, 0x69, 0x83, 0xa5, 0x9d, 0xca, 0xe2, 0x06, 0x83, 0xe7, 0x50, 0x77, 0x60, 0x4d, 0xbe, + 0x05, 0x2b, 0x8e, 0x2d, 0x08, 0x6a, 0xed, 0x77, 0xf6, 0x1c, 0x5d, 0xf6, 0xbc, 0x37, 0x6f, 0x0d, + 0x04, 0xac, 0x3a, 0xcd, 0x21, 0xcb, 0x4c, 0x34, 0x62, 0x64, 0x0b, 0x56, 0x12, 0x9e, 0x0e, 0xcd, + 0x08, 0xab, 0x5a, 0xa3, 0x5e, 0xb2, 0xf5, 0x7a, 0x25, 0x62, 0x33, 0xc2, 0xca, 0xd6, 0xa8, 0x13, + 0x2c, 0x7a, 0xc4, 0xc5, 0x70, 0x64, 0xb0, 0xb6, 0x35, 0xea, 0x25, 0x9b, 0x6a, 0xac, 0x8f, 0x2b, + 0x2e, 0x8e, 0x83, 0xff, 0x56, 0xa0, 0xed, 0xd6, 0x3a, 0x9b, 0x69, 0xc3, 0xc7, 0x76, 0x72, 0x2c, + 0xc7, 0x4c, 0xa4, 0xb8, 0x54, 0x93, 0x7a, 0xc9, 0x2e, 0x65, 0x84, 0x49, 0x78, 0x4e, 0x22, 0x14, + 0xec, 0xc6, 0xaf, 0xf8, 0xec, 0x95, 0x54, 0xb1, 0xf6, 0x44, 0x2a, 0x64, 0x4b, 0x9b, 0x98, 0xeb, + 0x48, 0x09, 0xac, 0x9d, 0x5f, 0x75, 0x51, 0x65, 0x03, 0x4a, 0xe4, 0x50, 0x7a, 0x46, 0xe1, 0xd8, + 0xd6, 0xfe, 0x92, 0x4d, 0x45, 0x24, 0x53, 0xcf, 0xa3, 0x5c, 0x24, 0x6b, 0x50, 0x11, 0x51, 0xe6, + 0x09, 0x64, 0x87, 0xe4, 0x31, 0x34, 0x59, 0xca, 0x92, 0x99, 0x11, 0x91, 0x46, 0x02, 0x35, 0xe9, + 0x5c, 0x61, 0x63, 0xd3, 0xc2, 0x70, 0x24, 0xb9, 0xa3, 0x51, 0x21, 0x93, 0x8f, 0x60, 0x23, 0x92, + 0xd9, 0x4c, 0xd9, 0xbc, 0x84, 0xda, 0x30, 0x65, 0xc2, 0x19, 0x67, 0x0a, 0x19, 0xd5, 0xa4, 0xa4, + 0xb0, 0x9d, 0x59, 0xd3, 0x2f, 0x39, 0x53, 0x64, 0x00, 0xeb, 0x8a, 0x0f, 0x85, 0x36, 0x5c, 0x85, + 0x17, 0x2c, 0xba, 0x1a, 0x2a, 0x39, 0x49, 0x63, 0x64, 0x50, 0x93, 0x92, 0xdc, 0xf4, 0xa2, 0xb0, + 0x90, 0x0f, 0x61, 0x2d, 0x91, 0x43, 0x91, 0x2e, 0xa2, 0xdb, 0x88, 0xee, 0xa2, 0x7e, 0x01, 0xfa, + 0x01, 0x74, 0x15, 0x8f, 0xe4, 0x78, 0xcc, 0xd3, 0x38, 0x74, 0xc9, 0x5c, 0x45, 0x16, 0x75, 0x0a, + 0xf5, 0xcf, 0x31, 0xa5, 0x3d, 0xa8, 0x4f, 0xb9, 0xd2, 0x36, 0x9d, 0x1d, 0x97, 0x1c, 0x2f, 0x92, + 0x27, 0xd0, 0x8a, 0x14, 0x8f, 0x85, 0x09, 0x71, 0xbf, 0x5d, 0xb4, 0x82, 0x53, 0x7d, 0x66, 0x77, + 0xfc, 0x00, 0xea, 0x9a, 0x47, 0xa1, 0xcd, 0xe0, 0x9a, 0x2b, 0xac, 0xe6, 0xd1, 0x49, 0x94, 0x05, + 0x7f, 0x2a, 0xe5, 0x0c, 0xf8, 0x44, 0x4a, 0xc3, 0x95, 0xad, 0x34, 0xbb, 0x90, 0x13, 0xe3, 0x09, + 0xe0, 0x04, 0xbb, 0x74, 0x24, 0x53, 0xc3, 0x22, 0xe3, 0x19, 0x90, 0x8b, 0x58, 0x85, 0xa1, 0xe2, + 0x7c, 0xcc, 0x53, 0xe3, 0x49, 0x30, 0x57, 0x58, 0x6b, 0x91, 0x4d, 0xcf, 0x81, 0xb9, 0xc2, 0xd6, + 0xe8, 0x92, 0xf3, 0xd8, 0xa6, 0xc8, 0xb3, 0xa0, 0x90, 0x83, 0x3f, 0x94, 0xf3, 0x63, 0x70, 0x24, + 0x74, 0x96, 0xb0, 0x19, 0xf9, 0x01, 0xf4, 0xf4, 0x48, 0xbe, 0x0a, 0x8b, 0x42, 0x4c, 0x34, 0x57, + 0x61, 0x24, 0x27, 0xa9, 0x0b, 0xb6, 0x41, 0x37, 0xad, 0x9d, 0x7a, 0xf3, 0xb9, 0xe6, 0xea, 0xd0, + 0x1a, 0xc9, 0x3e, 0xa0, 0x21, 0x14, 0x69, 0xcc, 0xaf, 0x43, 0x7f, 0x34, 0x05, 0xd7, 0xb8, 0x95, + 0x06, 0x5d, 0xb7, 0xc6, 0x13, 0x6b, 0x3b, 0x2c, 0x4c, 0xe4, 0x3d, 0xe8, 0x64, 0x6c, 0xc8, 0x75, + 0x98, 0x71, 0x15, 0x2a, 0xce, 0x62, 0x7f, 0x9a, 0xda, 0xa8, 0x3d, 0xe5, 0x8a, 0x72, 0x16, 0x5b, + 0x5a, 0x2c, 0x11, 0xc9, 0xb8, 0x34, 0x54, 0x6f, 0xf3, 0xc8, 0x59, 0xc8, 0x8f, 0xa1, 0x8f, 0xa1, + 0xc4, 0x32, 0x9a, 0x58, 0x45, 0xb8, 0x70, 0x20, 0x34, 0xe6, 0xa0, 0x41, 0x71, 0x97, 0x47, 0x1e, + 0x70, 0xb4, 0x60, 0x0f, 0xfe, 0x5c, 0x85, 0x8e, 0x3f, 0xae, 0x3c, 0x9a, 0x28, 0x61, 0x66, 0xe4, + 0x21, 0x34, 0x84, 0x0e, 0xa3, 0x44, 0x6a, 0xee, 0x93, 0x50, 0x17, 0xfa, 0xd0, 0x8a, 0x96, 0x57, + 0xa8, 0x5f, 0x08, 0xcc, 0xd5, 0xae, 0x83, 0xea, 0x79, 0x50, 0x1f, 0x40, 0x97, 0xa7, 0xec, 0x22, + 0xe1, 0x45, 0x6a, 0x71, 0xb3, 0x0d, 0xda, 0x71, 0xea, 0x3c, 0xa3, 0xf6, 0xdc, 0x78, 0x60, 0xe4, + 0x5a, 0x53, 0x88, 0x5c, 0xc6, 0xfd, 0x36, 0x28, 0x71, 0x36, 0xdf, 0xb5, 0x3e, 0xb5, 0x16, 0xf2, + 0x7d, 0x78, 0x70, 0x63, 0x46, 0xb1, 0x84, 0xdb, 0xec, 0xe6, 0xd2, 0xa4, 0x62, 0xa5, 0xef, 0xc2, + 0xd6, 0x8d, 0x79, 0xee, 0x24, 0x18, 0x6c, 0x0b, 0x0d, 0xba, 0xb1, 0x34, 0xed, 0xd0, 0xd9, 0xc8, + 0xc7, 0xf0, 0xf8, 0xc6, 0xac, 0x4b, 0x91, 0xc6, 0x61, 0xc6, 0xb4, 0xb6, 0xe7, 0x0a, 0x9b, 0x47, + 0x83, 0x3e, 0x5c, 0x9a, 0xfb, 0x89, 0x48, 0xe3, 0x53, 0x0f, 0xb0, 0x4c, 0xb9, 0xe1, 0x60, 0x92, + 0x25, 0x92, 0xc5, 0xd8, 0x5e, 0x1a, 0x74, 0x7d, 0x69, 0xe6, 0x39, 0x9a, 0xc8, 0x33, 0xb8, 0x3f, + 0x66, 0xd7, 0xf3, 0x8a, 0x6a, 0xf1, 0xda, 0x75, 0x9c, 0x1a, 0xed, 0x8e, 0xd9, 0x75, 0x5e, 0xc8, + 0x33, 0xf1, 0x1a, 0x1b, 0x4f, 0x81, 0x63, 0x49, 0x22, 0x5f, 0xf1, 0x38, 0xe4, 0xd7, 0xf6, 0x2a, + 0xb3, 0xe7, 0x9d, 0xe4, 0xb6, 0x03, 0x67, 0x3a, 0xbe, 0x36, 0xe4, 0x7d, 0xe8, 0xb8, 0x3e, 0xa2, + 0xf8, 0x17, 0x13, 0xa1, 0xb8, 0xeb, 0x39, 0x0d, 0xba, 0x8a, 0x5a, 0xea, 0x95, 0xc1, 0xdf, 0x4a, + 0xd0, 0x38, 0xe3, 0xc6, 0x88, 0x74, 0xa8, 0xc9, 0xb7, 0x61, 0x45, 0x63, 0x3b, 0x47, 0x46, 0xb4, + 0xf6, 0x37, 0x96, 0x2f, 0x1a, 0xd7, 0xea, 0xa9, 0xc7, 0x58, 0xf4, 0x25, 0x1e, 0x7d, 0x64, 0xc7, + 0x2d, 0xb4, 0x6b, 0x0b, 0xd4, 0x63, 0xc8, 0x3e, 0x34, 0xb4, 0xe7, 0x1e, 0x92, 0xa4, 0xb5, 0xbf, + 0x75, 0xc3, 0xbb, 0xb7, 0xd2, 0x02, 0x47, 0x06, 0x50, 0x8f, 0xdd, 0x19, 0x46, 0xa6, 0xb4, 0xf6, + 0x37, 0x97, 0xa7, 0xf8, 0x03, 0x4e, 0x73, 0x54, 0xf0, 0xfb, 0x32, 0xb4, 0x8f, 0xd3, 0xe9, 0x11, + 0xcf, 0x78, 0x1a, 0xdb, 0xc2, 0xe6, 0xaf, 0x95, 0xd2, 0xc2, 0x6b, 0xe5, 0xc6, 0x05, 0x53, 0xbe, + 0x7d, 0xc1, 0x3c, 0x85, 0xb6, 0xd0, 0xa1, 0x48, 0xb5, 0x61, 0x49, 0xc2, 0x63, 0x4f, 0xea, 0x96, + 0xd0, 0x27, 0xb9, 0xca, 0x76, 0x3b, 0xae, 0x94, 0x54, 0xf9, 0x93, 0x07, 0x05, 0x7c, 0x67, 0x8c, + 0x78, 0x74, 0xe5, 0x9e, 0x09, 0xb5, 0x77, 0x7e, 0x67, 0xb8, 0x39, 0x07, 0xc6, 0x5e, 0x56, 0xd1, + 0x38, 0xf6, 0x57, 0x98, 0x1d, 0xda, 0x0e, 0x2d, 0xf4, 0xbc, 0x88, 0x8e, 0x89, 0x20, 0x74, 0x5e, + 0xc1, 0xc5, 0xe6, 0xde, 0x58, 0x6a, 0xee, 0xc1, 0x47, 0x50, 0x3d, 0x4e, 0xa7, 0x9a, 0xec, 0x42, + 0x95, 0xa7, 0x53, 0xed, 0x5f, 0x0f, 0x45, 0x99, 0x16, 0x13, 0x45, 0x11, 0x11, 0xfc, 0xae, 0x02, + 0x35, 0x7b, 0xbc, 0xb5, 0x7d, 0x9a, 0xdd, 0xe8, 0x92, 0x15, 0xda, 0x9c, 0x14, 0x9d, 0xf1, 0x7d, + 0xe8, 0x14, 0x7c, 0x74, 0x90, 0x32, 0x42, 0x56, 0x73, 0x6d, 0x01, 0xcb, 0x1f, 0x34, 0x1e, 0x56, + 0x71, 0xb0, 0x5c, 0xeb, 0x60, 0xdf, 0x84, 0x55, 0xa6, 0x8c, 0x88, 0xec, 0xf1, 0x41, 0x54, 0x15, + 0x51, 0x6d, 0xaf, 0x2c, 0x40, 0xfe, 0x28, 0x7b, 0x50, 0xcd, 0x81, 0xbc, 0xd2, 0x81, 0x9e, 0x42, + 0xfb, 0x82, 0xa5, 0x69, 0x11, 0xf8, 0x0a, 0x62, 0x5a, 0x4e, 0xe7, 0x20, 0x1f, 0xc2, 0xda, 0xa5, + 0x12, 0x3c, 0x8d, 0x13, 0x91, 0x5e, 0x79, 0x58, 0x1d, 0x61, 0xdd, 0xb9, 0xde, 0x41, 0x3b, 0x50, + 0x96, 0xf9, 0x0b, 0xa1, 0x2c, 0x97, 0xee, 0xd1, 0xe6, 0xf2, 0x3d, 0x4a, 0xa0, 0x3a, 0x62, 0x7a, + 0xe4, 0x1f, 0x02, 0x38, 0xb6, 0x1d, 0xf6, 0x62, 0x22, 0x92, 0xe2, 0xc5, 0xd8, 0xa4, 0x75, 0x94, + 0x0f, 0x30, 0x4c, 0xc5, 0x33, 0xa9, 0xf2, 0xad, 0xb4, 0x5d, 0x98, 0x4e, 0x87, 0x6b, 0x07, 0xbf, + 0x86, 0xfa, 0xe1, 0xe9, 0xf9, 0x49, 0x7a, 0x29, 0x2d, 0xd7, 0x22, 0xa9, 0xb8, 0xf6, 0xaf, 0x38, + 0x27, 0xd8, 0x0a, 0x8d, 0x65, 0xcc, 0x13, 0x77, 0x73, 0x3b, 0x16, 0x37, 0x51, 0x83, 0x17, 0xf7, + 0x1a, 0x54, 0xc6, 0xa3, 0xd7, 0x98, 0xef, 0x32, 0xb5, 0x43, 0x1b, 0x7d, 0xc6, 0x55, 0x94, 0xdf, + 0x33, 0x65, 0x9a, 0x8b, 0xc1, 0x97, 0x25, 0x80, 0x9f, 0xf2, 0xb1, 0x54, 0xb3, 0x7c, 0x3d, 0x23, + 0x0d, 0x4b, 0x7c, 0xd9, 0x9d, 0x80, 0xf7, 0xf5, 0x94, 0x89, 0xc4, 0x36, 0x32, 0x5f, 0xed, 0xb9, + 0xc2, 0x26, 0x60, 0xa2, 0xfd, 0x51, 0xa9, 0x50, 0x1c, 0x5b, 0xdd, 0xa5, 0xe2, 0xdc, 0x57, 0x13, + 0xc7, 0x8b, 0x41, 0xd4, 0x96, 0x83, 0xf8, 0x0d, 0x34, 0x8e, 0x84, 0xbe, 0xc2, 0x08, 0x1e, 0x41, + 0x33, 0x16, 0xfa, 0x2a, 0x5c, 0x38, 0xbb, 0x0d, 0xab, 0xf8, 0xcc, 0x7f, 0x6d, 0xb8, 0xf0, 0xca, + 0x8b, 0xe1, 0xfd, 0xff, 0x01, 0xfc, 0xb6, 0x04, 0x70, 0xc4, 0xa7, 0x22, 0xe2, 0x18, 0xc3, 0x53, + 0xa8, 0x44, 0xd9, 0xc4, 0x77, 0xc2, 0x6e, 0xd1, 0x78, 0x5c, 0x4d, 0xa8, 0xb5, 0x91, 0x67, 0xb0, + 0x32, 0xc6, 0xb4, 0xf9, 0x0e, 0x48, 0x72, 0xd4, 0x3c, 0x99, 0xd4, 0x23, 0xc8, 0x7b, 0x50, 0xb5, + 0x3b, 0xe8, 0x55, 0xf0, 0x10, 0xae, 0xe5, 0xc8, 0x7c, 0xcb, 0x14, 0xad, 0xfb, 0x7f, 0xad, 0x42, + 0xd3, 0xf5, 0xb6, 0x83, 0xd3, 0x13, 0xf2, 0x33, 0x68, 0xbd, 0xe4, 0xa6, 0x68, 0xcf, 0x5b, 0xb7, + 0x3a, 0xc9, 0xb1, 0xfd, 0x92, 0xeb, 0x17, 0xce, 0x72, 0x64, 0xd0, 0xfb, 0xf2, 0xef, 0xff, 0xfe, + 0x63, 0x99, 0x90, 0xb5, 0x81, 0xff, 0xda, 0xd4, 0xb9, 0x0f, 0x0a, 0xed, 0x73, 0xfc, 0x28, 0xf1, + 0x1f, 0x7d, 0xdd, 0xe5, 0x8e, 0xaa, 0xfb, 0x77, 0x2c, 0x12, 0x3c, 0x44, 0x97, 0xeb, 0xfd, 0xce, + 0x60, 0xe9, 0x03, 0xf6, 0x87, 0xa5, 0x67, 0xe4, 0x1c, 0x60, 0xfe, 0x6d, 0x43, 0x1e, 0xe6, 0x1e, + 0x6f, 0x7d, 0xef, 0xf4, 0x6f, 0x2e, 0x16, 0x3c, 0x42, 0xa7, 0x9b, 0x64, 0x7d, 0xd9, 0xe9, 0x20, + 0x11, 0xda, 0x90, 0x9f, 0x40, 0xc3, 0xee, 0x1e, 0xdb, 0xd1, 0x5d, 0x5b, 0x5f, 0x2d, 0xb6, 0x6e, + 0x61, 0xc1, 0x26, 0xfa, 0xeb, 0x92, 0xd5, 0x62, 0xdf, 0x38, 0xfb, 0x18, 0xea, 0x2f, 0xb9, 0xc1, + 0x5e, 0x78, 0x97, 0xa3, 0xf6, 0x42, 0x57, 0xd4, 0xc1, 0x06, 0xfa, 0xe9, 0x90, 0x76, 0xee, 0xc7, + 0x76, 0x47, 0xf2, 0x0b, 0x58, 0x75, 0xb9, 0x3b, 0x13, 0x86, 0x8f, 0x59, 0x76, 0xa7, 0xb3, 0xbb, + 0x72, 0xf8, 0x00, 0xdd, 0xde, 0xef, 0x77, 0x8b, 0xf0, 0xbc, 0xa3, 0x33, 0x58, 0x7d, 0xc9, 0xcd, + 0x02, 0xf9, 0xee, 0xf2, 0x5c, 0x30, 0x6c, 0x8e, 0x0d, 0xb6, 0xd0, 0xeb, 0x1a, 0x29, 0x2a, 0x13, + 0xa3, 0xed, 0xc5, 0xf7, 0xfe, 0xf2, 0x66, 0xbb, 0xf4, 0xf5, 0x9b, 0xed, 0xd2, 0xbf, 0xde, 0x6c, + 0x97, 0xbe, 0x7a, 0xbb, 0x7d, 0xef, 0xeb, 0xb7, 0xdb, 0xf7, 0xfe, 0xf1, 0x76, 0xfb, 0x1e, 0xf8, + 0xdf, 0x0d, 0xa7, 0xa5, 0x5f, 0xdd, 0x1f, 0x4b, 0xc5, 0x63, 0x19, 0xf9, 0xa9, 0x3f, 0x9a, 0x3e, + 0xbf, 0x58, 0xc1, 0x25, 0xbf, 0xf3, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xee, 0x28, 0x27, 0x2b, + 0xa9, 0x10, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2526,6 +2535,13 @@ func (m *EnvDependent) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.Version) > 0 { + i -= len(m.Version) + copy(dAtA[i:], m.Version) + i = encodeVarintConfig(dAtA, i, uint64(len(m.Version))) + i-- + dAtA[i] = 0x42 + } if m.IsRequired { i-- if m.IsRequired { @@ -3269,6 +3285,10 @@ func (m *EnvDependent) Size() (n int) { if m.IsRequired { n += 2 } + l = len(m.Version) + if l > 0 { + n += 1 + l + sovConfig(uint64(l)) + } return n } @@ -5778,6 +5798,38 @@ func (m *EnvDependent) Unmarshal(dAtA []byte) error { } } m.IsRequired = bool(v != 0) + case 8: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Version", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthConfig + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Version = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipConfig(dAtA[iNdEx:]) diff --git a/api/v1/config.proto b/api/v1/config.proto index 58bb4a2..0ced2d8 100644 --- a/api/v1/config.proto +++ b/api/v1/config.proto @@ -116,6 +116,7 @@ message EnvDependent { [ (gogoproto.stdtime) = true ]; // 检测时间 string cmd = 6; // 检测命令 bool is_required = 7; // 是否必须 + string version = 8; // 版本号 } // 依赖项列表 diff --git a/biz/config.go b/biz/config.go index 7f77f2d..43c31c4 100644 --- a/biz/config.go +++ b/biz/config.go @@ -267,6 +267,7 @@ func (s *ConfigAPIService) GetEnvs(ctx context.Context, req *emptypb.Empty) (res err := util.CheckCommandExists(envs[i].Cmd) envs[i].IsInstalled = err == nil envs[i].CheckedAt = &now + envs[i].Version = util.GetCommandVersion(envs[i].Cmd) if err != nil { envs[i].Error = err.Error() } diff --git a/util/util.go b/util/util.go index c715185..6bdc9aa 100644 --- a/util/util.go +++ b/util/util.go @@ -189,6 +189,15 @@ func CheckCommandExists(command string) error { return err } +func GetCommandVersion(command string) string { + cmd := exec.Command(command, "--version") + output, err := cmd.CombinedOutput() + if err != nil { + return "" + } + return strings.TrimSpace(string(output)) +} + // 获取系统发行版本信息 func GetOSRelease() (osVersion string, err error) { var ( diff --git a/web/pages/admin/dashboard.vue b/web/pages/admin/dashboard.vue index b3c536b..9be07e6 100644 --- a/web/pages/admin/dashboard.vue +++ b/web/pages/admin/dashboard.vue @@ -149,8 +149,8 @@ style="width: 100%" empty-text="您暂无权限查看环境依赖情况" > - + + + + +