1.初始化版本，2.引入thirdpart模块，引入canteen模块，初始化菜品分类，spu

pjcloud-app-server/pjcloud-app-server-api/src/main/java/com/bsd/pjcloud/app/api/dto/AppUserDTO.java

@@ -0,0 +1,30 @@
+package com.bsd.pjcloud.app.api.dto;
+
+import com.bsd.pjcloud.app.api.entity.AppUser;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@Data
+@Schema(description = "APP用户传输对象")
+@EqualsAndHashCode(callSuper = true)
+public class AppUserDTO extends AppUser {
+
+	/**
+	 * 角色ID
+	 */
+	@Schema(description = "角色id集合")
+	private List<Long> role;
+
+	/**
+	 * 新密码
+	 */
+	@Schema(description = "新密码")
+	private String newpassword1;
+
+	@Schema(description = "验证码")
+	private String mobileCode;
+
+}

pjcloud-app-server/pjcloud-app-server-api/src/main/java/com/bsd/pjcloud/app/api/dto/AppUserInfo.java

@@ -0,0 +1,54 @@
+/*
+ *
+ *      Copyright (c) 2018-2025, pjcloud All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the pig4cloud.com developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: pjcloud
+ *
+ */
+
+package com.bsd.pjcloud.app.api.dto;
+
+import com.bsd.pjcloud.app.api.entity.AppUser;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author pjcloud
+ * @date 2017/11/11
+ */
+@Data
+@Schema(description = "用户信息")
+public class AppUserInfo implements Serializable {
+
+	/**
+	 * 用户基本信息
+	 */
+	@Schema(description = "用户基本信息")
+	private AppUser appUser;
+
+	/**
+	 * 权限标识集合
+	 */
+	@Schema(description = "权限标识集合")
+	private String[] permissions;
+
+	/**
+	 * 角色集合
+	 */
+	@Schema(description = "角色标识集合")
+	private Long[] roles;
+
+}

pjcloud-app-server/pjcloud-app-server-api/src/main/java/com/bsd/pjcloud/app/api/entity/AppArticleCategoryEntity.java

@@ -0,0 +1,86 @@
+package com.bsd.pjcloud.app.api.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.bsd.pjcloud.common.core.util.TenantTable;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * 文章分类表
+ *
+ * @author pig
+ * @date 2023-06-07 16:28:03
+ */
+@Data
+@TenantTable
+@TableName("app_article_category")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "文章分类表")
+public class AppArticleCategoryEntity extends Model<AppArticleCategoryEntity> {
+
+	/**
+	 * 主键
+	 */
+	@TableId(type = IdType.ASSIGN_ID)
+	@Schema(description = "主键")
+	private Long id;
+
+	/**
+	 * 名称
+	 */
+	@Schema(description = "名称")
+	private String name;
+
+	/**
+	 * 排序
+	 */
+	@Schema(description = "排序")
+	private Integer sort;
+
+	/**
+	 * 是否显示: 0=否, 1=是
+	 */
+	@Schema(description = "是否显示: 0=否, 1=是")
+	private Integer isShow;
+
+	/**
+	 * 创建人
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	@Schema(description = "创建人")
+	private String createBy;
+
+	/**
+	 * 创建时间
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	@Schema(description = "创建时间")
+	private LocalDateTime createTime;
+
+	/**
+	 * 更新人
+	 */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	@Schema(description = "更新人")
+	private String updateBy;
+
+	/**
+	 * 更新时间
+	 */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	@Schema(description = "更新时间")
+	private LocalDateTime updateTime;
+
+	/**
+	 * 是否删除: 0=否, 1=是
+	 */
+	@TableLogic
+	@TableField(fill = FieldFill.INSERT)
+	@Schema(description = "是否删除: 0=否, 1=是")
+	private String delFlag;
+
+}

pjcloud-app-server/pjcloud-app-server-api/src/main/java/com/bsd/pjcloud/app/api/entity/AppArticleCollectEntity.java

