App: 修改登录信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbAppUserController.java

@@ -132,17 +132,7 @@ public class TbAppUserController extends BaseController {
     public AjaxResult add(@RequestBody TbAppUser tbAppUser) {
         return toAjax(iTbAppUserService.save(tbAppUser) ? 1 : 0);
     }
-//
-//    /**
-//     * 修改会员
-//     */
-//    @ApiOperation("修改会员")
-//    @PreAuthorize("@ss.hasPermi('system:appUser:edit')" )
-//    @Log(title = "会员" , businessType = BusinessType.UPDATE)
-//    @PutMapping
-//    public AjaxResult edit(@RequestBody TbAppUser tbAppUser) {
-//        return toAjax(iTbAppUserService.updateById(tbAppUser) ? 1 : 0);
-//    }
+
     /**
      * 修改会员+家族成员
      */

ruoyi-app/src/main/java/com/ruoyi/app/base/AppLoginUser.java

@@ -1,6 +1,6 @@
 package com.ruoyi.app.base;
 
-import com.ruoyi.app.domain.TbAppUser;
+import com.ruoyi.app.domain.vo.AppMemberVo;
 
 /**
  * App登录用户
@@ -46,7 +46,7 @@ public class AppLoginUser {
     /**
      * 用户信息
      */
-    private TbAppUser user;
+    private AppMemberVo user;
 
     public String getSalt() {
         return salt;
@@ -57,7 +57,7 @@ public class AppLoginUser {
     }
 
     public AppLoginUser() {}
-    public AppLoginUser(TbAppUser user) {
+    public AppLoginUser(AppMemberVo user) {
         this.user = user;
     }
 
@@ -115,11 +115,11 @@ public class AppLoginUser {
         this.expireTime = expireTime;
     }
 
-    public TbAppUser getUser()
+    public AppMemberVo getUser()
     {
         return user;
     }
-    public void setUser(TbAppUser user)
+    public void setUser(AppMemberVo user)
     {
         this.user = user;
     }

ruoyi-app/src/main/java/com/ruoyi/app/controller/AppLoginController.java

@@ -9,13 +9,16 @@ import com.ruoyi.app.base.AppLoginUser;
 import com.ruoyi.app.base.AppTokenService;
 import com.ruoyi.app.domain.TbAppUser;
 import com.ruoyi.app.domain.vo.AppLoginVo;
+import com.ruoyi.app.domain.vo.AppMemberVo;
 import com.ruoyi.app.service.ITbAppUserService;
 import com.ruoyi.app.util.AliSMSUtil;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.ip.IpUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -56,29 +59,37 @@ public class AppLoginController {
         if (StringUtils.isBlank(loginVo.getCaptcha())){
             return AjaxResult.error("验证码不能为空");
         }
-        TbAppUser appUser = userService.getOne(new QueryWrapper<TbAppUser>()
-                .eq("mobile",loginVo.getMobile())
-        );
+        //手机短信验证
+//        boolean ckCaptcha = AliSMSUtil.getInstance().validateSmsCode(loginVo.getMobile(), loginVo.getCaptcha());
+//        if (!ckCaptcha) {
+//            return AjaxResult.error("验证码错误");
+//        }
+
+        AppMemberVo appUser = userService.getAppMember(null,loginVo.getMobile());
         boolean ck;
         Date date = new Date();
         // 为空则新增
         if (appUser == null) {
-            appUser = new TbAppUser();
+            appUser = new AppMemberVo();
             appUser.setMobile(loginVo.getMobile());
             appUser.setNickName(loginVo.getMobile());
             appUser.setQrcode(DateUtils.getCurrentTimeRandom());
             appUser.setCreateTime(date);
-            ck = userService.save(appUser);
+            ck = userService.saveOrUpdate(appUser);
             if (!ck){
                 return AjaxResult.error("未知异常，登录失败");
             }
-            appUser.setCreateBy(appUser.getId());
+            appUser.setCreateBy(appUser.getUserId().toString());
         }
-
-        //手机短信验证
-        boolean ckCaptcha = AliSMSUtil.getInstance().validateSmsCode(loginVo.getMobile(), loginVo.getCaptcha());
-        if (!ckCaptcha) {
-            return AjaxResult.error("验证码错误");
+        String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
+        appUser.setClientId(loginVo.getClientId());
+        appUser.setLoginIp(ip);
+        appUser.setLoginTime(date);
+        appUser.setUpdateBy(appUser.getUserId().toString());
+        appUser.setUpdateTime(date);
+        ck = userService.saveOrUpdate(appUser);
+        if (!ck){
+            return AjaxResult.error("未知异常，登录失败");
         }
 
         //每次登录前，先删除缓存，保证登录唯一性
@@ -88,16 +99,6 @@ public class AppLoginController {
         loginUser.setUser(appUser);
         String token = appTokenService.createToken(loginUser);
 
-        appUser.setClientId(loginVo.getClientId());
-        appUser.setLoginIp(loginUser.getIpaddr());
-        appUser.setLoginTime(date);
-        appUser.setUpdateBy(appUser.getId());
-        appUser.setUpdateTime(date);
-        ck = userService.updateById(appUser);
-        if (!ck){
-            return AjaxResult.error("未知异常，登录失败");
-        }
-
         jsonObject.put("token", token);
         jsonObject.put("user", appUser);
 

ruoyi-app/src/main/java/com/ruoyi/app/controller/FamilyController.java

@@ -59,9 +59,7 @@ public class FamilyController extends AppBaseController {
      */
     @ApiOperation("我的默认家族")
     @GetMapping("/myFamily")
-    public AjaxResult myFamily(){
-        TbAppUser user = getLoginUser().getUser();
-        AppMemberVo memberVo = appUserService.getAppMember(user.getId().toString(),"");
+    public AjaxResult myFamily(@LoginAppUser AppMemberVo memberVo){
         Long memberId = memberVo.getMemberId();
         if (memberId == null) {
             return AjaxResult.error("成员id不能为空");
@@ -72,9 +70,7 @@ public class FamilyController extends AppBaseController {
 
     @ApiOperation("我的家族列表")
     @GetMapping("/myList")
-    public AjaxResult myList(){
-        TbAppUser user = getLoginUser().getUser();
-        AppMemberVo memberVo = appUserService.getAppMember(user.getId().toString(),"");
+    public AjaxResult myList(@LoginAppUser AppMemberVo memberVo){
         Long memberId = memberVo.getMemberId();
         if (memberId == null) {
             return AjaxResult.error("成员id不能为空");
@@ -88,7 +84,7 @@ public class FamilyController extends AppBaseController {
     @ApiOperation("创建家族")
     @PostMapping("/create")
     @Transactional(rollbackFor = Exception.class)
-    public AjaxResult add(@RequestBody TbFamily tbFamily) {
+    public AjaxResult add(@LoginAppUser AppMemberVo memberVo,@RequestBody TbFamily tbFamily) {
         Date date = new Date();
         tbFamily.setCreateTime(date);
         tbFamily.setUpdateTime(date);
@@ -96,12 +92,6 @@ public class FamilyController extends AppBaseController {
             return AjaxResult.error("创建失败");
         }
         // 设置添加人为管理员
-        TbAppUser user = getLoginUser().getUser();
-        AppMemberVo memberVo = appUserService.getAppMember(user.getId().toString(),"");
-        if(!appUserService.saveOrUpdate(memberVo)){
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return AjaxResult.error("创建失败");
-        }
         TbMemberMiddle middle = new TbMemberMiddle();
         middle.setMemberId(memberVo.getMemberId());
         middle.setFamilyId(tbFamily.getId());
@@ -118,9 +108,7 @@ public class FamilyController extends AppBaseController {
     @ApiOperation("切换家族")
     @ApiImplicitParam(name = "familyId", value = "切换的家族ID",paramType="Long")
     @GetMapping("/change")
-    public AjaxResult change(Long familyId) {
-        TbAppUser user = getLoginUser().getUser();
-        AppMemberVo memberVo = appUserService.getAppMember(user.getId().toString(),"");
+    public AjaxResult change(@LoginAppUser AppMemberVo memberVo,Long familyId) {
         Long memberId = memberVo.getMemberId();
         if(familyService.change(memberId,familyId)){
             return AjaxResult.success();
@@ -137,9 +125,7 @@ public class FamilyController extends AppBaseController {
     @ApiOperation("申请加入家族")
     @ApiImplicitParam(name = "familyId", value = "申请的家族ID",paramType="Long")
     @GetMapping("/join")
-    public AjaxResult join(@LoginAppUser TbAppUser user, Long familyId) {
-
-        AppMemberVo memberVo = appUserService.getAppMember(user.getId().toString(),"");
+    public AjaxResult join(@LoginAppUser AppMemberVo memberVo, Long familyId) {
 
         List<TbMemberMiddle> middles = middleService.list(new LambdaQueryWrapper<TbMemberMiddle>()
                 .eq(TbMemberMiddle::getFamilyId,familyId)
@@ -150,8 +136,6 @@ public class FamilyController extends AppBaseController {
             return AjaxResult.error("已在该家族，不允许重复加入");
         }
 
-        memberVo.setUserId(user.getId());
-        memberVo.setName(user.getNickName());
         memberVo.setJoins("Y");
         // 保存成员
         if(appUserService.saveOrUpdate(memberVo)){
@@ -185,7 +169,7 @@ public class FamilyController extends AppBaseController {
             @ApiImplicitParam(name = "pageSize", value = "每页行数",paramType="int")
     })
     @GetMapping("/selectApply")
-    public TableDataInfo selectApply(@LoginAppUser TbAppUser user, Long familyId,Integer pageNum,Integer pageSize){
+    public TableDataInfo selectApply(Long familyId,Integer pageNum,Integer pageSize){
         if (familyId == null){
             return new TableDataInfo();
         }
@@ -231,13 +215,12 @@ public class FamilyController extends AppBaseController {
     @ApiOperation("退出家族")
     @ApiImplicitParam(name = "familyId", value = "申请的家族ID",paramType="Long")
     @GetMapping("/quit")
-    public AjaxResult quit(@LoginAppUser TbAppUser user, Long familyId) {
+    public AjaxResult quit(@LoginAppUser AppMemberVo user, Long familyId) {
         if (familyId == null) {
             return AjaxResult.error("家族id为空");
         }
-        AppMemberVo memberVo = appUserService.getAppMember(user.getId().toString(),"");
         TbMemberMiddle middle = middleService.getOne(new LambdaQueryWrapper<TbMemberMiddle>()
-                .eq(TbMemberMiddle::getMemberId,memberVo.getMemberId())
+                .eq(TbMemberMiddle::getMemberId,user.getMemberId())
                 .eq(TbMemberMiddle::getFamilyId,familyId)
         );
         if (middle == null){

ruoyi-app/src/main/java/com/ruoyi/app/controller/FamilyMemberController.java

@@ -54,9 +54,9 @@ public class FamilyMemberController extends AppBaseController {
     @GetMapping("/list")
     public TableDataInfo list(Integer pageNum, Integer pageSize) {
         // 登录用户
-        TbAppUser user = getLoginUser().getUser();
+        AppMemberVo user = getLoginUser().getUser();
         // 获取成员信息
-        AppMemberVo memberVo = appUserService.getAppMember(user.getId().toString(),"");
+        AppMemberVo memberVo = appUserService.getAppMember(user.getUserId().toString(),"");
         if (memberVo == null) {
             return new TableDataInfo();
         }
@@ -94,7 +94,7 @@ public class FamilyMemberController extends AppBaseController {
 
     @ApiOperation("添加成员-家族树")
     @PostMapping("/addToTree")
-    public AjaxResult addToTree(@LoginAppUser TbAppUser user, @RequestBody TbMemberMiddle member){
+    public AjaxResult addToTree(@RequestBody TbMemberMiddle member){
         if (member == null) {
             return AjaxResult.error("数据为空");
         }
@@ -120,7 +120,7 @@ public class FamilyMemberController extends AppBaseController {
         return AjaxResult.success("添加成功");
     }
 
-    @ApiOperation(value = "逻辑删除家族树的成员", notes = "逻辑删除家族树的成员（去掉parentId）；如果这一代只有他一个，则不允许删除，否则家族树会断开")
+    @ApiOperation(value = "逻辑删除家族树的成员", notes = "逻辑删除家族树的成员（去掉parentId），相当于这一支人将从家族树中删除")
     @PostMapping("/delToTree")
     public AjaxResult delToTree(Long memberId, Long familyId) {
         if (memberId == null || familyId ==null) {
@@ -137,12 +137,6 @@ public class FamilyMemberController extends AppBaseController {
         if (middle.getParentId() == null) {
             return AjaxResult.error("该成员没有在家族树中");
         }
-        List<TbMemberMiddle> middleList = middleService.list(new LambdaQueryWrapper<TbMemberMiddle>()
-                .eq(TbMemberMiddle::getParentId, middle.getParentId())
-        );
-        if (middleList.size() == 1) {
-            return AjaxResult.error("这一代只有一位成员，不允许删除");
-        }
         // 设置parentId为空
         middle.setParentId(null);
         if(!middleService.updateById(middle)){
@@ -171,4 +165,14 @@ public class FamilyMemberController extends AppBaseController {
         }
         return AjaxResult.success("保存成功");
     }
+
+
+    @ApiOperation("获取成员")
+    @PostMapping("/get")
+    public AjaxResult get(Long memberId) {
+        if (memberId == null) {
+            return AjaxResult.error("成员id不能为空");
+        }
+        return AjaxResult.success(memberService.get(memberId));
+    }
 }

ruoyi-app/src/main/java/com/ruoyi/app/controller/MyFriendController.java

@@ -9,6 +9,7 @@ import com.ruoyi.app.base.AppLoginUser;
 import com.ruoyi.app.controller.base.AppBaseController;
 import com.ruoyi.app.domain.TbAppUser;
 import com.ruoyi.app.domain.TbMyFriends;
+import com.ruoyi.app.domain.vo.AppMemberVo;
 import com.ruoyi.app.service.ITbAppUserService;
 import com.ruoyi.app.service.ITbMyFriendsService;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -89,8 +90,8 @@ public class MyFriendController extends AppBaseController {
             return AjaxResult.error("好友id不能为空");
         }
         // 当前登录人
-        TbAppUser user = getLoginUser().getUser();
-        friends.setAppUserId(user.getId());
+        AppMemberVo user = getLoginUser().getUser();
+        friends.setAppUserId(user.getUserId());
         // 查询是否已经存在
         TbMyFriends item = friendsService.getOne(new LambdaQueryWrapper<TbMyFriends>()
                 .nested(
@@ -107,7 +108,7 @@ public class MyFriendController extends AppBaseController {
             return AjaxResult.success("好友已添加");
         }
         friends.setStatus("1"); //申请
-        friends.setCreateBy(user.getId().toString());
+        friends.setCreateBy(user.getUserId().toString());
         friends.setCreateTime(new Date());
         // 不存在则新增
         if (item == null) {
@@ -127,8 +128,8 @@ public class MyFriendController extends AppBaseController {
             @ApiImplicitParam(name = "pageSize", value = "每页行数",paramType="int")
     })
     @GetMapping("/selectApply")
-    public TableDataInfo selectApply(@LoginAppUser TbAppUser loginUser, Integer pageNum, Integer pageSize) {
-        Long appUserId = loginUser.getId();
+    public TableDataInfo selectApply(@LoginAppUser AppMemberVo loginUser, Integer pageNum, Integer pageSize) {
+        Long appUserId = loginUser.getUserId();
         pageNum = pageNum == null ? 1 : pageNum;
         pageSize = pageSize == null ? 10 : pageSize;
         PageHelper.startPage(pageNum, pageSize, "create_time desc");
@@ -147,8 +148,8 @@ public class MyFriendController extends AppBaseController {
         if (id == null) {
             return AjaxResult.error("好友id不能为空");
         }
-        TbAppUser user = getLoginUser().getUser();
-        TbMyFriends friends = friendsService.getByUid(id, user.getId());
+        AppMemberVo user = getLoginUser().getUser();
+        TbMyFriends friends = friendsService.getByUid(id, user.getUserId());
         if (friends == null) {
             return AjaxResult.error("该用户已不存在");
         }

ruoyi-app/src/main/java/com/ruoyi/app/controller/MyProfileController.java

@@ -1,9 +1,11 @@
 package com.ruoyi.app.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.app.annotation.LoginAppUser;
 import com.ruoyi.app.controller.base.AppBaseController;
 import com.ruoyi.app.domain.TbAppUser;
 import com.ruoyi.app.domain.TbMyProfile;
+import com.ruoyi.app.domain.vo.AppMemberVo;
 import com.ruoyi.app.service.ITbMyProfileService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
@@ -46,23 +48,22 @@ public class MyProfileController extends AppBaseController {
 
     @ApiOperation("添加/修改个人详情")
     @PostMapping("/saveOrUpdate")
-    public AjaxResult saveOrUpdate(@RequestBody TbMyProfile profile) {
+    public AjaxResult saveOrUpdate(@LoginAppUser AppMemberVo user,@RequestBody TbMyProfile profile) {
         if (StringUtils.isBlank(profile.getTitle()) || StringUtils.isBlank(profile.getCotents())) {
             return AjaxResult.error("标题或内容不能为空");
         }
         if (profile.getAppUserId() == null) {
             return AjaxResult.error("参数异常");
         }
-        TbAppUser user = getLoginUser().getUser();
         Date date = new Date();
         //新增
         if (profile.getId() == null) {
-            profile.setCreateBy(user.getId());
+            profile.setCreateBy(user.getUserId());
             profile.setCreateTime(date);
             return toAjax(profileService.save(profile) ? 1 : 0);
         } else {
             // 修改
-            profile.setUpdateBy(user.getId());
+            profile.setUpdateBy(user.getUserId());
             profile.setUpdateTime(date);
             return toAjax(profileService.updateById(profile) ? 1 : 0);
         }

ruoyi-app/src/main/java/com/ruoyi/app/controller/MyPublishController.java

@@ -6,6 +6,8 @@ import com.ruoyi.app.controller.base.AppBaseController;
 import com.ruoyi.app.domain.TbAppUser;
 import com.ruoyi.app.domain.TbMyPublish;
 import com.ruoyi.app.domain.TbPublishImg;
+import com.ruoyi.app.domain.vo.AppFamilyVo;
+import com.ruoyi.app.domain.vo.AppMemberVo;
 import com.ruoyi.app.service.ITbAppUserService;
 import com.ruoyi.app.service.ITbMyPublishService;
 import com.ruoyi.app.service.ITbPublishImgService;
@@ -127,8 +129,8 @@ public class MyPublishController extends AppBaseController {
         if (publish.getContents().length() > 500) {
             return AjaxResult.error("发表内容不能超过500字");
         }
-        TbAppUser user = getLoginUser().getUser();
-        publish.setCreateBy(user.getId().toString());
+        AppMemberVo user = getLoginUser().getUser();
+        publish.setCreateBy(user.getUserId().toString());
         publish.setCreateTime(new Date());
         if (!publishService.save(publish)){
             return AjaxResult.error("发表失败");

ruoyi-app/src/main/java/com/ruoyi/app/controller/PublishCommentController.java

@@ -1,8 +1,10 @@
 package com.ruoyi.app.controller;
 
+import com.ruoyi.app.annotation.LoginAppUser;
 import com.ruoyi.app.controller.base.AppBaseController;
 import com.ruoyi.app.domain.TbAppUser;
 import com.ruoyi.app.domain.TbPublishComment;
+import com.ruoyi.app.domain.vo.AppMemberVo;
 import com.ruoyi.app.service.ITbPublishCommentService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
@@ -37,15 +39,14 @@ public class PublishCommentController extends AppBaseController {
      */
     @ApiOperation("添加评论")
     @GetMapping("/add")
-    public AjaxResult addComment(TbPublishComment comment) {
+    public AjaxResult addComment(@LoginAppUser AppMemberVo user, TbPublishComment comment) {
         if (comment.getPublishId() == null || comment.getAppUserId() == null) {
             return AjaxResult.error("参数为空");
         }
         if (StringUtils.isBlank(comment.getContents())){
             return AjaxResult.error("评论内容不能为空");
         }
-        TbAppUser user = getLoginUser().getUser();
-        comment.setCreateBy(user.getId().toString());
+        comment.setCreateBy(user.getUserId().toString());
         comment.setCreateTime(new Date());
         if (commentService.save(comment)){
             return AjaxResult.success("评论成功");

ruoyi-app/src/main/java/com/ruoyi/app/controller/PublishThumbsController.java

@@ -2,10 +2,12 @@ package com.ruoyi.app.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.app.annotation.LoginAppUser;
 import com.ruoyi.app.base.AppLoginUser;
 import com.ruoyi.app.controller.base.AppBaseController;
 import com.ruoyi.app.domain.TbAppUser;
 import com.ruoyi.app.domain.TbPublishThumbs;
+import com.ruoyi.app.domain.vo.AppMemberVo;
 import com.ruoyi.app.service.ITbPublishThumbsService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import io.swagger.annotations.Api;
@@ -47,7 +49,7 @@ public class PublishThumbsController extends AppBaseController {
             @ApiImplicitParam(name = "publishId", value = "发表id",paramType="Long")
     })
     @GetMapping("/action")
-    public AjaxResult action(Long appUserId,Long publishId){
+    public AjaxResult action(@LoginAppUser AppMemberVo user, Long appUserId, Long publishId){
         // TODO 在点赞或取消时，APP端的点赞数组异步增加或去掉记录
         if (appUserId == null || publishId == null) {
             return AjaxResult.error("参数不能为空");
@@ -56,14 +58,13 @@ public class PublishThumbsController extends AppBaseController {
                 .eq(TbPublishThumbs::getPublishId, publishId)
                 .eq(TbPublishThumbs::getAppUserId,appUserId)
         );
-        TbAppUser user = getLoginUser().getUser();
         Date date = new Date();
         // 点赞
         if (thumbs == null) {
             thumbs = new TbPublishThumbs();
             thumbs.setAppUserId(appUserId);
             thumbs.setPublishId(publishId);
-            thumbs.setCreateBy(user.getId().toString());
+            thumbs.setCreateBy(user.getUserId().toString());
             thumbs.setCreateTime(date);
             thumbsService.save(thumbs);
         } else { // 取消

ruoyi-app/src/main/java/com/ruoyi/app/controller/common/DictDataController.java

@@ -0,0 +1,43 @@
+package com.ruoyi.app.controller.common;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.ISysDictDataService;
+import com.ruoyi.system.service.ISysDictTypeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 数据字典信息
+ * 
+ * @author Alex
+ */
+@Api(value = "数据字典信息",tags = "数据字典信息")
+@RestController
+@RequestMapping("/app/dict/data")
+public class DictDataController extends BaseController {
+    @Autowired
+    private ISysDictTypeService dictTypeService;
+
+    /**
+     * 根据字典类型查询字典数据信息
+     */
+    @ApiOperation("根据字典类型查询字典数据信息")
+    @GetMapping(value = "/type/{dictType}")
+    public AjaxResult dictType(@PathVariable String dictType) {
+        return AjaxResult.success(dictTypeService.selectDictDataByType(dictType));
+    }
+
+}

ruoyi-app/src/main/java/com/ruoyi/app/interceptor/AuthenticationInterceptor.java

@@ -4,6 +4,7 @@ import com.ruoyi.app.annotation.PassToken;
 import com.ruoyi.app.base.AppLoginUser;
 import com.ruoyi.app.base.AppTokenService;
 import com.ruoyi.app.domain.TbAppUser;
+import com.ruoyi.app.domain.vo.AppMemberVo;
 import com.ruoyi.app.service.ITbAppUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.method.HandlerMethod;
@@ -40,29 +41,22 @@ public class AuthenticationInterceptor implements HandlerInterceptor {
                 return true;
             }
         }
-        //检查有没有需要用户权限的注解
-//        if (method.isAnnotationPresent(AuthToken.class)) {
-//            AuthToken authToken = method.getAnnotation(AuthToken.class);
-//            if (authToken.required()) {
-                // 执行认证
-                if (token == null) {
-                    throw new RuntimeException("无token，请重新登录");
-                }
-                // 获取 token 中的 loginUser
-                AppLoginUser loginUser = appTokenService.getLoginUser(token);
-                if (loginUser == null) {
-                    throw new RuntimeException("用户不存在，请重新登录");
-                }
-                TbAppUser user = loginUser.getUser();
-                if (user == null) {
-                    throw new RuntimeException("用户不存在，请重新登录");
-                }
-                // 验证 token
-                appTokenService.verifyToken(loginUser);
-                return true;
-//            }
-//        }
-//        return true;
+        // 执行认证
+        if (token == null) {
+            throw new RuntimeException("无token，请重新登录");
+        }
+        // 获取 token 中的 loginUser
+        AppLoginUser loginUser = appTokenService.getLoginUser(token);
+        if (loginUser == null) {
+            throw new RuntimeException("用户不存在，请重新登录");
+        }
+        AppMemberVo user = loginUser.getUser();
+        if (user == null) {
+            throw new RuntimeException("用户不存在，请重新登录");
+        }
+        // 验证 token
+        appTokenService.verifyToken(loginUser);
+        return true;
     }
 
     @Override

ruoyi-app/src/main/java/com/ruoyi/app/resolver/LoginAppUserHandlerMethodArgumentResolver.java

@@ -4,6 +4,7 @@ package com.ruoyi.app.resolver;
 import com.ruoyi.app.annotation.LoginAppUser;
 import com.ruoyi.app.base.AppTokenService;
 import com.ruoyi.app.domain.TbAppUser;
+import com.ruoyi.app.domain.vo.AppMemberVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.MethodParameter;
 import org.springframework.stereotype.Component;
@@ -25,7 +26,7 @@ public class LoginAppUserHandlerMethodArgumentResolver implements HandlerMethodA
     @Override
     public boolean supportsParameter(MethodParameter parameter) {
         //接收数据类型及注解类型
-        return parameter.getParameterType().isAssignableFrom(TbAppUser.class) && parameter.hasParameterAnnotation(LoginAppUser.class);
+        return parameter.getParameterType().isAssignableFrom(AppMemberVo.class) && parameter.hasParameterAnnotation(LoginAppUser.class);
     }
 
     @Override

ruoyi-system/src/main/java/com/ruoyi/app/domain/vo/AppMemberVo.java

@@ -80,6 +80,9 @@ public class AppMemberVo extends BaseEntity {
     @Excel(name = "删除  1是 0否")
     private String deleted;
 
+    @ApiModelProperty(value="个推客户端id")
+    private String clientId;
+
 
     @ApiModelProperty(value="会员昵称拼音首字母")
     private String userPyCode;

ruoyi-system/src/main/java/com/ruoyi/app/service/ITbAppUserService.java

@@ -25,4 +25,6 @@ public interface ITbAppUserService extends IService<TbAppUser> {
     boolean saveOrUpdate(AppMemberVo memberVo);
 
     AppMemberVo getAppMember(String id,String search);
+
+    AppMemberVo getMember(String type,String id,String search);
 }

ruoyi-system/src/main/java/com/ruoyi/app/service/ITbFamilyMemberService.java

@@ -15,6 +15,7 @@ import java.util.List;
  */
 public interface ITbFamilyMemberService extends IService<TbFamilyMember> {
 
+    AppMemberVo get(Long memberId);
     boolean saveOrUpdate(AppMemberVo memberVo);
     List<AppMemberVo> selectFamilyMember(AppMemberVo memberVo);
     TbMemberMiddle getFamilyTree(Long familyId);

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbAppUserServiceImpl.java

@@ -107,6 +107,7 @@ public class TbAppUserServiceImpl extends ServiceImpl<TbAppUserMapper, TbAppUser
             appUser.setCreateBy(memberVo.getUserCreateBy());
             appUser.setCreateTime(date);
             userService.save(appUser);
+            memberVo.setUserId(appUser.getId());
         }else {// 否则修改用户
             appUser.setId(memberVo.getUserId());
             userService.updateById(appUser);
@@ -117,6 +118,7 @@ public class TbAppUserServiceImpl extends ServiceImpl<TbAppUserMapper, TbAppUser
             member.setCreateBy(memberVo.getUserCreateBy());
             member.setCreateTime(date);
             memberService.save(member);
+            memberVo.setMemberId(member.getId());
         } else { // 否则修改成员
             member.setId(memberVo.getMemberId());
             memberService.updateById(member);
@@ -128,4 +130,9 @@ public class TbAppUserServiceImpl extends ServiceImpl<TbAppUserMapper, TbAppUser
     public AppMemberVo getAppMember(String id,String search) {
         return baseMapper.getAppMember("user", id, search);
     }
+
+    @Override
+    public AppMemberVo getMember(String type,String id,String search){
+        return baseMapper.getAppMember(type, id, search);
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbFamilyMemberServiceImpl.java

@@ -31,6 +31,15 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
     private ITbMemberMiddleService memberMiddleService;
 
     /**
+     * 根据id获取成员
+     * @param memberId
+     * @return
+     */
+    @Override
+    public AppMemberVo get(Long memberId) {
+        return userService.getMember("member", memberId.toString(),"");
+    }
+    /**
      * 添加家族成员
      * @param memberVo
      * @return

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbMyPublishServiceImpl.java

@@ -84,6 +84,9 @@ public class TbMyPublishServiceImpl extends ServiceImpl<TbMyPublishMapper, TbMyP
         }
         startPage();
         List<TbMyPublish> list = baseMapper.pageList(lqw);
+        if (list.size() <= 0) {
+            return new TableDataInfo();
+        }
         List<Long> ids = new ArrayList<>();
         list.forEach(item -> {
             ids.add(item.getId());