remove

src/main/java/com/nosum/deliver/auth/controller/AuthSocialController.java

@@ -1,46 +0,0 @@
-package com.nosum.deliver.auth.controller;
-
-import com.nosum.common.annotation.LoginRequired;
-import com.nosum.common.base.domain.Result;
-import com.nosum.common.enums.ErrorEnum;
-import com.nosum.common.util.ExceptionUtil;
-import com.nosum.deliver.auth.domain.vo.AuthUserSocialVO;
-import com.nosum.deliver.auth.service.AuthUserSocialService;
-import com.nosum.system.enums.RoleEnum;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-
-@RestController
-@RequestMapping("/social")
-public class AuthSocialController {
-
-    @Autowired
-    private AuthUserSocialService authUserSocialService;
-
-    @PostMapping("/social/v1/add")
-    @LoginRequired(role = RoleEnum.ADMIN)
-    public Result saveSocial(@RequestBody AuthUserSocialVO authUserSocialVO) {
-        ExceptionUtil.isRollback(StringUtils.isBlank(authUserSocialVO.getCode()), ErrorEnum.PARAM_ERROR);
-        return authUserSocialService.saveAuthUserSocial(authUserSocialVO);
-    }
-
-    @PutMapping("/social/v1/update")
-    @LoginRequired(role = RoleEnum.ADMIN)
-    public Result editSocial(@RequestBody AuthUserSocialVO authUserSocialVO) {
-        ExceptionUtil.isRollback(authUserSocialVO.getId() == null, ErrorEnum.PARAM_ERROR);
-        return authUserSocialService.editAuthUserSocial(authUserSocialVO);
-    }
-
-    @DeleteMapping("/social/v1/{id}")
-    public Result deleteSocial(@PathVariable("id") Long id) {
-        return authUserSocialService.deleteSocial(id);
-    }
-
-    @LoginRequired(role = RoleEnum.ADMIN)
-    @GetMapping("/social/v1/list")
-    public Result getSocialList(AuthUserSocialVO authUserSocialVO) {
-        return authUserSocialService.getSocialList(authUserSocialVO);
-    }
-}

src/main/java/com/nosum/deliver/auth/controller/AuthUserController.java

@@ -4,10 +4,8 @@ import com.nosum.common.annotation.Explain;
 import com.nosum.common.annotation.LoginRequired;
 import com.nosum.common.base.domain.Result;
 import com.nosum.common.util.FileUtil;
-import com.nosum.deliver.auth.domain.vo.AuthUserSocialVO;
 import com.nosum.deliver.auth.domain.vo.AuthUserVO;
 import com.nosum.deliver.auth.service.AuthUserService;