@@ -0,0 +1,86 @@
+package com.bsd.pjcloud.app.api.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.bsd.pjcloud.common.core.util.TenantTable;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * 文章收藏表
+ *
+ * @author pig
+ * @date 2023-06-16 14:33:41
+ */
+@Data
+@TenantTable
+@TableName("app_article_collect")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "文章收藏表")
+public class AppArticleCollectEntity extends Model<AppArticleCollectEntity> {
+
+	/**
+	 * 主键
+	 */
+	@TableId(type = IdType.ASSIGN_ID)
+	@Schema(description = "主键")
+	private Long id;
+
+	/**
+	 * 用户ID
+	 */
+	@Schema(description = "用户ID")
+	private Long userId;
+
+	/**
+	 * 文章ID
+	 */
+	@Schema(description = "文章ID")
+	private Long articleId;
+
+	/**
+	 * 文章标题
+	 */
+	@TableField(exist = false)
+	private String title;
+
+	/**
+	 * 创建人
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	@Schema(description = "创建人")
+	private String createBy;
+
+	/**
+	 * 创建时间
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	@Schema(description = "创建时间")
+	private LocalDateTime createTime;
+
+	/**
+	 * 更新人
+	 */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	@Schema(description = "更新人")
+	private String updateBy;
+
+	/**
+	 * 更新时间
+	 */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	@Schema(description = "更新时间")
+	private LocalDateTime updateTime;
+
+	/**
+	 * 是否删除
+	 */
+	@TableLogic
+	@TableField(fill = FieldFill.INSERT)
+	@Schema(description = "是否删除")
+	private String delFlag;
+
+}

pjcloud-app-server/pjcloud-app-server-api/src/main/java/com/bsd/pjcloud/app/api/entity/AppArticleEntity.java

@@ -0,0 +1,136 @@
+package com.bsd.pjcloud.app.api.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.bsd.pjcloud.common.core.util.TenantTable;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.FieldNameConstants;
+
+import java.time.LocalDateTime;
+
+/**
+ * 文章资讯
+ *
+ * @author pig
+ * @date 2023-06-07 16:32:35
+ */
+@Data
+@TenantTable
+@FieldNameConstants
+@TableName("app_article")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "文章资讯")
+public class AppArticleEntity extends Model<AppArticleEntity> {
+
+	/**
+	 * 主键
+	 */
+	@TableId(type = IdType.ASSIGN_ID)
+	@Schema(description = "主键")
+	private Long id;
+
+	/**
+	 * 分类
+	 */
+	@Schema(description = "分类")
+	private Long cid;
+
+	/**
+	 * 标题
+	 */
+	@Schema(description = "标题")
+	private String title;
+
+	/**
+	 * 简介
+	 */
+	@Schema(description = "简介")
+	private String intro;
+
+	/**
+	 * 摘要
+	 */
+	@Schema(description = "摘要")
+	private String summary;
+
+	/**
+	 * 封面
+	 */
+	@Schema(description = "封面")
+	private String image;
+
+	/**
+	 * 内容
+	 */
+	@Schema(description = "内容")
+	private String content;
+
+	/**
+	 * 作者
+	 */
+	@Schema(description = "作者")
+	private String author;
+
+	/**
+	 * 浏览
+	 */
+	@Schema(description = "浏览")
+	private Integer visit;
+
+	/**
+	 * 排序
+	 */
+	@Schema(description = "排序")
+	private Integer sort;
+
+	/**
+	 * 创建人
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	@Schema(description = "创建人")
+	private String createBy;
+
+	/**
+	 * 创建时间
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	@Schema(description = "创建时间")
+	private LocalDateTime createTime;
+
+	/**
+	 * 更新人
+	 */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	@Schema(description = "更新人")
+	private String updateBy;
+
+	/**
+	 * 更新时间
+	 */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	@Schema(description = "更新时间")
+	private LocalDateTime updateTime;
+
+	/**
+	 * 删除时间
+	 */
+	@TableLogic
+	@TableField(fill = FieldFill.INSERT)
+	@Schema(description = "删除标志")
+	private String delFlag;
+
+	/**
+	 * 当前用户是否已收藏
+	 */
+	@TableField(exist = false)
+	private boolean collect;
+
+	/**
+	 * 分类名称
+	 */
+	@TableField(exist = false)
+	private String cname;
+
+}

