rebuild: split core into separate repo; move wg-go integration to internal/ctr/corebind
- go.mod: require git.zkcoi.com/zkcoi/meshray/core, replace => ../Meshray - internal/ctr/corebind: EnhancedBind + registry + adapter (wg-go integration isolated) - cmd/mr-wg migrated from old core/cmd/meshray-core - core/ removed; CHANGELOG updated; fix checkdb vet warning
This commit is contained in:
@@ -32,7 +32,7 @@ func NewDeviceService(store *sqlite.Store, ctrClient ctr.Client) *DeviceService
|
||||
// GetDevice 获取设备详情
|
||||
func (s *DeviceService) GetDevice(id uint64) (*model.Device, error) {
|
||||
var device model.Device
|
||||
err := s.store.DB().Preload("Network").First(&device, id).Error
|
||||
err := s.store.DB().First(&device, id).Error
|
||||
if err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return nil, errors.New("设备不存在")
|
||||
@@ -45,7 +45,7 @@ func (s *DeviceService) GetDevice(id uint64) (*model.Device, error) {
|
||||
// ListAllDevices 获取所有设备列表
|
||||
func (s *DeviceService) ListAllDevices() ([]model.Device, error) {
|
||||
var devices []model.Device
|
||||
err := s.store.DB().Preload("Network").Find(&devices).Error
|
||||
err := s.store.DB().Find(&devices).Error
|
||||
return devices, err
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user