-import com.nosum.deliver.auth.service.AuthUserSocialService;
 import com.nosum.deliver.auth.service.OauthService;
 import com.nosum.system.enums.RoleEnum;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,9 +22,6 @@ public class AuthUserController {
     @Autowired
     private AuthUserService authUserService;
 
-    @Autowired
-    private AuthUserSocialService authUserSocialService;
-
 
     @Explain("获取用户信息")
     @LoginRequired(role = RoleEnum.USER)
@@ -57,24 +52,6 @@ public class AuthUserController {
         return authUserService.getUserList(authUserVO);
     }
 
-    @Explain("获取github登录地址")
-    @GetMapping("/github/v1/get")
-    public Result oauthLoginByGithub() {
-        return oauthService.oauthLoginByGithub();
-    }
-
-    @Explain("github登录回调接口")
-    @RequestMapping("/github/v1/callback")
-    @ResponseBody
-    public String callback(String code, String state) { //gitHub登陆回调接口
-        return oauthService.callback(code, state);
-    }
-
-    @Explain("保存用户信息")
-    @PostMapping("/user/v1/login")
-    public Result saveUserByGithub(@RequestBody AuthUserVO authUserVO) {
-        return oauthService.saveUserByGithub(authUserVO);
-    }
 
     @Explain("更新用户信息")
     @LoginRequired
@@ -101,7 +78,6 @@ public class AuthUserController {
         return authUserService.getMasterUserInfo();
     }
 
-
     @Explain("管理员登录")
     @PostMapping("/admin/v1/login")
     public Result adminLogin(@RequestBody AuthUserVO authUserVO) {
@@ -124,25 +100,7 @@ public class AuthUserController {
 
     @Explain("管理员注册,不存在管理员可以注册成功")
     @PostMapping("/admin/v1/register")
-    public Result registerAdminByGithub(@RequestBody AuthUserVO authUserVO) {
+    public Result registerAdmin(@RequestBody AuthUserVO authUserVO) {
         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();
-    }
 }

src/main/java/com/nosum/deliver/auth/service/AuthUserSocialService.java

@@ -1,26 +0,0 @@
-package com.nosum.deliver.auth.service;
-
-
-import com.nosum.common.base.domain.Result;
-import com.nosum.common.base.service.BaseService;
-import com.nosum.deliver.auth.domain.po.AuthUserSocial;
-import com.nosum.deliver.auth.domain.vo.AuthUserSocialVO;
-
-/**
- * 用户表社交信息表:业务接口类
- * @author nosum
- */
-public interface AuthUserSocialService extends BaseService<AuthUserSocial> {
-
-    Result saveAuthUserSocial(AuthUserSocialVO authUserSocialVO);
-
-    Result editAuthUserSocial(AuthUserSocialVO authUserSocialVO);
-
-    Result getSocial(Long id);
-
-    Result getSocialList(AuthUserSocialVO authUserSocialVO);
-
-    Result getSocialInfo();
-
-    Result deleteSocial(Long id);
-}

src/main/java/com/nosum/deliver/auth/service/OauthService.java

@@ -11,16 +11,6 @@ import com.nosum.deliver.auth.domain.vo.AuthUserVO;
 public interface OauthService {
 
     /**
-     * 获取授权链接
-     */
-    Result oauthLoginByGithub();
-
-    /**
-     * 保存用户信息
-     */
-    Result saveUserByGithub(AuthUserVO authUserVO);
-
-    /**
      * 保存管理员
      */
     Result login(AuthUserVO authUserVO);
@@ -32,11 +22,6 @@ public interface OauthService {
     Result updatePassword(AuthUserVO authUserVO);
 
     /**
-     * gitHub 登录回调接口
-     */
-    String callback(String code, String state);
-
-    /**
      * 管理员注册
      */
     Result registerAdmin(AuthUserVO authUserVO);

src/main/java/com/nosum/deliver/auth/service/impl/AuthUserServiceImpl.java

@@ -29,8 +29,9 @@ import java.util.List;
 import java.util.Optional;
 
 /**
- * @author sumbytes
- * @since 2019-08-28
+ * 用户认证服务实现类.
+ *
+ * @author Young
  */
 @Service
 public class AuthUserServiceImpl extends ServiceImpl<AuthUserDao, AuthUser> implements AuthUserService {

src/main/java/com/nosum/deliver/auth/service/impl/AuthUserSocialServiceImpl.java

@@ -1,105 +0,0 @@
-package com.nosum.deliver.auth.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.nosum.common.base.domain.Result;
-import com.nosum.common.enums.ErrorEnum;
-import com.nosum.common.util.ExceptionUtil;
-import com.nosum.common.util.PageUtil;
-import com.nosum.deliver.auth.dao.AuthUserSocialDao;
-import com.nosum.deliver.auth.domain.po.AuthUserSocial;
-import com.nosum.deliver.auth.domain.vo.AuthUserSocialVO;
-import com.nosum.deliver.auth.service.AuthUserSocialService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-@Service
-public class AuthUserSocialServiceImpl extends ServiceImpl<AuthUserSocialDao,AuthUserSocial> implements AuthUserSocialService{
-
-    @Autowired
-    private AuthUserSocialDao authUserSocialDao;
-
-    @Override
-    public Result saveAuthUserSocial(AuthUserSocialVO authUserSocialVO) {
-        AuthUserSocial authUserSocial=new AuthUserSocial()
-                .setCode(authUserSocialVO.getCode())
-                .setShowType(authUserSocialVO.getShowType())
-                .setContent(authUserSocialVO.getContent())
-                .setRemark(authUserSocialVO.getRemark())
-                .setIcon(authUserSocialVO.getIcon())
-                .setIsEnabled(authUserSocialVO.getIsEnabled())
-                .setIsHome(authUserSocialVO.getIsHome())
-                .setCreateTime(LocalDateTime.now())
-                .setUpdateTime(LocalDateTime.now());
-        authUserSocialDao.insert(authUserSocial);
-        return Result.createWithSuccessMessage();
-    }
-
-    @Override
-    public Result editAuthUserSocial(AuthUserSocialVO authUserSocialVO) {
-        AuthUserSocial authUserSocial=new AuthUserSocial()
-                .setId(authUserSocialVO.getId())
-                .setCode(authUserSocialVO.getCode())
-                .setShowType(authUserSocialVO.getShowType())
-                .setContent(authUserSocialVO.getContent())
-                .setRemark(authUserSocialVO.getRemark())
-                .setIcon(authUserSocialVO.getIcon())
-                .setIsEnabled(authUserSocialVO.getIsEnabled())
-                .setIsHome(authUserSocialVO.getIsHome())
-                .setUpdateTime(LocalDateTime.now());
-        authUserSocialDao.updateById(authUserSocial);
-        return Result.createWithSuccessMessage();
-    }
-
-    @Override
-    public Result getSocial(Long id) {
-        AuthUserSocial authUserSocial=this.authUserSocialDao.selectById(id);
-        if (authUserSocial==null){
-            ExceptionUtil.rollback(ErrorEnum.PARAM_ERROR);
-        }
-        return Result.createWithModel(authUserSocial);
-    }
-
-    @Override
-    public Result getSocialList(AuthUserSocialVO authUserSocialVO) {
-        authUserSocialVO= Optional.ofNullable(authUserSocialVO).orElse(new AuthUserSocialVO());
-        Page page=Optional.of(PageUtil.checkAndInitPage(authUserSocialVO)).orElse(PageUtil.initPage());
-        if (!StringUtils.isEmpty(authUserSocialVO.getKeywords())){
-            authUserSocialVO.setKeywords("%"+authUserSocialVO.getKeywords()+"%");
-        }
-        List<AuthUserSocialVO> authUserSocialList=this.authUserSocialDao.selectSocialList(page,authUserSocialVO);
-        return Result.createWithPaging(authUserSocialList,PageUtil.initPageInfo(page));
-    }
-
-    @Override
-    public Result getSocialInfo() {
-        List<AuthUserSocial> authUserSocialList=this.authUserSocialDao.selectList(new LambdaQueryWrapper<AuthUserSocial>().eq(AuthUserSocial::getIsHome,1).eq(AuthUserSocial::getIsEnabled,1));
-        List<AuthUserSocialVO> authUserSocialVOList=new ArrayList<>();
-        authUserSocialList.forEach(authUserSocial->{
-            authUserSocialVOList.add(new AuthUserSocialVO()
-                    .setIcon(authUserSocial.getIcon())
-                    .setCode(authUserSocial.getCode())
-                    .setShowType(authUserSocial.getShowType())
-                    .setContent(authUserSocial.getContent())
-                    .setRemark(authUserSocial.getRemark())
-                    .setIsEnabled(authUserSocial.getIsEnabled())
-                    .setIsHome(authUserSocial.getIsHome())
-                    .setUpdateTime(LocalDateTime.now()));
-        });
-        return Result.createWithModels(authUserSocialVOList);
-    }
-
-    @Override
-    public Result deleteSocial(Long id) {
-        ExceptionUtil.isRollback(id==null,ErrorEnum.PARAM_ERROR);
-        authUserSocialDao.deleteById(id);
-        return Result.createWithSuccessMessage();
-    }
-}

src/main/java/com/nosum/deliver/auth/service/impl/OauthServiceImpl.java

@@ -5,12 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.nosum.common.base.domain.Result;
 import com.nosum.common.base.domain.vo.UserSessionVO;
 import com.nosum.common.constant.Constants;
-import com.nosum.common.constant.GithubOauth;
 import com.nosum.common.enums.ErrorEnum;
 import com.nosum.common.util.ExceptionUtil;
 import com.nosum.common.util.JwtUtil;
 import com.nosum.common.util.SessionUtil;
-import com.nosum.common.util.ToolUtil;
 import com.nosum.deliver.auth.dao.AuthTokenDao;
 import com.nosum.deliver.auth.dao.AuthUserDao;
 import com.nosum.deliver.auth.domain.po.AuthToken;
@@ -19,7 +17,6 @@ import com.nosum.deliver.auth.domain.vo.AuthUserVO;
 import com.nosum.deliver.auth.service.OauthService;
 import com.nosum.system.enums.RoleEnum;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,7 +25,6 @@ import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.Collections;
 import java.util.Date;
-import java.util.Optional;
 
 @Service
 @Slf4j
@@ -41,41 +37,6 @@ public class OauthServiceImpl implements OauthService {
     private AuthTokenDao authTokenDao;
 
     @Override
-    public Result oauthLoginByGithub() {
-        return Result.createWithModel(GithubOauth.getAuthUrl());
-    }
-
-    @Override
-    public Result saveUserByGithub(AuthUserVO authUserVO) {
-        log.debug("saveUserByGithub {}", authUserVO);
-        if (authUserVO == null || StringUtils.isBlank(authUserVO.getSocialId())) {
-            ExceptionUtil.rollback(ErrorEnum.PARAM_ERROR);
-        }
-
-        AuthUser authUser = authUserDao.selectOne(new LambdaQueryWrapper<AuthUser>().eq(AuthUser::getSocialId, authUserVO.getSocialId()));
-        if (authUser == null) {
-            authUser = new AuthUser();
-            authUser.setSocialId(authUserVO.getSocialId());
-            authUser.setAvatar(authUserVO.getAvatar());
-            authUser.setName(authUserVO.getName());
-            authUser.setRoleId(RoleEnum.USER.getRoleId());
-            authUser.setPassword(SecureUtil.hmacMd5(RandomStringUtils.random(32)).digestHex(authUserVO.getSocialId()));
-            authUser.setCreateTime(LocalDateTime.now());
-            authUserDao.insert(authUser);
-        } else {
-            if (Constants.ONE == ToolUtil.getInteger(authUser.getStatus())) {
-                ExceptionUtil.rollback(ErrorEnum.LOGIN_DISABLE);
-            }
-        }
-        authUserVO.setCreateTime(LocalDateTime.now());
-        String token = JwtUtil.getToken(new AuthUserVO().setPassword(authUser.getPassword()).setName(authUser.getName()).setId(authUser.getId()));
-
-        authUserVO.setToken(token);
-        authTokenDao.insert(new AuthToken().setUserId(authUser.getId()).setToken(token).setExpireTime(new Date(Constants.EXPIRE_TIME + System.currentTimeMillis()).toInstant().atOffset(ZoneOffset.of("+8")).toLocalDateTime()));
-        return Result.createWithModel(authUserVO);
-    }
-
-    @Override
     public Result login(AuthUserVO authUserVO) {
         log.debug("login {}", authUserVO);
         if (authUserVO == null || StringUtils.isBlank(authUserVO.getEmail()) || StringUtils.isBlank(authUserVO.getPassword())) {
@@ -112,17 +73,6 @@ public class OauthServiceImpl implements OauthService {
         return Result.createWithSuccessMessage();
     }
 
-
-    @Override
-    public String callback(String code, String state) {
-        AuthUserVO authUserVO = GithubOauth.getUserInfo(code);
-        Optional<AuthUserVO> optional = Optional.ofNullable(authUserVO);
-        if (optional.isPresent()) {
-            return GithubOauth.getHtml(authUserVO);
-        }
-        return GithubOauth.getErrorHtml();
-    }
-
     @Override
     public Result registerAdmin(AuthUserVO authUserVO) {
         AuthUser authUser = authUserDao.selectOne(new LambdaQueryWrapper<AuthUser>().eq(AuthUser::getRoleId, RoleEnum.ADMIN.getRoleId()));