pjcloud-app-server/pjcloud-app-server-api/src/main/java/com/bsd/pjcloud/app/api/entity/AppPageEntity.java

@@ -0,0 +1,86 @@
+package com.bsd.pjcloud.app.api.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.bsd.pjcloud.common.core.util.TenantTable;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * 页面
+ *
+ * @author pjcloud
+ * @date 2023-06-08 11:19:23
+ */
+@Data
+@TenantTable
+@TableName("app_page")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "页面")
+public class AppPageEntity extends Model<AppPageEntity> {
+
+	/**
+	 * 主键
+	 */
+	@TableId(type = IdType.ASSIGN_ID)
+	@Schema(description = "主键")
+	private Long id;
+
+	/**
+	 * 页面类型
+	 */
+	@Schema(description = "页面类型")
+	private Integer pageType;
+
+	/**
+	 * 页面名称
+	 */
+	@Schema(description = "页面名称")
+	private String pageName;
+
+	/**
+	 * 页面数据
+	 */
+	@Schema(description = "页面数据")
+	private String pageData;
+
+	/**
+	 * 创建人
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	@Schema(description = "创建人")
+	private String createBy;
+
+	/**
+	 * 创建时间
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	@Schema(description = "创建时间")
+	private LocalDateTime createTime;
+
+	/**
+	 * 修改人
+	 */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	@Schema(description = "修改人")
+	private String updateBy;
+
+	/**
+	 * 修改时间
+	 */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	@Schema(description = "修改时间")
+	private LocalDateTime updateTime;
+
+	/**
+	 * 删除标记
+	 */
+	@TableLogic
+	@TableField(fill = FieldFill.INSERT)
+	@Schema(description = "删除标记")
+	private String delFlag;
+
+}

pjcloud-app-server/pjcloud-app-server-api/src/main/java/com/bsd/pjcloud/app/api/entity/AppRole.java

@@ -0,0 +1,107 @@
+/*
+ *    Copyright (c) 2018-2025, pjcloud All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the pig4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: pjcloud
+ */
+
+package com.bsd.pjcloud.app.api.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.bsd.pjcloud.common.core.util.TenantTable;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * app角色表
+ *
+ * @author aeizzz
+ * @date 2022-12-07 09:52:03
+ */
+@Data
+@TenantTable
+@TableName("app_role")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "app角色表")
+public class AppRole extends Model<AppRole> {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * roleId
+	 */
+	@TableId(type = IdType.ASSIGN_ID)
+	@Schema(description = "roleId")
+	private Long roleId;
+
+	/**
+	 * roleName
+	 */
+	@Schema(description = "roleName")
+	private String roleName;
+
+	/**
+	 * roleCode
+	 */
+	@Schema(description = "roleCode")
+	private String roleCode;
+
+	/**
+	 * roleDesc
+	 */
+	@Schema(description = "roleDesc")
+	private String roleDesc;
+
+	/**
+	 * 创建人
+	 */
+	@Schema(description = "创建人")
+	private String createBy;
+
+	/**
+	 * 修改人
+	 */
+	@Schema(description = "修改人")
+	private String updateBy;
+
+	/**
+	 * createTime
+	 */
+	@Schema(description = "createTime")
+	private LocalDateTime createTime;
+
+	/**
+	 * updateTime
+	 */
+	@Schema(description = "updateTime")
+	private LocalDateTime updateTime;
+
+	/**
+	 * delFlag
+	 */
+	@Schema(description = "delFlag")
+	private String delFlag;
+
+	/**
+	 * tenantId
+	 */
+	@Schema(description = "tenantId", hidden = true)
+	private Long tenantId;
+
+}

pjcloud-app-server/pjcloud-app-server-api/src/main/java/com/bsd/pjcloud/app/api/entity/AppSocialDetails.java

