✨ Introducing new features. 重构 app 模块增加移动端发布

pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/dto/AppUserDTO.java

@@ -12,16 +12,19 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class AppUserDTO extends AppUser {
 
-	/**
-	 * 角色ID
-	 */
-	@Schema(description = "角色id集合")
-	private List<Long> role;
+    /**
+     * 角色ID
+     */
+    @Schema(description = "角色id集合")
+    private List<Long> role;
 
-	/**
-	 * 新密码
-	 */
-	@Schema(description = "新密码")
-	private String newpassword1;
+    /**
+     * 新密码
+     */
+    @Schema(description = "新密码")
+    private String newpassword1;
+
+    @Schema(description = "验证码")
+    private String mobileCode;
 
 }

pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppArticleCategoryEntity.java

@@ -0,0 +1,84 @@
+package com.pig4cloud.pigx.app.api.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+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
+@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;
+
+}

pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppArticleCollectEntity.java

@@ -0,0 +1,84 @@
+package com.pig4cloud.pigx.app.api.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+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
+@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;
+}

pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppArticleEntity.java

@@ -0,0 +1,125 @@
+package com.pig4cloud.pigx.app.api.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+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:32:35
+ */
+@Data
+@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;
+}

pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppMenu.java

@@ -1,129 +0,0 @@
-/*
- *    Copyright (c) 2018-2025, lengleng 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: lengleng (wangiegie@gmail.com)
- */
-
-package com.pig4cloud.pigx.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;
-
-import java.time.LocalDateTime;
-
-/**
- * 菜单权限表
- *
- * @author aeizzz
- * @date 2022-12-07 09:52:03
- */
-@Data
-@TableName("app_menu")
-@EqualsAndHashCode(callSuper = true)
-@Schema(description = "菜单权限表")
-public class AppMenu extends Model<AppMenu> {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * 菜单ID
-	 */
-	@TableId(type = IdType.ASSIGN_ID)
-	@Schema(description = "菜单ID")
-	private Long menuId;
-
-	/**
-	 * name
-	 */
-	@Schema(description = "name")
-	private String name;
-
-	/**
-	 * permission
-	 */
-	@Schema(description = "permission")
-	private String permission;
-
-	/**
-	 * path
-	 */
-	@Schema(description = "path")
-	private String path;
-
-	/**
-	 * 父菜单ID
-	 */
-	@Schema(description = "父菜单ID")
-	private Long parentId;
-
-	/**
-	 * 是否显示
-	 */
-	@Schema(description = "是否显示")
-	private String visible;
-
-	/**
-	 * 排序值
-	 */
-	@Schema(description = "排序值")
-	private Integer sortOrder;
-
-	/**
-	 * menuType
-	 */
-	@Schema(description = "menuType")
-	private String menuType;
-
-	/**
-	 * 创建人
-	 */
-	@Schema(description = "创建人")
-	private String createBy;
-
-	/**
-	 * 创建时间
-	 */
-	@Schema(description = "创建时间")
-	private LocalDateTime createTime;
-
-	/**
-	 * 修改人
-	 */
-	@Schema(description = "修改人")
-	private String updateBy;
-
-	/**
-	 * 更新时间
-	 */
-	@Schema(description = "更新时间")
-	private LocalDateTime updateTime;
-
-	/**
-	 * delFlag
-	 */
-	@Schema(description = "delFlag")
-	private String delFlag;
-
-	/**
-	 * 租户ID
-	 */
-	@Schema(description = "租户ID", hidden = true)
-	private Long tenantId;
-
-}

pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppPageEntity.java

@@ -0,0 +1,83 @@
+package com.pig4cloud.pigx.app.api.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.time.LocalDateTime;
+
+/**
+ * 页面
+ *
+ * @author lengleng
+ * @date 2023-06-08 11:19:23
+ */
+@Data
+@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;
+
+}

pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppRoleMenu.java

@@ -1,55 +0,0 @@
-/*
- *    Copyright (c) 2018-2025, lengleng 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: lengleng (wangiegie@gmail.com)
- */
-
-package com.pig4cloud.pigx.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_role_menu")
-@EqualsAndHashCode(callSuper = true)
-@Schema(description = "角色菜单表")
-public class AppRoleMenu extends Model<AppRoleMenu> {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * 角色ID
-	 */
-	@TableId(type = IdType.ASSIGN_ID)
-	@Schema(description = "角色ID")
-	private Long roleId;
-
-	/**
-	 * 菜单ID
-	 */
-	@Schema(description = "菜单ID")
-	private Long menuId;
-
-}

pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppTabbarEntity.java

@@ -0,0 +1,94 @@
+package com.pig4cloud.pigx.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 io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * 导航栏
+ *
+ * @author lengleng
+ * @date 2023-06-08 11:18:46
+ */
+@Data
+@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;
+
+}