修改swagger被拦截器拦截的问题，修改swagger实体类和控制器自动生成配置

ruoyi-admin/pom.xml

@@ -24,31 +24,6 @@
             <optional>true</optional> <!-- 表示依赖不会传递 -->
         </dependency>
 
-        <!-- swagger2-->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-        </dependency>
-
-        <!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本-->
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>1.5.21</version>
-        </dependency>
-
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>1.5.21</version>
-        </dependency>
-
-        <!-- swagger2-UI-->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-        </dependency>
-
          <!-- Mysql驱动包 -->
         <dependency>
             <groupId>mysql</groupId>

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

@@ -6,9 +6,11 @@ import java.util.List;
 import java.util.Arrays;
 
 import com.ruoyi.app.domain.TbAppUser;
+import com.ruoyi.app.domain.vo.AppMemberVo;
 import com.ruoyi.app.service.ITbAppUserService;
 import com.ruoyi.common.utils.StringUtils;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,21 +46,29 @@ public class TbAppUserController extends BaseController {
     /**
      * 查询会员列表
      */
+    @ApiOperation("查询会员+家族成员列表")
+    @PreAuthorize("@ss.hasPermi('system:appUser:list')")
+    @GetMapping("/memberList")
+    public TableDataInfo memberList(AppMemberVo memberVo) {
+
+        startPage();
+        List<AppMemberVo> list = iTbAppUserService.selectAppMembers();
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询会员列表
+     */
+    @ApiOperation("查询会员列表")
     @PreAuthorize("@ss.hasPermi('system:appUser:list')")
     @GetMapping("/list")
     public TableDataInfo list(TbAppUser tbAppUser)
     {
         startPage();
         LambdaQueryWrapper<TbAppUser> lqw = new LambdaQueryWrapper<TbAppUser>();
-        if (tbAppUser.getFamilyId() != null){
-            lqw.eq(TbAppUser::getFamilyId ,tbAppUser.getFamilyId());
-        }
         if (tbAppUser.getTemplateId() != null){
             lqw.eq(TbAppUser::getTemplateId ,tbAppUser.getTemplateId());
         }
-        if (StringUtils.isNotBlank(tbAppUser.getRole())){
-            lqw.eq(TbAppUser::getRole ,tbAppUser.getRole());
-        }
         if (StringUtils.isNotBlank(tbAppUser.getNickName())){
             lqw.like(TbAppUser::getNickName ,tbAppUser.getNickName());
         }
@@ -84,6 +94,7 @@ public class TbAppUserController extends BaseController {
     /**
      * 导出会员列表
      */
+    @ApiOperation("导出会员列表")
     @PreAuthorize("@ss.hasPermi('system:appUser:export')" )
     @Log(title = "会员" , businessType = BusinessType.EXPORT)
     @GetMapping("/export" )
@@ -97,6 +108,7 @@ public class TbAppUserController extends BaseController {
     /**
      * 获取会员详细信息
      */
+    @ApiOperation("获取会员详细信息")
     @PreAuthorize("@ss.hasPermi('system:appUser:query')" )
     @GetMapping(value = "/{id}" )
     public AjaxResult getInfo(@PathVariable("id" ) Long id) {
@@ -106,6 +118,7 @@ public class TbAppUserController extends BaseController {
     /**
      * 新增会员
      */
+    @ApiOperation("新增会员")
     @PreAuthorize("@ss.hasPermi('system:appUser:add')" )
     @Log(title = "会员" , businessType = BusinessType.INSERT)
     @PostMapping
@@ -116,6 +129,7 @@ public class TbAppUserController extends BaseController {
     /**
      * 修改会员
      */
+    @ApiOperation("修改会员")
     @PreAuthorize("@ss.hasPermi('system:appUser:edit')" )
     @Log(title = "会员" , businessType = BusinessType.UPDATE)
     @PutMapping
@@ -126,6 +140,7 @@ public class TbAppUserController extends BaseController {
     /**
      * 删除会员
      */
+    @ApiOperation("删除会员")
     @PreAuthorize("@ss.hasPermi('system:appUser:remove')" )
     @Log(title = "会员" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}" )

ruoyi-admin/src/main/resources/application.yml

@@ -115,7 +115,7 @@ swagger:
   # 是否开启swagger
   enabled: true
   # 请求前缀
-  pathMapping: /dev-api
+  pathMapping: /
 
 # 防止XSS攻击
 xss: 

ruoyi-app/pom.xml

@@ -30,30 +30,6 @@
             <version>3.4.0</version>
         </dependency>
 
-        <!-- swagger2-->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-        </dependency>
-
-        <!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本-->
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>1.5.21</version>
-        </dependency>
-
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>1.5.21</version>
-        </dependency>
-
-        <!-- swagger2-UI-->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-        </dependency>
 
         <!-- Mysql驱动包 -->
         <dependency>

ruoyi-app/src/main/java/com/ruoyi/app/annotation/AuthToken.java

@@ -6,6 +6,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
+ * 验证token
  * @author Alex
  */
 @Target({ElementType.METHOD, ElementType.TYPE})

ruoyi-app/src/main/java/com/ruoyi/app/annotation/PassToken.java

@@ -6,6 +6,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
+ * 跳过验证token
  * @author Alex
  */
 @Target({ElementType.METHOD, ElementType.TYPE})

ruoyi-app/src/main/java/com/ruoyi/app/config/InterceptorConfig.java

@@ -1,9 +1,17 @@
 package com.ruoyi.app.config;
 
 import com.ruoyi.app.interceptor.AuthenticationInterceptor;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 /**
@@ -11,10 +19,20 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
  */
 @Configuration
 public class InterceptorConfig implements WebMvcConfigurer {
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        /** 本地文件上传路径 */
+        registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**").addResourceLocations("file:" + RuoYiConfig.getProfile() + "/");
+
+        /** swagger配置 */
+        registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+    }
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(authenticationInterceptor())
-                .addPathPatterns("/**");    // 拦截所有请求，通过判断是否有 @LoginRequired 注解 决定是否需要登录
+        registry.addInterceptor(authenticationInterceptor()).addPathPatterns("/**")
+                .excludePathPatterns("/swagger-resources/**", "/webjars/**", "/v2/**", "/swagger-ui.html/**","/druid/**");
     }
     @Bean
     public AuthenticationInterceptor authenticationInterceptor() {

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

@@ -4,7 +4,6 @@ package com.ruoyi.app.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ruoyi.app.annotation.AuthToken;
 import com.ruoyi.app.annotation.PassToken;
 import com.ruoyi.app.base.AppLoginUser;
 import com.ruoyi.app.base.AppTokenService;

ruoyi-common/pom.xml

@@ -136,6 +136,30 @@
             <artifactId>lombok</artifactId>
         </dependency>
 
+        <!-- swagger2-->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+        </dependency>
+
+        <!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本-->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.21</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.5.21</version>
+        </dependency>
+
+        <!-- swagger2-UI-->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

ruoyi-generator/src/main/resources/vm/java/controller.java.vm

@@ -35,6 +35,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @author ${author}
  * @date ${datetime}
  */
+@Api(value = "${functionName}", tags = "${functionName}")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/${moduleName}/${businessName}" )
@@ -45,6 +46,7 @@ public class ${ClassName}Controller extends BaseController {
     /**
      * 查询${functionName}列表
      */
+    @ApiOperation("查询${functionName}列表")
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
     @GetMapping("/list")
 #if($table.crud)
@@ -146,6 +148,7 @@ public class ${ClassName}Controller extends BaseController {
     /**
      * 导出${functionName}列表
      */
+    @ApiOperation("导出${functionName}列表")
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')" )
     @Log(title = "${functionName}" , businessType = BusinessType.EXPORT)
     @GetMapping("/export" )
@@ -159,6 +162,7 @@ public class ${ClassName}Controller extends BaseController {
     /**
      * 获取${functionName}详细信息
      */
+    @ApiOperation("获取${functionName}详细信息")
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')" )
     @GetMapping(value = "/{${pkColumn.javaField}}" )
     public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}" ) ${pkColumn.javaType} ${pkColumn.javaField}) {
@@ -168,6 +172,7 @@ public class ${ClassName}Controller extends BaseController {
     /**
      * 新增${functionName}
      */
+    @ApiOperation("新增${functionName}")
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')" )
     @Log(title = "${functionName}" , businessType = BusinessType.INSERT)
     @PostMapping
@@ -178,6 +183,7 @@ public class ${ClassName}Controller extends BaseController {
     /**
      * 修改${functionName}
      */
+    @ApiOperation("修改${functionName}")
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')" )
     @Log(title = "${functionName}" , businessType = BusinessType.UPDATE)
     @PutMapping
@@ -188,6 +194,7 @@ public class ${ClassName}Controller extends BaseController {
     /**
      * 删除${functionName}
      */
+    @ApiOperation("删除${functionName}")
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')" )
     @Log(title = "${functionName}" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{${pkColumn.javaField}s}" )

ruoyi-generator/src/main/resources/vm/java/domain.java.vm

@@ -31,6 +31,7 @@ import com.ruoyi.common.core.domain.TreeEntity;
 #set($Entity="TreeEntity")
 #end
 @Data
+@ApiModel(value = "${functionName}")
 @ToString
 @EqualsAndHashCode
 @NoArgsConstructor
@@ -60,6 +61,7 @@ public class ${ClassName} implements Serializable {
 #end
 #end
 #if($column.isPk==1)
+    @ApiModelProperty(value="$column.columnName")
     @TableId(value = "$column.columnName")
     private $column.javaType $column.javaField;
 #else

ruoyi-system/src/main/java/com/ruoyi/app/domain/TbAppUser.java

@@ -1,6 +1,5 @@
 package com.ruoyi.app.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -9,16 +8,14 @@ import lombok.experimental.Accessors;
 import com.ruoyi.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
 import java.io.Serializable;
 import java.util.Date;
-import java.math.BigDecimal;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 会员对象 tb_app_user
- * @author Alex
- * @date 2020-09-24
+ *
+ * @author Administrator
+ * @date 2020-09-29
  */
 @Data
 @ToString
@@ -30,6 +27,8 @@ public class TbAppUser implements Serializable {
 
     private static final long serialVersionUID=1L;
 
+
+    /** ID */
     @TableId(value = "id")
     private Long id;
 
@@ -37,18 +36,10 @@ public class TbAppUser implements Serializable {
     @Excel(name = "是否已经加入家族 1是 0否")
     private String joins;
 
-    /** 家族表id */
-    @Excel(name = "家族表id")
-    private Long familyId;
-
     /** 页面模板id */
     @Excel(name = "页面模板id")
     private Long templateId;
 
-    /** 角色：USER未加入家族的会员，GROUP已加入家族的会员，ADMIN家族管理员 */
-    @Excel(name = "角色：USER未加入家族的会员，GROUP已加入家族的会员，ADMIN家族管理员")
-    private String role;
-
     /** 昵称 */
     @Excel(name = "昵称")
     private String nickName;
@@ -69,10 +60,18 @@ public class TbAppUser implements Serializable {
     @Excel(name = "openid")
     private String openid;
 
-    /** $column.columnComment */
-    @Excel(name = "openid")
+    /** verCode */
+    @Excel(name = "verCode")
     private String verCode;
 
+    /** 启用  1是 0否 */
+    @Excel(name = "启用  1是 0否")
+    private String enable;
+
+    /** 删除  1是 0否 */
+    @Excel(name = "删除  1是 0否")
+    private String deleted;
+
     /** 创建者 */
     private Long createBy;
 

ruoyi-system/src/main/java/com/ruoyi/app/domain/TbFamilyMember.java

@@ -0,0 +1,95 @@
+package com.ruoyi.app.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import com.ruoyi.common.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 家族成员对象 tb_family_member
+ * 
+ * @author Administrator
+ * @date 2020-09-29
+ */
+@Data
+@ToString
+@EqualsAndHashCode
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("tb_family_member")
+public class TbFamilyMember implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+
+    /** 主键ID */
+    @TableId(value = "id")
+    private Long id;
+
+    /** 会员id */
+    @Excel(name = "会员id")
+    private Long appUserId;
+
+    /** 家族id */
+    @Excel(name = "家族id")
+    private Long familyId;
+
+    /** 是否家族管理员 1是 0否 */
+    @Excel(name = "是否家族管理员 1是 0否")
+    private String admin;
+
+    /** 父成员id */
+    @Excel(name = "父成员id")
+    private Long parentId;
+
+    /** 配偶id */
+    @Excel(name = "配偶id")
+    private Long spouseId;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String name;
+
+    /** 生日 */
+    @Excel(name = "生日" , width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date birthday;
+
+    /** 性别：1-男，2-女，0-未知（字典） */
+    @Excel(name = "性别：1-男，2-女，0-未知" , readConverterExp = "字=典")
+    private String gender;
+
+    /** 文化程度（字典） */
+    @Excel(name = "文化程度" , readConverterExp = "字=典")
+    private String education;
+
+    /** 状态：1读书、2工作、3退休、4过世 */
+    @Excel(name = "状态：1读书、2工作、3退休、4过世")
+    private String state;
+
+    /** 创建者 */
+    private Long createBy;
+
+    /** 创建时间 */
+    private Date createTime;
+
+    /** 更新者 */
+    private Long updateBy;
+
+    /** 更新时间 */
+    private Date updateTime;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+}

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

@@ -0,0 +1,135 @@
+package com.ruoyi.app.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@ApiModel(value = "会员+家族成员")
+public class AppMemberVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value="会员id")
+    private Long userId;
+
+    @ApiModelProperty(value="家族成员id")
+    private Long memberId;
+
+    /** 是否已经加入家族 1是 0否 */
+    @ApiModelProperty(value="是否已经加入家族 1是 0否")
+    @Excel(name = "是否已经加入家族 1是 0否")
+    private String joins;
+
+    /** 页面模板id */
+    @ApiModelProperty(value="页面模板id")
+    @Excel(name = "页面模板id")
+    private Long templateId;
+
+    /** 昵称 */
+    @ApiModelProperty(value="昵称")
+    @Excel(name = "昵称")
+    private String nickName;
+
+    /** 头像url */
+    @ApiModelProperty(value="头像url")
+    @Excel(name = "头像url")
+    private String avatar;
+
+    /** 二维码code */
+    @ApiModelProperty(value="二维码code")
+    @Excel(name = "二维码code")
+    private String qrcode;
+
+    /** 手机号码 */
+    @ApiModelProperty(value="手机号码")
+    @Excel(name = "手机号码")
+    private String mobile;
+
+    /** openid */
+    @ApiModelProperty(value="openid")
+    @Excel(name = "openid")
+    private String openid;
+
+    /** verCode */
+    @ApiModelProperty(value="verCode")
+    @Excel(name = "verCode")
+    private String verCode;
+
+    /** 启用  1是 0否 */
+    @ApiModelProperty(value="启用  1是 0否")
+    @Excel(name = "启用  1是 0否")
+    private String enable;
+
+    /** 删除  1是 0否 */
+    @ApiModelProperty(value="删除  1是 0否")
+    @Excel(name = "删除  1是 0否")
+    private String deleted;
+
+
+
+
+    /** 家族id */
+    @ApiModelProperty(value="家族id")
+    @Excel(name = "家族id")
+    private Long familyId;
+
+    /** 是否家族管理员 1是 0否 */
+    @ApiModelProperty(value="家族id")
+    @Excel(name = "家族id")
+    private String admin;
+
+    /** 父成员id */
+    @ApiModelProperty(value="父成员id")
+    @Excel(name = "父成员id")
+    private Long parentId;
+
+    /** 配偶id */
+    @ApiModelProperty(value="配偶id")
+    @Excel(name = "配偶id")
+    private Long spouseId;
+
+    /** 姓名 */
+    @ApiModelProperty(value="姓名")
+    @Excel(name = "姓名")
+    private String name;
+
+    /** 生日 */
+    @ApiModelProperty(value="生日")
+    @Excel(name = "生日" , width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date birthday;
+
+    /** 性别：1-男，2-女，0-未知（字典） */
+    @ApiModelProperty(value="性别 1-男，2-女，0-未知")
+    @Excel(name = "性别" , readConverterExp = "字=典")
+    private String gender;
+
+    /** 文化程度（字典） */
+    @ApiModelProperty(value="文化程度")
+    @Excel(name = "文化程度" , readConverterExp = "字=典")
+    private String education;
+
+    /** 状态：1读书、2工作、3退休、4过世 */
+    @ApiModelProperty(value="态：1读书、2工作、3退休、4过世")
+    @Excel(name = "状态：1读书、2工作、3退休、4过世")
+    private String state;
+
+
+    private Long memberCreateBy;
+    private Date memberCreateTime;
+    private Long memberUpdateBy;
+    private Date memberUpdateTime;
+    private String memberRemark;
+
+    private Long userCreateBy;
+    private Date userCreateTime;
+    private Long userUpdateBy;
+    private Date userUpdateTime;
+    private String userRemark;
+}

ruoyi-system/src/main/java/com/ruoyi/app/mapper/TbAppUserMapper.java

@@ -2,6 +2,9 @@ package com.ruoyi.app.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.app.domain.TbAppUser;
+import com.ruoyi.app.domain.vo.AppMemberVo;
+
+import java.util.List;
 
 /**
  * 会员Mapper接口
@@ -11,4 +14,5 @@ import com.ruoyi.app.domain.TbAppUser;
  */
 public interface TbAppUserMapper extends BaseMapper<TbAppUser> {
 
+    List<AppMemberVo> selectAppMembers();
 }

ruoyi-system/src/main/java/com/ruoyi/app/mapper/TbFamilyMemberMapper.java

@@ -0,0 +1,14 @@
+package com.ruoyi.app.mapper;
+
+import com.ruoyi.app.domain.TbFamilyMember;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 家族成员Mapper接口
+ *
+ * @author Administrator
+ * @date 2020-09-29
+ */
+public interface TbFamilyMemberMapper extends BaseMapper<TbFamilyMember> {
+
+}

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

@@ -2,6 +2,9 @@ package com.ruoyi.app.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.app.domain.TbAppUser;
+import com.ruoyi.app.domain.vo.AppMemberVo;
+
+import java.util.List;
 
 /**
  * 会员Service接口
@@ -11,4 +14,5 @@ import com.ruoyi.app.domain.TbAppUser;
  */
 public interface ITbAppUserService extends IService<TbAppUser> {
 
+    List<AppMemberVo> selectAppMembers();
 }

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

@@ -0,0 +1,14 @@
+package com.ruoyi.app.service;
+
+import com.ruoyi.app.domain.TbFamilyMember;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 家族成员Service接口
+ *
+ * @author Alex
+ * @date 2020-09-29
+ */
+public interface ITbFamilyMemberService extends IService<TbFamilyMember> {
+
+}

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * 家族Service接口
  *
- * @author ruoyi
+ * @author Alex
  * @date 2020-09-28
  */
 public interface ITbFamilyService extends IService<TbFamily> {

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

@@ -1,11 +1,14 @@
 package com.ruoyi.app.service.impl;
 
 import com.ruoyi.app.domain.TbAppUser;
+import com.ruoyi.app.domain.vo.AppMemberVo;
 import com.ruoyi.app.mapper.TbAppUserMapper;
 import com.ruoyi.app.service.ITbAppUserService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+
 /**
  * 会员Service业务层处理
  *
@@ -15,4 +18,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class TbAppUserServiceImpl extends ServiceImpl<TbAppUserMapper, TbAppUser> implements ITbAppUserService {
 
+    /**
+     * 获取所有未删除状态的会员信息列表
+     * @return
+     */
+    @Override
+    public List<AppMemberVo> selectAppMembers(){
+
+        return baseMapper.selectAppMembers();
+    }
 }

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

@@ -0,0 +1,18 @@
+package com.ruoyi.app.service.impl;
+
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.app.mapper.TbFamilyMemberMapper;
+import com.ruoyi.app.domain.TbFamilyMember;
+import com.ruoyi.app.service.ITbFamilyMemberService;
+
+/**
+ * 家族成员Service业务层处理
+ *
+ * @author Alex
+ * @date 2020-09-29
+ */
+@Service
+public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper, TbFamilyMember> implements ITbFamilyMemberService {
+
+}

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

@@ -9,7 +9,7 @@ import com.ruoyi.app.service.ITbFamilyService;
 /**
  * 家族Service业务层处理
  *
- * @author ruoyi
+ * @author Alex
  * @date 2020-09-28
  */
 @Service

ruoyi-system/src/main/resources/mapper/app/TbAppUserMapper.xml

@@ -3,11 +3,10 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.app.mapper.TbAppUserMapper">
-    
+
     <resultMap type="TbAppUser" id="TbAppUserResult">
         <result property="id"    column="id"    />
         <result property="joins"    column="joins"    />
-        <result property="familyId"    column="family_id"    />
         <result property="templateId"    column="template_id"    />
         <result property="nickName"    column="nick_name"    />
         <result property="avatar"    column="avatar"    />
@@ -15,6 +14,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="mobile"    column="mobile"    />
         <result property="openid"    column="openid"    />
         <result property="verCode"    column="ver_code"    />
+        <result property="enable"    column="enable"    />
+        <result property="deleted"    column="deleted"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -22,5 +23,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
     </resultMap>
 
+    <select id="selectAppMembers" resultType="com.ruoyi.app.domain.vo.AppMemberVo">
+        select a.id user_id, joins, template_id, nick_name, avatar, qrcode, mobile, openid, ver_code, a.create_by user_create_by,
+            a.create_time user_create_time, a.update_by user_update_by, a.update_time user_update_time, a.remark user_remark,
+
+            b.id member_id,family_id,admin,parent_id,spouse_id,name,birthday,gender,education,state,b.create_by member_create_by,
+            b.create_time member_create_time,b.update_by member_update_by,b.update_time member_update_time,b.remark member_remark
+        from tb_app_user a
+        left join tb_family_member b on a.id = b.app_user_id
+        where deleted = 0
+    </select>
 
 </mapper>

ruoyi-system/src/main/resources/mapper/app/TbFamilyMemberMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.app.mapper.TbFamilyMemberMapper">
+    
+    <resultMap type="TbFamilyMember" id="TbFamilyMemberResult">
+        <result property="id"    column="id"    />
+        <result property="appUserId"    column="app_user_id"    />
+        <result property="familyId"    column="family_id"    />
+        <result property="admin"    column="admin"    />
+        <result property="parentId"    column="parent_id"    />
+        <result property="spouseId"    column="spouse_id"    />
+        <result property="name"    column="name"    />
+        <result property="birthday"    column="birthday"    />
+        <result property="gender"    column="gender"    />
+        <result property="education"    column="education"    />
+        <result property="state"    column="state"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+
+</mapper>