Browse Source

修改URL地址

youngknowsum 3 years ago
parent
commit
aff45bd6d7

+ 0 - 16
src/main/java/com/sumbytes/helloblog/auth/controller/AuthSocialController.java

@@ -33,11 +33,6 @@ public class AuthSocialController {
         return authUserSocialService.editAuthUserSocial(authUserSocialVO);
     }
 
-    @GetMapping("/social/v1/{id}")
-    public Result getSocial(@PathVariable("id") Long id) {
-        return authUserSocialService.getSocial(id);
-    }
-
     @DeleteMapping("/social/v1/{id}")
     public Result deleteSocial(@PathVariable("id") Long id) {
         return authUserSocialService.deleteSocial(id);
@@ -48,15 +43,4 @@ public class AuthSocialController {
     public Result getSocialList(AuthUserSocialVO authUserSocialVO) {
         return authUserSocialService.getSocialList(authUserSocialVO);
     }
-
-    @GetMapping("/social/v1/socials")
-    public Result getSocialEnableList(AuthUserSocialVO authUserSocialVO) {
-        authUserSocialVO.setIsEnabled(1);
-        return authUserSocialService.getSocialList(authUserSocialVO);
-    }
-
-    @GetMapping("/social/v1/info")
-    public Result getSocialInfo() {
-        return authUserSocialService.getSocialInfo();
-    }
 }

+ 25 - 1
src/main/java/com/sumbytes/helloblog/auth/controller/AuthUserController.java

@@ -4,8 +4,10 @@ import com.sumbytes.common.annotation.Explain;
 import com.sumbytes.common.annotation.LoginRequired;
 import com.sumbytes.common.base.domain.Result;
 import com.sumbytes.common.util.FileUtil;
+import com.sumbytes.helloblog.auth.domain.vo.AuthUserSocialVO;
 import com.sumbytes.helloblog.auth.domain.vo.AuthUserVO;
 import com.sumbytes.helloblog.auth.service.AuthUserService;
+import com.sumbytes.helloblog.auth.service.AuthUserSocialService;
 import com.sumbytes.helloblog.auth.service.OauthService;
 import com.sumbytes.system.enums.RoleEnum;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,9 +19,14 @@ import org.springframework.web.bind.annotation.*;
 public class AuthUserController {
 
     @Autowired
+    private OauthService oauthService;
+
+    @Autowired
     private AuthUserService authUserService;
+
     @Autowired
-    private OauthService oauthService;
+    private AuthUserSocialService authUserSocialService;
+
 
     @Explain("获取用户信息")
     @LoginRequired(role = RoleEnum.USER)
@@ -121,4 +128,21 @@ public class AuthUserController {
         return oauthService.registerAdmin(authUserVO);
     }
 
+
+
+    @GetMapping("/social/v1/{id}")
+    public Result getSocial(@PathVariable("id") Long id) {
+        return authUserSocialService.getSocial(id);
+    }
+
+    @GetMapping("/social/v1/socials")
+    public Result getSocialEnableList(AuthUserSocialVO authUserSocialVO) {
+        authUserSocialVO.setIsEnabled(1);
+        return authUserSocialService.getSocialList(authUserSocialVO);
+    }
+
+    @GetMapping("/social/v1/info")
+    public Result getSocialInfo() {
+        return authUserSocialService.getSocialInfo();
+    }
 }

+ 4 - 1
src/main/java/com/sumbytes/helloblog/music/service/impl/MusicServiceImpl.java

@@ -5,12 +5,15 @@ import com.sumbytes.helloblog.music.service.MusicService;
 import com.sumbytes.helloblog.music.util.MusicUtil;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+
 
 @Service
 public class MusicServiceImpl implements MusicService {
 
     @Override
     public Result getPlayList() {
-      return Result.createWithModels(MusicUtil.getPlayList());
+///      return Result.createWithModels(MusicUtil.getPlayList());
+      return Result.createWithModels(new ArrayList<>());
     }
 }