@@ -0,0 +1,125 @@
+/*
+ *    Copyright (c) 2018-2025, pjcloud All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the pig4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: pjcloud
+ */
+
+package com.bsd.pjcloud.app.api.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.bsd.pjcloud.common.core.util.ValidGroup;
+import com.bsd.pjcloud.common.sensitive.annotation.Sensitive;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * app 社交账号登录
+ */
+@Data
+@Schema(description = "第三方账号信息")
+@EqualsAndHashCode(callSuper = true)
+public class AppSocialDetails extends Model<AppSocialDetails> {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主鍵
+	 */
+	@TableId(type = IdType.ASSIGN_ID)
+	@Schema(description = "主键")
+	private Long id;
+
+	/**
+	 * 类型
+	 */
+	@NotBlank(message = "类型不能为空")
+	@Schema(description = "账号类型")
+	private String type;
+
+	/**
+	 * 描述
+	 */
+	@Schema(description = "描述")
+	private String remark;
+
+	/**
+	 * appid
+	 */
+	@Sensitive(prefixNoMaskLen = 4, suffixNoMaskLen = 4)
+	@NotBlank(message = "账号不能为空")
+	@Schema(description = "appId")
+	private String appId;
+
+	/**
+	 * app_secret
+	 */
+	@Sensitive(prefixNoMaskLen = 4, suffixNoMaskLen = 4)
+	@NotBlank(message = "密钥不能为空", groups = { ValidGroup.Insert.class })
+	@Schema(description = "app secret")
+	private String appSecret;
+
+	/**
+	 * 回调地址
+	 */
+	@Schema(description = "回调地址")
+	private String redirectUrl;
+
+	/**
+	 * 拓展字段
+	 */
+	@Schema(description = "拓展字段")
+	private String ext;
+
+	/**
+	 * 创建人
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	@Schema(description = "创建人")
+	private String createBy;
+
+	/**
+	 * 修改人
+	 */
+	@TableField(fill = FieldFill.UPDATE)
+	@Schema(description = "修改人")
+	private String updateBy;
+
+	/**
+	 * 创建时间
+	 */
+	@Schema(description = "创建时间")
+	@TableField(fill = FieldFill.INSERT)
+	private LocalDateTime createTime;
+
+	/**
+	 * 更新时间
+	 */
+	@Schema(description = "更新时间")
+	@TableField(fill = FieldFill.UPDATE)
+	private LocalDateTime updateTime;
+
+	/**
+	 * 删除标记
+	 */
+	@TableLogic
+	@TableField(fill = FieldFill.INSERT)
+	@Schema(description = "删除标记,1:已删除,0:正常")
+	private String delFlag;
+
+}

pjcloud-app-server/pjcloud-app-server-api/src/main/java/com/bsd/pjcloud/app/api/entity/AppTabbarEntity.java

@@ -0,0 +1,96 @@
+package com.bsd.pjcloud.app.api.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonRawValue;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.bsd.pjcloud.common.core.util.TenantTable;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * 导航栏
+ *
+ * @author pjcloud
+ * @date 2023-06-08 11:18:46
+ */
+@Data
+@TenantTable
+@TableName("app_tabbar")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "导航栏")
+public class AppTabbarEntity extends Model<AppTabbarEntity> {
+
+	/**
+	 * 主键
+	 */
+	@TableId(type = IdType.ASSIGN_ID)
+	@Schema(description = "主键")
+	private Long id;
+
+	/**
+	 * 导航名称
+	 */
+	@Schema(description = "导航名称")
+	private String name;
+
+	/**
+	 * 未选图标
+	 */
+	@Schema(description = "未选图标")
+	private String selected;
+
+	/**
+	 * 已选图标
+	 */
+	@Schema(description = "已选图标")
+	private String unselected;
+
+	/**
+	 * 链接地址
+	 */
+	@Schema(description = "链接地址")
+	@JsonRawValue
+	@JsonDeserialize()
+	private String link;
+
+	/**
+	 * 创建人
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	@Schema(description = "创建人")
+	private String createBy;
+
+	/**
+	 * 创建时间
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	@Schema(description = "创建时间")
+	private LocalDateTime createTime;
+
+	/**
+	 * 更新人
+	 */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	@Schema(description = "更新人")
+	private String updateBy;
+
+	/**
+	 * 更新时间
+	 */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	@Schema(description = "更新时间")
+	private LocalDateTime updateTime;
+
+	/**
+	 * 删除标记
+	 */
+	@TableLogic
+	@TableField(fill = FieldFill.INSERT)
+	@Schema(description = "删除标记")
+	private String delFlag;
+
+}

pjcloud-app-server/pjcloud-app-server-api/src/main/java/com/bsd/pjcloud/app/api/entity/AppUser.java

@@ -0,0 +1,161 @@
+/*
+ *    Copyright (c) 2018-2025, pjcloud All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the pig4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: pjcloud
+ */
+
+package com.bsd.pjcloud.app.api.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.bsd.pjcloud.common.core.util.TenantTable;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * app用户表
+ *
+ * @author aeizzz
+ * @date 2022-12-07 09:52:03
+ */
+@Data
+@TenantTable
+@TableName("app_user")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "app用户表")
+public class AppUser extends Model<AppUser> {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * userId
+	 */
+	@TableId(type = IdType.ASSIGN_ID)
+	@Schema(description = "userId")
+	private Long userId;
+
+	/**
+	 * 用户名
+	 */
+	@Schema(description = "用户名")
+	private String username;
+
+	/**
+	 * 密码
+	 */
+	@Schema(description = "密码")
+	private String password;
+
+	/**
+	 * 随机盐
+	 */
+	@JsonIgnore
+	@Schema(description = "随机盐")
+	private String salt;
+
+	/**
+	 * 手机号
+	 */
+	@Schema(description = "手机号")
+	private String phone;
+
+	/**
+	 * 头像
+	 */
+	@Schema(description = "头像")
+	private String avatar;
+
+	/**
+	 * 昵称
+	 */
+	@Schema(description = "拓展字段:昵称")
+	private String nickname;
+
+	/**
+	 * 姓名
+	 */
+	@Schema(description = "拓展字段:姓名")
+	private String name;
+
+	/**
+	 * 邮箱
+	 */
+	@Schema(description = "拓展字段:邮箱")
+	private String email;
+
+	/**
+	 * 创建人
+	 */
+	@Schema(description = "创建人")
+	@TableField(fill = FieldFill.INSERT)
+	private String createBy;
+
+	/**
+	 * 修改人
+	 */
+	@Schema(description = "修改人")
+	@TableField(fill = FieldFill.UPDATE)
+	private String updateBy;
+
+	/**
+	 * 创建时间
+	 */
+	@Schema(description = "创建时间")
+	@TableField(fill = FieldFill.INSERT)
+	private LocalDateTime createTime;
+
+	/**
+	 * 修改时间
+	 */
+	@Schema(description = "修改时间")
+	@TableField(fill = FieldFill.UPDATE)
+	private LocalDateTime updateTime;
+
+	/**
+	 * 删除标记
+	 */
+	@Schema(description = "删除标记,1:已删除,0:正常")
+	@TableField(fill = FieldFill.INSERT)
+	@TableLogic
+	private String delFlag;
+
+	/**
+	 * 所属租户
+	 */
+	@Schema(description = "所属租户", hidden = true)
+	private Long tenantId;
+
+	/**
+	 * 最后一次密码修改时间
+	 */
+	@Schema(description = "最后一次密码修改时间")
+	private LocalDateTime lastModifiedTime;
+
+	/**
+	 * 锁定标记
+	 */
+	@Schema(description = "锁定标记")
+	private String lockFlag;
+
+	/**
+	 * 微信小程序登录openId
+	 */
+	@Schema(description = "微信小程序登录openId")
+	private String wxOpenid;
+
+}

pjcloud-app-server/pjcloud-app-server-api/src/main/java/com/bsd/pjcloud/app/api/entity/AppUserRole.java

@@ -0,0 +1,55 @@
+/*
+ *    Copyright (c) 2018-2025, pjcloud All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the pig4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: pjcloud
+ */
+
+package com.bsd.pjcloud.app.api.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 用户角色表
+ *
+ * @author aeizzz
+ * @date 2022-12-07 09:52:03
+ */
+@Data
+@TableName("app_user_role")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "用户角色表")
+public class AppUserRole extends Model<AppUserRole> {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 用户ID
+	 */
+	@TableId(type = IdType.ASSIGN_ID)
+	@Schema(description = "用户ID")
+	private Long userId;
+
+	/**
+	 * 角色ID
+	 */
+	@Schema(description = "角色ID")
+	private Long roleId;
+
+}

pjcloud-app-server/pjcloud-app-server-api/src/main/java/com/bsd/pjcloud/app/api/feign/RemoteAppUserService.java

@@ -0,0 +1,58 @@
+/*
+ *
+ *      Copyright (c) 2018-2025, pjcloud All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the pig4cloud.com developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: pjcloud
+ *
+ */
+
+package com.bsd.pjcloud.app.api.feign;
+
+import com.bsd.pjcloud.app.api.dto.AppUserInfo;
+import com.bsd.pjcloud.common.core.constant.ServiceNameConstants;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.feign.annotation.NoToken;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+/**
+ * @author pjcloud
+ * @date 2018/6/22
+ */
+@FeignClient(contextId = "remoteAppUserService", value = ServiceNameConstants.APP_SERVER)
+public interface RemoteAppUserService {
+
+	/**
+	 * 通过用户名查询用户、角色信息
+	 * @param username 用户名
+	 * @param from 调用标志
+	 * @return R
+	 */
+	@NoToken
+	@GetMapping("/appuser/info/{username}")
+	R<AppUserInfo> info(@PathVariable("username") String username);
+
+	/**
+	 * 通过社交账号或手机号查询用户、角色信息
+	 * @param inStr appid@code
+	 * @param from 调用标志
+	 * @return
+	 */
+	@NoToken
+	@GetMapping("/appsocial/info/{inStr}")
+	R<AppUserInfo> social(@PathVariable("inStr") String inStr);
+
+
+}

pjcloud-app-server/pjcloud-app-server-api/src/main/java/com/bsd/pjcloud/app/api/vo/AppRoleExcelVO.java

@@ -0,0 +1,61 @@
+/*
+ *    Copyright (c) 2018-2025, pjcloud All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the pig4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: pjcloud
+ */
+
+package com.bsd.pjcloud.app.api.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.bsd.pjcloud.common.excel.annotation.ExcelLine;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author pjcloud
+ * @date 2020/2/10
+ */
+@Data
+@Schema(description = "前端角色展示对象")
+@ColumnWidth(30)
+public class AppRoleExcelVO {
+
+	/**
+	 * 导入时候回显行号
+	 */
+	@ExcelLine
+	@ExcelIgnore
+	private Long lineNum;
+
+	/**
+	 * roleName
+	 */
+	@ExcelProperty("角色名称")
+	private String roleName;
+
+	/**
+	 * roleCode
+	 */
+	@ExcelProperty("角色标识")
+	private String roleCode;
+
+	/**
+	 * roleDesc
+	 */
+	@ExcelProperty("角色描述")
+	private String roleDesc;
+
+}

pjcloud-app-server/pjcloud-app-server-api/src/main/java/com/bsd/pjcloud/app/api/vo/AppRoleVO.java

@@ -0,0 +1,41 @@
+/*
+ *    Copyright (c) 2018-2025, pjcloud All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the pig4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: pjcloud
+ */
+
+package com.bsd.pjcloud.app.api.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author pjcloud
+ * @date 2020/2/10
+ */
+@Data
+@Schema(description = "前端角色展示对象")
+public class AppRoleVO {
+
+	/**
+	 * 角色id
+	 */
+	private Long roleId;
+
+	/**
+	 * 菜单列表
+	 */
+	private String menuIds;
+
+}

pjcloud-app-server/pjcloud-app-server-api/src/main/java/com/bsd/pjcloud/app/api/vo/AppUserExcelVO.java

@@ -0,0 +1,83 @@
+package com.bsd.pjcloud.app.api.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.bsd.pjcloud.common.excel.annotation.ExcelLine;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@ColumnWidth(30)
+public class AppUserExcelVO {
+
+	/**
+	 * 导入时候回显行号
+	 */
+	@ExcelLine
+	@ExcelIgnore
+	private Long lineNum;
+
+	/**
+	 * 主键ID
+	 */
+	@ExcelProperty("用户编号")
+	private Long userId;
+
+	/**
+	 * 用户名
+	 */
+	@NotBlank(message = "用户名不能为空")
+	@ExcelProperty("用户名")
+	private String username;
+
+	/**
+	 * 手机号
+	 */
+	@NotBlank(message = "手机号不能为空")
+	@ExcelProperty("手机号")
+	private String phone;
+
+	/**
+	 * 手机号
+	 */
+	@NotBlank(message = "昵称不能为空")
+	@ExcelProperty("昵称")
+	private String nickname;
+
+	/**
+	 * 手机号
+	 */
+	@NotBlank(message = "姓名不能为空")
+	@ExcelProperty("姓名")
+	private String name;
+
+	/**
+	 * 手机号
+	 */
+	@NotBlank(message = "邮箱不能为空")
+	@ExcelProperty("邮箱")
+	private String email;
+
+	/**
+	 * 角色列表
+	 */
+	@NotBlank(message = "角色不能为空")
+	@ExcelProperty("角色")
+	private String roleNameList;
+
+	/**
+	 * 锁定标记
+	 */
+	@ExcelProperty("锁定标记,0:正常,9:已锁定")
+	private String lockFlag;
+
+	/**
+	 * 创建时间
+	 */
+	@ExcelProperty(value = "创建时间")
+	private LocalDateTime createTime;
+
+}

pjcloud-app-server/pjcloud-app-server-api/src/main/java/com/bsd/pjcloud/app/api/vo/AppUserVO.java

@@ -0,0 +1,101 @@
+package com.bsd.pjcloud.app.api.vo;
+
+import com.bsd.pjcloud.app.api.entity.AppRole;
+import com.bsd.pjcloud.common.sensitive.annotation.Sensitive;
+import com.bsd.pjcloud.common.sensitive.core.SensitiveTypeEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+public class AppUserVO implements Serializable {
+
+	/**
+	 * 主键
+	 */
+	@Schema(description = "主键")
+	private Long userId;
+
+	/**
+	 * 用户名
+	 */
+	@Schema(description = "用户名")
+	private String username;
+
+	/**
+	 * 密码
+	 */
+	@Schema(description = "密码")
+	private String password;
+
+	/**
+	 * 手机号
+	 */
+	@Schema(description = "手机号")
+	@Sensitive(type = SensitiveTypeEnum.MOBILE_PHONE)
+	private String phone;
+
+	/**
+	 * 头像
+	 */
+	@Schema(description = "头像")
+	private String avatar;
+
+	/**
+	 * 昵称
+	 */
+	@Schema(description = "拓展字段:昵称")
+	private String nickname;
+
+	/**
+	 * 姓名
+	 */
+	@Schema(description = "拓展字段:姓名")
+	private String name;
+
+	/**
+	 * 邮箱
+	 */
+	@Schema(description = "拓展字段:邮箱")
+	private String email;
+
+	/**
+	 * 创建时间
+	 */
+	@Schema(description = "创建时间")
+	private LocalDateTime createTime;
+
+	/**
+	 * 删除标记
+	 */
+	@Schema(description = "删除标记,1:已删除,0:正常")
+	private String delFlag;
+
+	/**
+	 * 所属租户
+	 */
+	@Schema(description = "所属租户")
+	private Long tenantId;
+
+	/**
+	 * 最后一次密码修改时间
+	 */
+	@Schema(description = "最后一次密码修改时间")
+	private LocalDateTime lastModifiedTime;
+
+	/**
+	 * 锁定标记
+	 */
+	@Schema(description = "锁定标记")
+	private String lockFlag;
+
+	/**
+	 * 角色列表
+	 */
+	@Schema(description = "拥有的角色列表")
+	private List<AppRole> roleList;
+
+}

pjcloud-app-server/pjcloud-app-server-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports

@@ -0,0 +1 @@
+com.bsd.pjcloud.app.api.feign.RemoteAppUserService