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

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/PjcloudAppApplication.java

@@ -0,0 +1,26 @@
+package com.bsd.pjcloud.app;
+
+import com.bsd.pjcloud.common.feign.annotation.EnablePjcloudFeignClients;
+import com.bsd.pjcloud.common.security.annotation.EnablePjcloudResourceServer;
+import com.bsd.pjcloud.common.swagger.annotation.EnableOpenApi;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+
+/**
+ * @author pjcloud archetype
+ * <p>
+ * 项目启动类
+ */
+@EnableOpenApi("app")
+@EnablePjcloudFeignClients
+@EnableDiscoveryClient
+@EnablePjcloudResourceServer
+@SpringBootApplication
+public class PjcloudAppApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(PjcloudAppApplication.class, args);
+	}
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppArticleCategoryController.java

@@ -0,0 +1,131 @@
+package com.bsd.pjcloud.app.controller;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.app.api.entity.AppArticleCategoryEntity;
+import com.bsd.pjcloud.app.service.AppArticleCategoryService;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
+import com.bsd.pjcloud.common.log.annotation.SysLog;
+import com.bsd.pjcloud.common.security.annotation.HasPermission;
+import com.bsd.pjcloud.common.security.annotation.Inner;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 文章分类表
+ *
+ * @author pig
+ * @date 2023-06-07 16:28:03
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/appArticleCategory")
+@Tag(description = "appArticleCategory", name = "文章分类表管理")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class AppArticleCategoryController {
+
+	private final AppArticleCategoryService appArticleCategoryService;
+
+	/**
+	 * 分页查询
+	 * @param page 分页对象
+	 * @param appArticleCategory 文章分类表
+	 * @return
+	 */
+	@Operation(summary = "分页查询", description = "分页查询")
+	@GetMapping("/page")
+	@HasPermission("app_appArticleCategory_view")
+	public R getAppArticleCategoryPage(@ParameterObject Page page,
+			@ParameterObject AppArticleCategoryEntity appArticleCategory) {
+		LambdaQueryWrapper<AppArticleCategoryEntity> wrapper = Wrappers.lambdaQuery();
+		wrapper.like(StrUtil.isNotBlank(appArticleCategory.getName()), AppArticleCategoryEntity::getName,
+				appArticleCategory.getName());
+		return R.ok(appArticleCategoryService.page(page, wrapper));
+	}
+
+	/**
+	 * 通过id查询文章分类表
+	 * @param id id
+	 * @return R
+	 */
+	@Operation(summary = "通过id查询", description = "通过id查询")
+	@GetMapping("/{id}")
+	@HasPermission("app_appArticleCategory_view")
+	public R getById(@PathVariable("id") Long id) {
+		return R.ok(appArticleCategoryService.getById(id));
+	}
+
+	/**
+	 * 通过查询文章分类
+	 * @return R
+	 */
+	@Operation(summary = "查询文章分类", description = "查询文章分类")
+	@Inner(value = false)
+	@GetMapping("/list")
+	public R list() {
+		return R.ok(appArticleCategoryService.list());
+	}
+
+	/**
+	 * 新增文章分类表
+	 * @param appArticleCategory 文章分类表
+	 * @return R
+	 */
+	@Operation(summary = "新增文章分类表", description = "新增文章分类表")
+	@SysLog("新增文章分类表")
+	@PostMapping
+	@HasPermission("app_appArticleCategory_add")
+	public R save(@RequestBody AppArticleCategoryEntity appArticleCategory) {
+		return R.ok(appArticleCategoryService.save(appArticleCategory));
+	}
+
+	/**
+	 * 修改文章分类表
+	 * @param appArticleCategory 文章分类表
+	 * @return R
+	 */
+	@Operation(summary = "修改文章分类表", description = "修改文章分类表")
+	@SysLog("修改文章分类表")
+	@PutMapping
+	@HasPermission("app_appArticleCategory_edit")
+	public R updateById(@RequestBody AppArticleCategoryEntity appArticleCategory) {
+		return R.ok(appArticleCategoryService.updateById(appArticleCategory));
+	}
+
+	/**
+	 * 通过id删除文章分类表
+	 * @param ids id列表
+	 * @return R
+	 */
+	@Operation(summary = "通过id删除文章分类表", description = "通过id删除文章分类表")
+	@SysLog("通过id删除文章分类表")
+	@DeleteMapping
+	@HasPermission("app_appArticleCategory_del")
+	public R removeById(@RequestBody Long[] ids) {
+		return R.ok(appArticleCategoryService.removeBatchByIds(CollUtil.toList(ids)));
+	}
+
+	/**
+	 * 导出excel 表格
+	 * @param appArticleCategory 查询条件
+	 * @return excel 文件流
+	 */
+	@ResponseExcel
+	@GetMapping("/export")
+	@HasPermission("app_appArticleCategory_export")
+	public List<AppArticleCategoryEntity> export(AppArticleCategoryEntity appArticleCategory) {
+		return appArticleCategoryService.list(Wrappers.query(appArticleCategory));
+	}
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppArticleCollectController.java

@@ -0,0 +1,126 @@
+package com.bsd.pjcloud.app.controller;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.bsd.pjcloud.app.api.entity.AppArticleCollectEntity;
+import com.bsd.pjcloud.app.api.entity.AppArticleEntity;
+import com.bsd.pjcloud.app.service.AppArticleCollectService;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
+import com.bsd.pjcloud.common.log.annotation.SysLog;
+import com.bsd.pjcloud.common.security.annotation.HasPermission;
+import com.bsd.pjcloud.common.security.util.SecurityUtils;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 文章收藏表
+ *
+ * @author pig
+ * @date 2023-06-16 14:33:41
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/collect")
+@Tag(description = "collect", name = "文章收藏表管理")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class AppArticleCollectController {
+
+	private final AppArticleCollectService appArticleCollectService;
+
+	/**
+	 * 分页查询
+	 * @param page 分页对象
+	 * @param appArticleCollect 文章收藏表
+	 * @return
+	 */
+	@Operation(summary = "分页查询", description = "分页查询")
+	@GetMapping("/page")
+	public R getAppArticleCollectPage(@ParameterObject Page page) {
+		MPJLambdaWrapper<AppArticleCollectEntity> wrapper = new MPJLambdaWrapper<AppArticleCollectEntity>()
+			.selectAll(AppArticleCollectEntity.class)
+			.select(AppArticleEntity::getTitle)
+			.leftJoin(AppArticleEntity.class, AppArticleEntity::getId, AppArticleCollectEntity::getArticleId)
+			.eq(AppArticleCollectEntity::getUserId, SecurityUtils.getUser().getId());
+		return R.ok(appArticleCollectService.selectJoinListPage(page, AppArticleCollectEntity.class, wrapper));
+	}
+
+	/**
+	 * 通过id查询文章收藏表
+	 * @param id id
+	 * @return R
+	 */
+	@Operation(summary = "通过id查询", description = "通过id查询")
+	@GetMapping("/{id}")
+	public R getById(@PathVariable("id") Long id) {
+		return R.ok(appArticleCollectService.getById(id));
+	}
+
+	/**
+	 * 新增文章收藏表
+	 * @param appArticleCollect 文章收藏表
+	 * @return R
+	 */
+	@Operation(summary = "新增文章收藏表", description = "新增文章收藏表")
+	@SysLog("新增文章收藏表")
+	@PostMapping
+	public R save(@RequestBody AppArticleCollectEntity appArticleCollect) {
+		return R.ok(appArticleCollectService.saveArticleCollect(appArticleCollect));
+	}
+
+	/**
+	 * 修改文章收藏表
+	 * @param appArticleCollect 文章收藏表
+	 * @return R
+	 */
+	@Operation(summary = "修改文章收藏表", description = "修改文章收藏表")
+	@SysLog("修改文章收藏表")
+	@PutMapping
+	public R updateById(@RequestBody AppArticleCollectEntity appArticleCollect) {
+		return R.ok(appArticleCollectService.updateById(appArticleCollect));
+	}
+
+	/**
+	 * 通过id删除文章收藏表
+	 * @param ids id列表
+	 * @return R
+	 */
+	@Operation(summary = "通过id删除文章收藏表", description = "通过id删除文章收藏表")
+	@SysLog("通过id删除文章收藏表")
+	@DeleteMapping
+	public R removeById(@RequestBody Long[] ids) {
+		return R.ok(appArticleCollectService.removeBatchByIds(CollUtil.toList(ids)));
+	}
+
+	@Operation(summary = "通过文章id删除文章收藏表", description = "通过文章id删除文章收藏表")
+	@SysLog("通过文章id删除文章收藏表")
+	@DeleteMapping("/{articleId}")
+	public R removeByArticleId(@PathVariable String articleId) {
+		Long id = SecurityUtils.getUser().getId();
+		return R.ok(appArticleCollectService.remove(Wrappers.<AppArticleCollectEntity>lambdaQuery()
+			.eq(AppArticleCollectEntity::getUserId, id)
+			.eq(AppArticleCollectEntity::getArticleId, articleId)));
+	}
+
+	/**
+	 * 导出excel 表格
+	 * @param appArticleCollect 查询条件
+	 * @return excel 文件流
+	 */
+	@ResponseExcel
+	@GetMapping("/export")
+	@HasPermission("app_collect_export")
+	public List<AppArticleCollectEntity> export(AppArticleCollectEntity appArticleCollect) {
+		return appArticleCollectService.list(Wrappers.query(appArticleCollect));
+	}
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppArticleController.java

@@ -0,0 +1,114 @@
+package com.bsd.pjcloud.app.controller;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.app.api.entity.AppArticleEntity;
+import com.bsd.pjcloud.app.service.AppArticleService;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
+import com.bsd.pjcloud.common.log.annotation.SysLog;
+import com.bsd.pjcloud.common.security.annotation.HasPermission;
+import com.bsd.pjcloud.common.security.annotation.Inner;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 文章资讯
+ *
+ * @author pig
+ * @date 2023-06-07 16:32:35
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/appArticle")
+@Tag(description = "appArticle", name = "文章资讯管理")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class AppArticleController {
+
+	private final AppArticleService appArticleService;
+
+	/**
+	 * 分页查询
+	 * @param page 分页对象
+	 * @param appArticle 文章资讯
+	 * @return
+	 */
+	@Operation(summary = "分页查询", description = "分页查询")
+	@Inner(value = false)
+	@GetMapping("/page")
+	public R getAppArticlePage(@ParameterObject Page page, @ParameterObject AppArticleEntity appArticle) {
+		return R.ok(appArticleService.pageAndCname(page, appArticle));
+	}
+
+	/**
+	 * 通过id查询文章资讯
+	 * @param id id
+	 * @return R
+	 */
+	@Inner(value = false)
+	@Operation(summary = "通过id查询", description = "通过id查询")
+	@GetMapping("/details/{id}/{userId}")
+	public R getById(@PathVariable("id") Long id, @PathVariable(required = false) Long userId) {
+		return R.ok(appArticleService.getArticleAndIncrById(id, userId));
+	}
+
+	/**
+	 * 新增文章资讯
+	 * @param appArticle 文章资讯
+	 * @return R
+	 */
+	@Operation(summary = "新增文章资讯", description = "新增文章资讯")
+	@SysLog("新增文章资讯")
+	@PostMapping
+	@HasPermission("app_appArticle_add")
+	public R save(@RequestBody AppArticleEntity appArticle) {
+		return R.ok(appArticleService.save(appArticle));
+	}
+
+	/**
+	 * 修改文章资讯
+	 * @param appArticle 文章资讯
+	 * @return R
+	 */
+	@Operation(summary = "修改文章资讯", description = "修改文章资讯")
+	@SysLog("修改文章资讯")
+	@PutMapping
+	@HasPermission("app_appArticle_edit")
+	public R updateById(@RequestBody AppArticleEntity appArticle) {
+		return R.ok(appArticleService.updateById(appArticle));
+	}
+
+	/**
+	 * 通过id删除文章资讯
+	 * @param ids id列表
+	 * @return R
+	 */
+	@Operation(summary = "通过id删除文章资讯", description = "通过id删除文章资讯")
+	@SysLog("通过id删除文章资讯")
+	@DeleteMapping
+	@HasPermission("app_appArticle_del")
+	public R removeById(@RequestBody Long[] ids) {
+		return R.ok(appArticleService.removeBatchByIds(CollUtil.toList(ids)));
+	}
+
+	/**
+	 * 导出excel 表格
+	 * @param appArticle 查询条件
+	 * @return excel 文件流
+	 */
+	@ResponseExcel
+	@GetMapping("/export")
+	@HasPermission("app_appArticle_export")
+	public List<AppArticleEntity> export(AppArticleEntity appArticle) {
+		return appArticleService.list(Wrappers.query(appArticle));
+	}
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppIndexController.java

@@ -0,0 +1,59 @@
+package com.bsd.pjcloud.app.controller;
+
+import com.bsd.pjcloud.app.api.entity.AppPageEntity;
+import com.bsd.pjcloud.app.service.AppIndexService;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.security.annotation.Inner;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * app 首页控制
+ *
+ * @author pjcloud
+ * @date 2023/6/8
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/index")
+@Tag(description = "App 页面控制", name = "app index")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class AppIndexController {
+
+	private final AppIndexService indexService;
+
+	/**
+	 * 首页
+	 * @return Object
+	 */
+	@Inner(value = false)
+	@GetMapping("/index")
+	public R index() {
+		Map<String, Object> detail = indexService.index();
+		return R.ok(detail);
+	}
+
+	@Inner(value = false)
+	@GetMapping("/config")
+	public R config() {
+		Map<String, Object> map = indexService.config();
+		return R.ok(map);
+	}
+
+	@Inner(value = false)
+	@GetMapping("/decorate")
+	public R decorate(@Validated @RequestParam("id") Integer id) {
+		AppPageEntity detail = indexService.decorate(id);
+		return R.ok(detail);
+	}
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppMobileController.java

@@ -0,0 +1,53 @@
+/*
+ *    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.controller;
+
+import com.bsd.pjcloud.app.service.AppMobileService;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.security.annotation.Inner;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author pjcloud
+ * @date 2018/11/14
+ * <p>
+ * 手机验证码
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/appmobile")
+@Tag(description = "mobile", name = "手机管理模块")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class AppMobileController {
+
+	private final AppMobileService appMobileService;
+
+	@Inner(value = false)
+	@GetMapping("/{mobile}")
+	public R sendSmsCode(@PathVariable String mobile) {
+		return appMobileService.sendSmsCode(mobile);
+	}
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppPageController.java

@@ -0,0 +1,54 @@
+package com.bsd.pjcloud.app.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.bsd.pjcloud.app.api.entity.AppPageEntity;
+import com.bsd.pjcloud.app.service.AppPageService;
+import com.bsd.pjcloud.common.core.util.R;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 页面管理
+ *
+ * @author pig
+ * @date 2023-06-07 16:32:35
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/appPage")
+@Tag(description = "appPage", name = "页面管理")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class AppPageController {
+
+    private final AppPageService pageService;
+
+    /**
+     * 查询文章资讯
+     *
+     * @param pageType pageType
+     * @return R
+     */
+    @Operation(summary = "通过页面类型查询", description = "通过页面类型查询")
+    @GetMapping("/{pageType}")
+    public R getByPageType(@PathVariable("pageType") Long pageType) {
+        AppPageEntity appPage = pageService.getOne(Wrappers.<AppPageEntity>lambdaQuery().eq(AppPageEntity::getPageType, pageType));
+        return R.ok(appPage);
+    }
+
+    /**
+     * 更新
+     *
+     * @param page 页面
+     * @return {@link R }
+     */
+    @Operation(summary = "更新页面", description = "更新页面")
+    @PutMapping
+    public R update(@RequestBody AppPageEntity page) {
+        return R.ok(pageService.saveOrUpdate(page));
+    }
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppRoleController.java

@@ -0,0 +1,175 @@
+/*
+ *    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.controller;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.app.api.entity.AppRole;
+import com.bsd.pjcloud.app.api.vo.AppRoleExcelVO;
+import com.bsd.pjcloud.app.service.AppRoleService;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.excel.annotation.RequestExcel;
+import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
+import com.bsd.pjcloud.common.log.annotation.SysLog;
+import com.bsd.pjcloud.common.security.annotation.HasPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * app角色表
+ *
+ * @author aeizzz
+ * @date 2022-12-07 09:52:03
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/approle")
+@Tag(description = "approle", name = "app角色表管理")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class AppRoleController {
+
+	private final AppRoleService appRoleService;
+
+	/**
+	 * 分页查询
+	 * @param page 分页对象
+	 * @param appRole app角色表
+	 * @return
+	 */
+	@Operation(summary = "分页查询", description = "分页查询")
+	@GetMapping("/page")
+	public R getAppRolePage(Page page, AppRole appRole) {
+		return R.ok(appRoleService.page(page, Wrappers.<AppRole>lambdaQuery()
+			.like(StrUtil.isNotBlank(appRole.getRoleName()), AppRole::getRoleName, appRole.getRoleName())));
+	}
+
+	/**
+	 * 查询全部角色
+	 * @return
+	 */
+	@Operation(summary = "查询全部", description = "查询全部")
+	@GetMapping("/list")
+	public R list() {
+		return R.ok(appRoleService.list(Wrappers.emptyWrapper()));
+	}
+
+	/**
+	 * 通过id查询app角色表
+	 * @param roleId id
+	 * @return R
+	 */
+	@Operation(summary = "通过id查询", description = "通过id查询")
+	@GetMapping("/{roleId}")
+	public R getById(@PathVariable("roleId") Long roleId) {
+		return R.ok(appRoleService.getById(roleId));
+	}
+
+	/**
+	 * 通过roleName查询app角色表
+	 * @param roleName roleName
+	 * @return R
+	 */
+	@Operation(summary = "通过id查询", description = "通过id查询")
+	@GetMapping("/details/{roleName}")
+	public R getByUserName(@PathVariable("roleName") String roleName) {
+		return R.ok(appRoleService.getOne(Wrappers.<AppRole>lambdaQuery().eq(AppRole::getRoleName, roleName)));
+	}
+
+	/**
+	 * 通过roleCode查询app角色表
+	 * @param roleCode roleCode
+	 * @return R
+	 */
+	@Operation(summary = "通过roleCode查询", description = "通过roleCode查询")
+	@GetMapping("/detailsByCode/{roleCode}")
+	public R getByPhone(@PathVariable("roleCode") String roleCode) {
+		return R.ok(appRoleService.getOne(Wrappers.<AppRole>lambdaQuery().eq(AppRole::getRoleCode, roleCode)));
+	}
+
+	/**
+	 * 新增app角色表
+	 * @param appRole app角色表
+	 * @return R
+	 */
+	@Operation(summary = "新增app角色表", description = "新增app角色表")
+	@SysLog("新增app角色表")
+	@PostMapping
+	@HasPermission("app_approle_add")
+	public R save(@RequestBody AppRole appRole) {
+		return R.ok(appRoleService.save(appRole));
+	}
+
+	/**
+	 * 修改app角色表
+	 * @param appRole app角色表
+	 * @return R
+	 */
+	@Operation(summary = "修改app角色表", description = "修改app角色表")
+	@SysLog("修改app角色表")
+	@PutMapping
+	@HasPermission("app_approle_edit")
+	public R updateById(@RequestBody AppRole appRole) {
+		return R.ok(appRoleService.updateById(appRole));
+	}
+
+	/**
+	 * 通过ids批量删除app角色表
+	 * @param ids roleIds
+	 * @return R
+	 */
+	@Operation(summary = "通过ids批量删除app角色表", description = "通过ids批量删除app角色表")
+	@SysLog("通过ids批量删除app角色表")
+	@DeleteMapping
+	@HasPermission("app_approle_del")
+	public R removeById(@RequestBody Long[] ids) {
+		return R.ok(appRoleService.deleteRoleByIds(ids));
+	}
+
+	/**
+	 * 导出excel 表格
+	 * @param appRole 查询条件
+	 * @return excel 文件流
+	 */
+	@ResponseExcel
+	@GetMapping("/export")
+	@HasPermission("app_approle_export")
+	public List<AppRole> export(AppRole appRole) {
+		return appRoleService.list(Wrappers.query(appRole));
+	}
+
+	/**
+	 * 导入角色
+	 * @param excelVOList 角色列表
+	 * @param bindingResult 错误信息列表
+	 * @return ok fail
+	 */
+	@PostMapping("/import")
+	@HasPermission("app_approle_export")
+	public R importRole(@RequestExcel List<AppRoleExcelVO> excelVOList, BindingResult bindingResult) {
+		return appRoleService.importRole(excelVOList, bindingResult);
+	}
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppSocialDetailsController.java

@@ -0,0 +1,139 @@
+/*
+ *    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.controller;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.app.api.entity.AppSocialDetails;
+import com.bsd.pjcloud.app.service.AppSocialDetailsService;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.core.util.ValidGroup;
+import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
+import com.bsd.pjcloud.common.log.annotation.SysLog;
+import com.bsd.pjcloud.common.security.annotation.HasPermission;
+import com.bsd.pjcloud.common.security.annotation.Inner;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.AllArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/appsocial")
+@AllArgsConstructor
+@Tag(description = "social", name = "三方账号管理模块")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class AppSocialDetailsController {
+
+	private final AppSocialDetailsService appSocialDetailsService;
+
+	/**
+	 * 社交登录账户简单分页查询
+	 * @param page 分页对象
+	 * @param appSocialDetails 社交登录
+	 * @return
+	 */
+	@GetMapping("/page")
+	public R getSocialDetailsPage(Page page, AppSocialDetails appSocialDetails) {
+		return R.ok(appSocialDetailsService.page(page, Wrappers.query(appSocialDetails)));
+	}
+
+	/**
+	 * 信息
+	 * @param id id
+	 * @return R
+	 */
+	@GetMapping("/{id}")
+	public R getinfo(@PathVariable("id") Long id) {
+		return R.ok(appSocialDetailsService.getById(id));
+	}
+
+	/**
+	 * 保存
+	 * @param appSocialDetails
+	 * @return R
+	 */
+	@SysLog("保存三方信息")
+	@PostMapping
+	@HasPermission("app_social_details_add")
+	public R save(@Valid @RequestBody AppSocialDetails appSocialDetails) {
+		return R.ok(appSocialDetailsService.save(appSocialDetails));
+	}
+
+	/**
+	 * 修改
+	 * @param appSocialDetails
+	 * @return R
+	 */
+	@SysLog("修改三方信息")
+	@PutMapping
+	@HasPermission("app_social_details_edit")
+	public R updateById(@Validated({ ValidGroup.Update.class }) @RequestBody AppSocialDetails appSocialDetails) {
+		appSocialDetailsService.updateById(appSocialDetails);
+		return R.ok(Boolean.TRUE);
+	}
+
+	/**
+	 * 删除
+	 * @param ids
+	 * @return R
+	 */
+	@SysLog("删除三方信息")
+	@DeleteMapping
+	@HasPermission("app_social_details_del")
+	public R removeById(@RequestBody Long[] ids) {
+		return R.ok(appSocialDetailsService.removeBatchByIds(CollUtil.toList(ids)));
+	}
+
+	/**
+	 * 通过社交账号、手机号查询用户、角色信息
+	 * @param inStr appid@code
+	 * @return
+	 */
+	@Inner
+	@GetMapping("/info/{inStr}")
+	public R getUserInfo(@PathVariable String inStr) {
+		return R.ok(appSocialDetailsService.getUserInfo(inStr));
+	}
+
+	/**
+	 * 绑定社交账号
+	 * @param state 类型
+	 * @param code code
+	 * @return
+	 */
+	@PostMapping("/bind")
+	public R bindSocial(String state, String code) {
+		return R.ok(appSocialDetailsService.bindSocial(state, code));
+	}
+
+	/**
+	 * 导出
+	 */
+	@GetMapping("/export")
+	@ResponseExcel
+	public List<AppSocialDetails> export(AppSocialDetails appSocialDetails) {
+		return appSocialDetailsService.list(Wrappers.query(appSocialDetails));
+	}
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppTabbarController.java

@@ -0,0 +1,61 @@
+package com.bsd.pjcloud.app.controller;
+
+import cn.hutool.core.collection.CollUtil;
+import com.bsd.pjcloud.app.api.entity.AppTabbarEntity;
+import com.bsd.pjcloud.app.service.AppTabbarService;
+import com.bsd.pjcloud.common.core.util.R;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 底部导航
+ *
+ * @author pig
+ * @date 2023-06-07 16:32:35
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/appTabbar")
+@Tag(description = "appTabbar", name = "底部导航")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class AppTabbarController {
+
+    private final AppTabbarService tabbarService;
+
+    /**
+     * 查询导航列表
+     *
+     * @return R
+     */
+    @Operation(summary = "查询导航列表", description = "查询导航列表")
+    @GetMapping("/list")
+    public R list() {
+        return R.ok(tabbarService.list());
+    }
+
+    @Operation(summary = "更新导航", description = "更新导航")
+    @PutMapping
+    public R update(@RequestBody List<AppTabbarEntity> tabbarEntityList) {
+        // 删除不在新增范围的导航菜单
+        List<Long> idList = tabbarService.list().stream().map(AppTabbarEntity::getId).collect(Collectors.toList());
+        List<Long> newIdList = tabbarEntityList.stream().map(AppTabbarEntity::getId).collect(Collectors.toList());
+
+        // 计算需要删除的 ID 列表
+        List<Long> idsToRemove = CollUtil.subtractToList(idList, newIdList);
+
+        // 如果有需要删除的菜单，则批量删除
+        if (CollUtil.isNotEmpty(idsToRemove)) {
+            tabbarService.removeBatchByIds(idsToRemove);
+        }
+
+        return R.ok(tabbarService.saveOrUpdateBatch(tabbarEntityList));
+    }
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppUserController.java

@@ -0,0 +1,207 @@
+/*
+ *    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.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.app.api.dto.AppUserDTO;
+import com.bsd.pjcloud.app.api.entity.AppUser;
+import com.bsd.pjcloud.app.api.vo.AppUserExcelVO;
+import com.bsd.pjcloud.app.service.AppUserService;
+import com.bsd.pjcloud.common.core.constant.CommonConstants;
+import com.bsd.pjcloud.common.core.constant.enums.UserTypeEnum;
+import com.bsd.pjcloud.common.core.exception.ErrorCodes;
+import com.bsd.pjcloud.common.core.util.MsgUtils;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.excel.annotation.RequestExcel;
+import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
+import com.bsd.pjcloud.common.log.annotation.SysLog;
+import com.bsd.pjcloud.common.security.annotation.HasPermission;
+import com.bsd.pjcloud.common.security.annotation.Inner;
+import com.bsd.pjcloud.common.security.util.SecurityUtils;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * app用户表
+ *
+ * @author aeizzz
+ * @date 2022-12-07 09:52:03
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/appuser")
+@Tag(description = "appuser", name = "app用户表管理")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class AppUserController {
+
+	private final AppUserService appUserService;
+
+	@Inner
+	@GetMapping("/info/{username}")
+	public R info(@PathVariable String username) {
+		AppUser user = appUserService.getOne(Wrappers.<AppUser>query()
+			.lambda()
+			.eq(AppUser::getUsername, username)
+			.or()
+			.eq(AppUser::getPhone, username));
+		if (user == null) {
+			return R.failed(MsgUtils.getMessage(ErrorCodes.APP_USER_USERINFO_EMPTY, username));
+		}
+		return R.ok(appUserService.findUserInfo(user));
+	}
+
+	/**
+	 * 获取当前用户全部信息
+	 * @return 用户信息
+	 */
+	@GetMapping(value = { "/info" })
+	public R info() {
+		String username = SecurityUtils.getUser().getUsername();
+		AppUser user = appUserService.getOne(Wrappers.<AppUser>query().lambda().eq(AppUser::getUsername, username));
+		if (user == null) {
+			return R.failed(MsgUtils.getMessage(ErrorCodes.SYS_USER_QUERY_ERROR));
+		}
+		return R.ok(appUserService.findUserInfo(user));
+	}
+
+	/**
+	 * 分页查询
+	 * @param page 分页对象
+	 * @param appUserDTO app用户表
+	 * @return
+	 */
+	@Operation(summary = "分页查询", description = "分页查询")
+	@GetMapping("/page")
+	public R getAppUserPage(Page page, AppUserDTO appUserDTO) {
+		return R.ok(appUserService.getUsersWithRolePage(page, appUserDTO));
+	}
+
+	/**
+	 * 通过id查询app用户表
+	 * @param userId id
+	 * @return R
+	 */
+	@Operation(summary = "通过id查询", description = "通过id查询")
+	@GetMapping("/details/{userId}")
+	public R getById(@PathVariable("userId") Long userId) {
+		return R.ok(appUserService.selectUserVoById(userId));
+	}
+
+	/**
+	 * @return R
+	 */
+	@Operation(summary = "通过userName查询", description = "通过userName查询")
+	@GetMapping("/details")
+	public R getByUserName(AppUser user) {
+		AppUser one = appUserService.getOne(Wrappers.query(user), false);
+		return R.ok(one == null ? null : CommonConstants.SUCCESS);
+	}
+
+	/**
+	 * 新增app用户表
+	 * @param appUser app用户表
+	 * @return R
+	 */
+	@Operation(summary = "新增app用户表", description = "新增app用户表")
+	@SysLog("新增app用户表")
+	@PostMapping
+	@HasPermission("app_appuser_add")
+	public R save(@RequestBody AppUserDTO appUser) {
+		appUserService.saveUser(appUser);
+		return R.ok();
+	}
+
+	/**
+	 * 修改app用户表
+	 * @param appUser app用户表
+	 * @return R
+	 */
+	@Operation(summary = "修改app用户表", description = "修改app用户表")
+	@SysLog("修改app用户表")
+	@PutMapping
+	@HasPermission("app_appuser_edit")
+	public R updateById(@RequestBody AppUserDTO appUser) {
+		return R.ok(appUserService.updateUser(appUser));
+	}
+
+	/**
+	 * 通过id删除app用户表
+	 * @param ids userIds
+	 * @return R
+	 */
+	@Operation(summary = "通过ids删除app用户表", description = "通过ids删除app用户表")
+	@SysLog("通过id删除app用户表")
+	@DeleteMapping
+	@HasPermission("app_appuser_del")
+	public R removeById(@RequestBody Long[] ids) {
+		return R.ok(appUserService.deleteAppUserByIds(ids));
+	}
+
+	/**
+	 * 导出excel 表格
+	 * @param appUser 查询条件
+	 * @return excel 文件流
+	 */
+	@ResponseExcel
+	@GetMapping("/export")
+	@HasPermission("app_appuser_export")
+	public List<AppUserExcelVO> export(AppUserDTO appUser) {
+		return appUserService.listUser(appUser);
+	}
+
+	@SysLog("修改个人信息")
+	@PutMapping("/edit")
+	public R updateUserInfo(@Valid @RequestBody AppUserDTO userDto) {
+		if (UserTypeEnum.TOC.getStatus().equals(SecurityUtils.getUser().getUserType())) {
+			userDto.setUserId(SecurityUtils.getUser().getId());
+			// TOC 以手机号为key
+			userDto.setUsername(SecurityUtils.getUser().getUsername());
+		}
+		return appUserService.updateUserInfo(userDto);
+	}
+
+	/**
+	 * 导入用户
+	 * @param excelVOList 用户列表
+	 * @param bindingResult 错误信息列表
+	 * @return R
+	 */
+	@PostMapping("/import")
+	@HasPermission("app_appuser_export")
+	public R importUser(@RequestExcel List<AppUserExcelVO> excelVOList, BindingResult bindingResult) {
+		return appUserService.importUser(excelVOList, bindingResult);
+	}
+
+	@Operation(summary = "注册app用户表", description = "注册app用户表")
+	@SysLog("注册app用户表")
+	@Inner(value = false)
+	@PostMapping("/register")
+	public R register(@RequestBody AppUserDTO appUser) {
+		return appUserService.registerAppUser(appUser);
+	}
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppUserRoleController.java

@@ -0,0 +1,128 @@
+/*
+ *    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.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.app.api.entity.AppUserRole;
+import com.bsd.pjcloud.app.service.AppUserRoleService;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
+import com.bsd.pjcloud.common.log.annotation.SysLog;
+import com.bsd.pjcloud.common.security.annotation.HasPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 用户角色表
+ *
+ * @author aeizzz
+ * @date 2022-12-07 09:52:03
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/appuserrole")
+@Tag(description = "appuserrole", name = "用户角色表管理")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class AppUserRoleController {
+
+	private final AppUserRoleService appUserRoleService;
+
+	/**
+	 * 分页查询
+	 * @param page 分页对象
+	 * @param appUserRole 用户角色表
+	 * @return
+	 */
+	@Operation(summary = "分页查询", description = "分页查询")
+	@GetMapping("/page")
+	@HasPermission("app_appuserrole_view")
+	public R getAppUserRolePage(Page page, AppUserRole appUserRole) {
+		return R.ok(appUserRoleService.page(page, Wrappers.query(appUserRole)));
+	}
+
+	/**
+	 * 通过id查询用户角色表
+	 * @param userId id
+	 * @return R
+	 */
+	@Operation(summary = "通过id查询", description = "通过id查询")
+	@GetMapping("/{userId}")
+	@HasPermission("app_appuserrole_view")
+	public R getById(@PathVariable("userId") Long userId) {
+		return R.ok(appUserRoleService.getById(userId));
+	}
+
+	/**
+	 * 新增用户角色表
+	 * @param appUserRole 用户角色表
+	 * @return R
+	 */
+	@Operation(summary = "新增用户角色表", description = "新增用户角色表")
+	@SysLog("新增用户角色表")
+	@PostMapping
+	@HasPermission("app_appuserrole_add")
+	public R save(@RequestBody AppUserRole appUserRole) {
+		return R.ok(appUserRoleService.save(appUserRole));
+	}
+
+	/**
+	 * 修改用户角色表
+	 * @param appUserRole 用户角色表
+	 * @return R
+	 */
+	@Operation(summary = "修改用户角色表", description = "修改用户角色表")
+	@SysLog("修改用户角色表")
+	@PutMapping
+	@HasPermission("app_appuserrole_edit")
+	public R updateById(@RequestBody AppUserRole appUserRole) {
+		return R.ok(appUserRoleService.updateById(appUserRole));
+	}
+
+	/**
+	 * 通过id删除用户角色表
+	 * @param userId id
+	 * @return R
+	 */
+	@Operation(summary = "通过id删除用户角色表", description = "通过id删除用户角色表")
+	@SysLog("通过id删除用户角色表")
+	@DeleteMapping("/{userId}")
+	@HasPermission("app_appuserrole_del")
+	public R removeById(@PathVariable Long userId) {
+		return R.ok(appUserRoleService.removeById(userId));
+	}
+
+	/**
+	 * 导出excel 表格
+	 * @param appUserRole 查询条件
+	 * @return excel 文件流
+	 */
+	@ResponseExcel
+	@GetMapping("/export")
+	@HasPermission("app_appuserrole_export")
+	public List<AppUserRole> export(AppUserRole appUserRole) {
+		return appUserRoleService.list(Wrappers.query(appUserRole));
+	}
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/handler/AbstractLoginHandler.java

@@ -0,0 +1,53 @@
+/*
+ *    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.handler;
+
+import com.bsd.pjcloud.app.api.dto.AppUserInfo;
+
+/**
+ * @author pjcloud
+ * @date 2018/11/18
+ */
+public abstract class AbstractLoginHandler implements LoginHandler {
+
+	/***
+	 * 数据合法性校验
+	 * @param loginStr 通过用户传入获取唯一标识
+	 * @return 默认不校验
+	 */
+	@Override
+	public Boolean check(String loginStr) {
+		return true;
+	}
+
+	/**
+	 * 处理方法
+	 * @param loginStr 登录参数
+	 * @return
+	 */
+	@Override
+	public AppUserInfo handle(String loginStr) {
+		if (!check(loginStr)) {
+			return null;
+		}
+
+		String identify = identify(loginStr);
+		return info(identify);
+	}
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/handler/LoginHandler.java

@@ -0,0 +1,69 @@
+/*
+ *    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.handler;
+
+import com.bsd.pjcloud.app.api.dto.AppUserInfo;
+import com.bsd.pjcloud.app.api.entity.AppUser;
+
+/**
+ * @author pjcloud
+ * @date 2018/11/18
+ * <p>
+ * 登录处理器
+ */
+public interface LoginHandler {
+
+	/***
+	 * 数据合法性校验
+	 * @param loginStr 通过用户传入获取唯一标识
+	 * @return
+	 */
+	Boolean check(String loginStr);
+
+	/**
+	 * 通过用户传入获取唯一标识
+	 * @param loginStr
+	 * @return
+	 */
+	String identify(String loginStr);
+
+	/**
+	 * 通过openId 获取用户信息
+	 * @param identify
+	 * @return
+	 */
+	AppUserInfo info(String identify);
+
+	/**
+	 * 处理方法
+	 * @param loginStr 登录参数
+	 * @return
+	 */
+	AppUserInfo handle(String loginStr);
+
+	/**
+	 * 绑定逻辑
+	 * @param user 用户实体
+	 * @param identify 渠道返回唯一标识
+	 * @return
+	 */
+	default Boolean bind(AppUser user, String identify) {
+		return false;
+	}
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/handler/MiniAppLoginHandler.java

@@ -0,0 +1,122 @@
+/*
+ *    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.handler;
+
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.bsd.pjcloud.app.api.dto.AppUserInfo;
+import com.bsd.pjcloud.app.api.entity.AppSocialDetails;
+import com.bsd.pjcloud.app.api.entity.AppUser;
+import com.bsd.pjcloud.app.mapper.AppSocialDetailsMapper;
+import com.bsd.pjcloud.app.service.AppUserService;
+import com.bsd.pjcloud.common.core.constant.SecurityConstants;
+import com.bsd.pjcloud.common.core.constant.enums.LoginTypeEnum;
+import com.bsd.pjcloud.common.core.exception.CheckedException;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.Objects;
+
+/**
+ * @author pjcloud
+ * @date 2019年11月02日
+ * <p>
+ * 微信小程序
+ */
+@Slf4j
+@Component("APP-MINI")
+@AllArgsConstructor
+public class MiniAppLoginHandler extends AbstractLoginHandler {
+
+    private final AppUserService appUserService;
+
+    private final AppSocialDetailsMapper appSocialDetailsMapper;
+
+    /**
+     * 小程序登录传入code
+     * <p>
+     * 通过code 调用qq 获取唯一标识
+     *
+     * @param code
+     * @return
+     */
+    @Override
+    public String identify(String code) {
+        AppSocialDetails condition = new AppSocialDetails();
+        condition.setType(LoginTypeEnum.MINI_APP.getType());
+        AppSocialDetails socialDetails = appSocialDetailsMapper.selectOne(new QueryWrapper<>(condition));
+
+        String url = String.format(SecurityConstants.MINI_APP_AUTHORIZATION_CODE_URL, socialDetails.getAppId(),
+                socialDetails.getAppSecret(), code);
+        String result = HttpUtil.get(url);
+        log.debug("微信小程序响应报文:{}", result);
+
+        if (JSONUtil.parseObj(result).containsKey("openid")) {
+            return JSONUtil.parseObj(result).get("openid").toString();
+        } else {
+            log.error("微信小程序登录失败:{}", result);
+            throw new CheckedException("微信小程序登录失败");
+        }
+    }
+
+    /**
+     * openId 获取用户信息
+     *
+     * @param openId
+     * @return
+     */
+    @Override
+    public AppUserInfo info(String openId) {
+        AppUser user = appUserService.getOne(Wrappers.<AppUser>query().lambda().eq(AppUser::getWxOpenid, openId));
+
+        // 未注册用户自动注册
+        if (Objects.isNull(user)) {
+            log.info("微信小程序未绑定:{},创建新的用户", openId);
+            AppUser appUser = new AppUser();
+            appUser.setWxOpenid(openId);
+            appUser.setUsername(openId);
+            appUser.setCreateBy(openId);
+            appUser.setUpdateBy(openId);
+            appUserService.saveOrUpdate(appUser);
+
+            AppUserInfo appUserDTO = new AppUserInfo();
+            appUserDTO.setAppUser(appUser);
+            return appUserDTO;
+        }
+
+        return appUserService.findUserInfo(user);
+    }
+
+    /**
+     * 绑定逻辑
+     *
+     * @param user     用户实体
+     * @param identify 渠道返回唯一标识
+     * @return
+     */
+    @Override
+    public Boolean bind(AppUser user, String identify) {
+        user.setWxOpenid(identify);
+        appUserService.updateById(user);
+        return true;
+    }
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/handler/SmsLoginHandler.java

@@ -0,0 +1,93 @@
+/*
+ *    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.handler;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.bsd.pjcloud.app.api.dto.AppUserInfo;
+import com.bsd.pjcloud.app.api.entity.AppUser;
+import com.bsd.pjcloud.app.mapper.AppUserMapper;
+import com.bsd.pjcloud.app.service.AppUserService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.Objects;
+
+/**
+ * @author pjcloud
+ * @date 2018/11/18
+ */
+@Slf4j
+@Component("APP-SMS")
+@AllArgsConstructor
+public class SmsLoginHandler extends AbstractLoginHandler {
+
+	private final AppUserService appUserService;
+
+	/**
+	 * 验证码登录传入为手机号 不用不处理
+	 * @param mobile
+	 * @return
+	 */
+	@Override
+	public String identify(String mobile) {
+		return mobile;
+	}
+
+	/**
+	 * 通过mobile 获取用户信息
+	 * @param identify
+	 * @return
+	 */
+	@Override
+	public AppUserInfo info(String identify) {
+		AppUser user = appUserService.getOne(Wrappers.<AppUser>query().lambda().eq(AppUser::getPhone, identify));
+
+		// 未注册用户自动注册
+		if (Objects.isNull(user)) {
+			log.info("手机号未注册:{}", identify);
+			AppUser appUser = new AppUser();
+			appUser.setUsername(identify);
+			appUser.setPhone(identify);
+			appUser.setCreateBy(identify);
+			appUser.setUpdateBy(identify);
+			appUserService.save(appUser);
+			AppUserInfo appUserDTO = new AppUserInfo();
+			appUserDTO.setAppUser(appUser);
+			return appUserDTO;
+		}
+
+		// 返回用户信息
+		return appUserService.findUserInfo(user);
+	}
+
+
+	/**
+	 * 绑定逻辑
+	 * @param user 用户实体
+	 * @param identify 渠道返回唯一标识
+	 * @return
+	 */
+	@Override
+	public Boolean bind(AppUser user, String identify) {
+		user.setPhone(identify);
+		appUserService.updateById(user);
+		return true;
+	}
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/mapper/AppArticleCategoryMapper.java

@@ -0,0 +1,10 @@
+package com.bsd.pjcloud.app.mapper;
+
+import com.bsd.pjcloud.app.api.entity.AppArticleCategoryEntity;
+import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface AppArticleCategoryMapper extends PjcloudBaseMapper<AppArticleCategoryEntity> {
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/mapper/AppArticleCollectMapper.java

@@ -0,0 +1,10 @@
+package com.bsd.pjcloud.app.mapper;
+
+import com.bsd.pjcloud.app.api.entity.AppArticleCollectEntity;
+import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface AppArticleCollectMapper extends PjcloudBaseMapper<AppArticleCollectEntity> {
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/mapper/AppArticleMapper.java

@@ -0,0 +1,10 @@
+package com.bsd.pjcloud.app.mapper;
+
+import com.bsd.pjcloud.app.api.entity.AppArticleEntity;
+import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface AppArticleMapper extends PjcloudBaseMapper<AppArticleEntity> {
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/mapper/AppPageMapper.java

@@ -0,0 +1,10 @@
+package com.bsd.pjcloud.app.mapper;
+
+import com.bsd.pjcloud.app.api.entity.AppPageEntity;
+import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface AppPageMapper extends PjcloudBaseMapper<AppPageEntity> {
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/mapper/AppRoleMapper.java

@@ -0,0 +1,37 @@
+/*
+ *    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.mapper;
+
+import com.bsd.pjcloud.app.api.entity.AppRole;
+import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * app角色表
+ *
+ * @author aeizzz
+ * @date 2022-12-07 09:52:03
+ */
+@Mapper
+public interface AppRoleMapper extends PjcloudBaseMapper<AppRole> {
+
+	List<AppRole> listRolesByUserId(Long userId);
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/mapper/AppSocialDetailsMapper.java

@@ -0,0 +1,33 @@
+/*
+ *    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.mapper;
+
+import com.bsd.pjcloud.app.api.entity.AppSocialDetails;
+import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 系统社交登录账号表
+ *
+ * @author pjcloud
+ * @date 2018-08-16 21:30:41
+ */
+@Mapper
+public interface AppSocialDetailsMapper extends PjcloudBaseMapper<AppSocialDetails> {
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/mapper/AppTabbarMapper.java

@@ -0,0 +1,10 @@
+package com.bsd.pjcloud.app.mapper;
+
+import com.bsd.pjcloud.app.api.entity.AppTabbarEntity;
+import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface AppTabbarMapper extends PjcloudBaseMapper<AppTabbarEntity> {
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/mapper/AppUserMapper.java

@@ -0,0 +1,42 @@
+/*
+ *    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.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.app.api.dto.AppUserDTO;
+import com.bsd.pjcloud.app.api.entity.AppUser;
+import com.bsd.pjcloud.app.api.vo.AppUserVO;
+import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * app用户表
+ *
+ * @author aeizzz
+ * @date 2022-12-07 09:52:03
+ */
+@Mapper
+public interface AppUserMapper extends PjcloudBaseMapper<AppUser> {
+
+	IPage<AppUserVO> getUserVosPage(Page page, @Param("query") AppUserDTO appUserDTO);
+
+	AppUserVO getUserVoById(Long userId);
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/mapper/AppUserRoleMapper.java

@@ -0,0 +1,33 @@
+/*
+ *    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.mapper;
+
+import com.bsd.pjcloud.app.api.entity.AppUserRole;
+import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 用户角色表
+ *
+ * @author aeizzz
+ * @date 2022-12-07 09:52:03
+ */
+@Mapper
+public interface AppUserRoleMapper extends PjcloudBaseMapper<AppUserRole> {
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/service/AppArticleCategoryService.java

@@ -0,0 +1,8 @@
+package com.bsd.pjcloud.app.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsd.pjcloud.app.api.entity.AppArticleCategoryEntity;
+
+public interface AppArticleCategoryService extends IService<AppArticleCategoryEntity> {
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/service/AppArticleCollectService.java

@@ -0,0 +1,10 @@
+package com.bsd.pjcloud.app.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.bsd.pjcloud.app.api.entity.AppArticleCollectEntity;
+
+public interface AppArticleCollectService extends MPJBaseService<AppArticleCollectEntity> {
+
+	Boolean saveArticleCollect(AppArticleCollectEntity appArticleCollect);
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/service/AppArticleService.java

@@ -0,0 +1,24 @@
+package com.bsd.pjcloud.app.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsd.pjcloud.app.api.entity.AppArticleEntity;
+
+public interface AppArticleService extends IService<AppArticleEntity> {
+
+	/**
+	 * 获取文章并使阅读数+1
+	 * @param id id
+	 * @return
+	 */
+	AppArticleEntity getArticleAndIncrById(Long id, Long userId);
+
+	/**
+	 * 分页查询文章列表 包含分类名称
+	 * @param page 分页参数
+	 * @param appArticle 文章查询条件
+	 * @return
+	 */
+	Page pageAndCname(Page page, AppArticleEntity appArticle);
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/service/AppIndexService.java

@@ -0,0 +1,33 @@
+package com.bsd.pjcloud.app.service;
+
+import com.bsd.pjcloud.app.api.entity.AppPageEntity;
+
+import java.util.Map;
+
+/**
+ * app 页面控制
+ *
+ * @author pjcloud
+ * @date 2023/6/8
+ */
+public interface AppIndexService {
+
+	/**
+	 * 首页
+	 */
+	Map<String, Object> index();
+
+	/**
+	 * 配置
+	 * @return Map<String, Object>
+	 */
+	Map<String, Object> config();
+
+	/**
+	 * 装修
+	 * @param id 装修ID
+	 * @return Map<String, Object>
+	 */
+	AppPageEntity decorate(Integer id);
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/service/AppMobileService.java

@@ -0,0 +1,35 @@
+/*
+ *    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.service;
+
+import com.bsd.pjcloud.common.core.util.R;
+
+/**
+ * @author pjcloud
+ * @date 2018/11/14
+ */
+public interface AppMobileService {
+
+	/**
+	 * 发送手机验证码
+	 * @param mobile mobile
+	 * @return code
+	 */
+	R<Boolean> sendSmsCode(String mobile);
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/service/AppPageService.java

@@ -0,0 +1,8 @@
+package com.bsd.pjcloud.app.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsd.pjcloud.app.api.entity.AppPageEntity;
+
+public interface AppPageService extends IService<AppPageEntity> {
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/service/AppRoleService.java

@@ -0,0 +1,46 @@
+/*
+ *    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.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsd.pjcloud.app.api.entity.AppRole;
+import com.bsd.pjcloud.app.api.vo.AppRoleExcelVO;
+import com.bsd.pjcloud.common.core.util.R;
+import org.springframework.validation.BindingResult;
+
+import java.util.List;
+
+/**
+ * app角色表
+ *
+ * @author aeizzz
+ * @date 2022-12-07 09:52:03
+ */
+public interface AppRoleService extends IService<AppRole> {
+
+	List<AppRole> findRolesByUserId(Long userId);
+
+	/**
+	 * 删除用户的同时，把role_menu关系删除
+	 * @param ids RoleIds
+	 */
+	Boolean deleteRoleByIds(Long[] ids);
+
+	R importRole(List<AppRoleExcelVO> excelVOList, BindingResult bindingResult);
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/service/AppSocialDetailsService.java

@@ -0,0 +1,47 @@
+/*
+ *    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.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsd.pjcloud.app.api.dto.AppUserInfo;
+import com.bsd.pjcloud.app.api.entity.AppSocialDetails;
+
+/**
+ * 系统社交登录账号表
+ *
+ * @author pjcloud
+ * @date 2018-08-16 21:30:41
+ */
+public interface AppSocialDetailsService extends IService<AppSocialDetails> {
+
+	/**
+	 * 绑定社交账号
+	 * @param state 类型
+	 * @param code code
+	 * @return
+	 */
+	Boolean bindSocial(String state, String code);
+
+	/**
+	 * 根据入参查询用户信息
+	 * @param inStr
+	 * @return
+	 */
+	AppUserInfo getUserInfo(String inStr);
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/service/AppTabbarService.java

@@ -0,0 +1,8 @@
+package com.bsd.pjcloud.app.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsd.pjcloud.app.api.entity.AppTabbarEntity;
+
+public interface AppTabbarService extends IService<AppTabbarEntity> {
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/service/AppUserRoleService.java

@@ -0,0 +1,31 @@
+/*
+ *    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.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsd.pjcloud.app.api.entity.AppUserRole;
+
+/**
+ * 用户角色表
+ *
+ * @author aeizzz
+ * @date 2022-12-07 09:52:03
+ */
+public interface AppUserRoleService extends IService<AppUserRole> {
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/service/AppUserService.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.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsd.pjcloud.app.api.dto.AppUserDTO;
+import com.bsd.pjcloud.app.api.dto.AppUserInfo;
+import com.bsd.pjcloud.app.api.entity.AppUser;
+import com.bsd.pjcloud.app.api.vo.AppUserExcelVO;
+import com.bsd.pjcloud.app.api.vo.AppUserVO;
+import com.bsd.pjcloud.common.core.util.R;
+import org.springframework.validation.BindingResult;
+
+import java.util.List;
+
+/**
+ * app用户表
+ *
+ * @author aeizzz
+ * @date 2022-12-07 09:52:03
+ */
+public interface AppUserService extends IService<AppUser> {
+
+	Boolean updateUser(AppUserDTO appUser);
+
+	Boolean saveUser(AppUserDTO appUser);
+
+	List<AppUserExcelVO> listUser(AppUserDTO appUser);
+
+	IPage getUsersWithRolePage(Page page, AppUserDTO appUserDTO);
+
+	AppUserInfo findUserInfo(AppUser user);
+
+	R updateUserInfo(AppUserDTO userDto);
+
+	AppUserVO selectUserVoById(Long userId);
+
+	Boolean deleteAppUserByIds(Long[] ids);
+
+	R importUser(List<AppUserExcelVO> excelVOList, BindingResult bindingResult);
+
+	R registerAppUser(AppUserDTO appUser);
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/service/impl/AppArticleCategoryServiceImpl.java

@@ -0,0 +1,19 @@
+package com.bsd.pjcloud.app.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.app.api.entity.AppArticleCategoryEntity;
+import com.bsd.pjcloud.app.mapper.AppArticleCategoryMapper;
+import com.bsd.pjcloud.app.service.AppArticleCategoryService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 文章分类表
+ *
+ * @author pig
+ * @date 2023-06-07 16:28:03
+ */
+@Service
+public class AppArticleCategoryServiceImpl extends ServiceImpl<AppArticleCategoryMapper, AppArticleCategoryEntity>
+		implements AppArticleCategoryService {
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/service/impl/AppArticleCollectServiceImpl.java

@@ -0,0 +1,36 @@
+package com.bsd.pjcloud.app.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.app.api.entity.AppArticleCollectEntity;
+import com.bsd.pjcloud.app.mapper.AppArticleCollectMapper;
+import com.bsd.pjcloud.app.service.AppArticleCollectService;
+import com.bsd.pjcloud.common.security.util.SecurityUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * 文章收藏表
+ *
+ * @author pig
+ * @date 2023-06-16 14:33:41
+ */
+@Service
+public class AppArticleCollectServiceImpl extends ServiceImpl<AppArticleCollectMapper, AppArticleCollectEntity>
+        implements AppArticleCollectService {
+
+    @Override
+    public Boolean saveArticleCollect(AppArticleCollectEntity appArticleCollect) {
+        Long id = SecurityUtils.getUser().getId();
+        appArticleCollect.setUserId(id);
+
+        if (baseMapper.exists(Wrappers.<AppArticleCollectEntity>lambdaQuery()
+                .eq(AppArticleCollectEntity::getUserId, id)
+                .eq(AppArticleCollectEntity::getArticleId, appArticleCollect.getArticleId()))) {
+            return Boolean.FALSE;
+        }
+
+        return this.save(appArticleCollect);
+
+    }
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/service/impl/AppArticleServiceImpl.java

@@ -0,0 +1,77 @@
+package com.bsd.pjcloud.app.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.bsd.pjcloud.app.api.entity.AppArticleCategoryEntity;
+import com.bsd.pjcloud.app.api.entity.AppArticleCollectEntity;
+import com.bsd.pjcloud.app.api.entity.AppArticleEntity;
+import com.bsd.pjcloud.app.mapper.AppArticleCollectMapper;
+import com.bsd.pjcloud.app.mapper.AppArticleMapper;
+import com.bsd.pjcloud.app.service.AppArticleService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+/**
+ * 文章资讯
+ *
+ * @author pig
+ * @date 2023-06-07 16:32:35
+ */
+@Service
+@RequiredArgsConstructor
+public class AppArticleServiceImpl extends ServiceImpl<AppArticleMapper, AppArticleEntity>
+		implements AppArticleService {
+
+	private final AppArticleCollectMapper collectMapper;
+
+	/**
+	 * 获取文章并使阅读数+1
+	 * @param id id
+	 * @return
+	 */
+	@Override
+	public AppArticleEntity getArticleAndIncrById(Long id, Long userId) {
+		AppArticleEntity appArticleEntity = baseMapper.selectById(id);
+		// 查询是否收藏了
+		if (Objects.nonNull(userId)) {
+			boolean exists = collectMapper.exists(Wrappers.<AppArticleCollectEntity>lambdaQuery()//
+				.eq(AppArticleCollectEntity::getArticleId, appArticleEntity.getId())//
+				.eq(AppArticleCollectEntity::getUserId, userId));
+			appArticleEntity.setCollect(exists);
+		}
+
+		// TODO 更新条件需要根据其他指数限制
+		Integer nowVisit = appArticleEntity.getVisit();
+		appArticleEntity.setVisit(nowVisit + 1);
+		// 乐观锁
+		baseMapper.update(appArticleEntity,
+				Wrappers.<AppArticleEntity>lambdaQuery()
+					.eq(AppArticleEntity::getId, id)
+					.eq(AppArticleEntity::getVisit, nowVisit));
+		return appArticleEntity;
+	}
+
+	/**
+	 * 分页查询文章列表 包含分类名称
+	 * @param page 分页参数
+	 * @param appArticle 文章查询条件
+	 * @return
+	 */
+	@Override
+	public Page pageAndCname(Page page, AppArticleEntity appArticle) {
+		MPJLambdaWrapper<AppArticleEntity> wrapper = new MPJLambdaWrapper<>();
+		wrapper.selectAll(AppArticleEntity.class)
+			.selectAs(AppArticleCategoryEntity::getName, AppArticleEntity.Fields.cname)
+			.leftJoin(AppArticleCategoryEntity.class, AppArticleCategoryEntity::getId, AppArticleEntity::getCid)
+			.like(StrUtil.isNotBlank(appArticle.getAuthor()), AppArticleEntity::getAuthor, appArticle.getAuthor())
+			.like(StrUtil.isNotBlank(appArticle.getTitle()), AppArticleEntity::getTitle, appArticle.getTitle())
+			.eq(Objects.nonNull(appArticle.getCid()), AppArticleEntity::getCid, appArticle.getCid());
+		return this.page(page, wrapper);
+	}
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/service/impl/AppIndexServiceImpl.java

@@ -0,0 +1,73 @@
+package com.bsd.pjcloud.app.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.bsd.pjcloud.app.api.entity.AppArticleEntity;
+import com.bsd.pjcloud.app.api.entity.AppPageEntity;
+import com.bsd.pjcloud.app.api.entity.AppTabbarEntity;
+import com.bsd.pjcloud.app.mapper.AppArticleMapper;
+import com.bsd.pjcloud.app.mapper.AppPageMapper;
+import com.bsd.pjcloud.app.mapper.AppTabbarMapper;
+import com.bsd.pjcloud.app.service.AppIndexService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * app 页面控制
+ *
+ * @author pjcloud
+ * @date 2023/6/8
+ */
+
+@Service
+@RequiredArgsConstructor
+public class AppIndexServiceImpl implements AppIndexService {
+
+	private final AppArticleMapper appArticleMapper;
+
+	private final AppTabbarMapper appTabbarMapper;
+
+	private final AppPageMapper appPageMapper;
+
+	/**
+	 * 商城首页 首页数据
+	 */
+	@Override
+	public Map<String, Object> index() {
+		Map<String, Object> response = new LinkedHashMap<>();
+		AppPageEntity appPageEntity = appPageMapper.selectById(1);
+		List<AppArticleEntity> articleList = appArticleMapper
+			.selectList(Wrappers.<AppArticleEntity>lambdaQuery().orderByDesc(AppArticleEntity::getSort));
+		response.put("pages", appPageEntity);
+		response.put("article", articleList);
+		return response;
+	}
+
+	/**
+	 * 配置
+	 * @return Map<String, Object>
+	 */
+	@Override
+	public Map<String, Object> config() {
+		Map<String, Object> response = new LinkedHashMap<>();
+		List<AppTabbarEntity> tabbarEntityList = appTabbarMapper.selectList(Wrappers.emptyWrapper());
+		response.put("tabbar", tabbarEntityList);
+		return response;
+	}
+
+	/**
+	 * 装修
+	 *
+	 * @author fzr
+	 * @param id 主键
+	 * @return Map<String, Object>
+	 */
+	@Override
+	public AppPageEntity decorate(Integer id) {
+		return appPageMapper.selectById(id);
+	}
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/service/impl/AppMobileServiceImpl.java

@@ -0,0 +1,73 @@
+/*
+ *    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.service.impl;
+
+import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.bsd.pjcloud.app.service.AppMobileService;
+import com.bsd.pjcloud.common.core.constant.CacheConstants;
+import com.bsd.pjcloud.common.core.constant.SecurityConstants;
+import com.bsd.pjcloud.common.core.constant.enums.LoginTypeEnum;
+import com.bsd.pjcloud.common.core.exception.ErrorCodes;
+import com.bsd.pjcloud.common.core.util.MsgUtils;
+import com.bsd.pjcloud.common.core.util.R;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author pjcloud
+ * @date 2018/11/14
+ * <p>
+ * 手机登录相关业务实现
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class AppMobileServiceImpl implements AppMobileService {
+
+	private final StringRedisTemplate redisTemplate;
+
+	/**
+	 * 发送手机验证码 TODO: 调用短信网关发送验证码,测试返回前端
+	 * @param mobile mobile
+	 * @return code
+	 */
+	@Override
+	public R<Boolean> sendSmsCode(String mobile) {
+		String codeObj = redisTemplate.opsForValue()
+			.get(CacheConstants.DEFAULT_CODE_KEY + LoginTypeEnum.APPSMS.getType() + StringPool.AT + mobile);
+
+		if (StrUtil.isNotBlank(codeObj)) {
+			log.info("手机号验证码未过期:{}，{}", mobile, codeObj);
+			return R.ok(Boolean.FALSE, MsgUtils.getMessage(ErrorCodes.SYS_APP_SMS_OFTEN));
+		}
+
+		String code = RandomUtil.randomNumbers(Integer.parseInt(SecurityConstants.CODE_SIZE));
+		log.debug("手机号生成验证码成功:{},{}", mobile, code);
+		redisTemplate.opsForValue()
+			.set(CacheConstants.DEFAULT_CODE_KEY + LoginTypeEnum.APPSMS.getType() + StringPool.AT + mobile, code,
+					SecurityConstants.CODE_TIME, TimeUnit.SECONDS);
+		return R.ok(Boolean.TRUE, code);
+	}
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/service/impl/AppPageServiceImpl.java

@@ -0,0 +1,18 @@
+package com.bsd.pjcloud.app.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.app.api.entity.AppPageEntity;
+import com.bsd.pjcloud.app.mapper.AppPageMapper;
+import com.bsd.pjcloud.app.service.AppPageService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 页面
+ *
+ * @author pjcloud
+ * @date 2023-06-08 11:19:23
+ */
+@Service
+public class AppPageServiceImpl extends ServiceImpl<AppPageMapper, AppPageEntity> implements AppPageService {
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/service/impl/AppRoleServiceImpl.java

@@ -0,0 +1,113 @@
+/*
+ *    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.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.app.api.entity.AppRole;
+import com.bsd.pjcloud.app.api.vo.AppRoleExcelVO;
+import com.bsd.pjcloud.app.mapper.AppRoleMapper;
+import com.bsd.pjcloud.app.service.AppRoleService;
+import com.bsd.pjcloud.common.core.exception.ErrorCodes;
+import com.bsd.pjcloud.common.core.util.MsgUtils;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.excel.vo.ErrorMessage;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.BindingResult;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * app角色表
+ *
+ * @author aeizzz
+ * @date 2022-12-07 09:52:03
+ */
+@Service
+@AllArgsConstructor
+public class AppRoleServiceImpl extends ServiceImpl<AppRoleMapper, AppRole> implements AppRoleService {
+
+	@Override
+	public List<AppRole> findRolesByUserId(Long userId) {
+		return baseMapper.listRolesByUserId(userId);
+	}
+
+	/**
+	 * 删除用户的同时，把role_menu关系删除
+	 * @param ids roleIds
+	 */
+	@Override
+	public Boolean deleteRoleByIds(Long[] ids) {
+		this.removeBatchByIds(CollUtil.toList(ids));
+		return Boolean.TRUE;
+	}
+
+	/**
+	 * 导入角色
+	 * @param excelVOList
+	 * @param bindingResult
+	 * @return
+	 */
+	@Override
+	public R importRole(List<AppRoleExcelVO> excelVOList, BindingResult bindingResult) {
+		// 通用校验获取失败的数据
+		List<ErrorMessage> errorMessageList = (List<ErrorMessage>) bindingResult.getTarget();
+
+		// 个性化校验逻辑
+		List<AppRole> roleList = this.list();
+
+		// 执行数据插入操作 组装 RoleDto
+		for (AppRoleExcelVO excel : excelVOList) {
+			Set<String> errorMsg = new HashSet<>();
+			// 检验角色名称或者角色编码是否存在
+			boolean existRole = roleList.stream()
+				.anyMatch(appRole -> excel.getRoleName().equals(appRole.getRoleName())
+						|| excel.getRoleCode().equals(appRole.getRoleCode()));
+
+			if (existRole) {
+				errorMsg.add(MsgUtils.getMessage(ErrorCodes.SYS_ROLE_NAMEORCODE_EXISTING, excel.getRoleName(),
+						excel.getRoleCode()));
+			}
+
+			// 数据合法情况
+			if (CollUtil.isEmpty(errorMsg)) {
+				insertExcelRole(excel);
+			}
+			else {
+				// 数据不合法情况
+				errorMessageList.add(new ErrorMessage(excel.getLineNum(), errorMsg));
+			}
+		}
+		if (CollUtil.isNotEmpty(errorMessageList)) {
+			return R.failed(errorMessageList);
+		}
+		return R.ok();
+
+	}
+
+	private void insertExcelRole(AppRoleExcelVO excel) {
+		AppRole appRole = new AppRole();
+		appRole.setRoleName(excel.getRoleName());
+		appRole.setRoleDesc(excel.getRoleDesc());
+		appRole.setRoleCode(excel.getRoleCode());
+		this.save(appRole);
+	}
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/service/impl/AppSocialDetailsServiceImpl.java

@@ -0,0 +1,86 @@
+/*
+ *    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.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.app.api.dto.AppUserInfo;
+import com.bsd.pjcloud.app.api.entity.AppSocialDetails;
+import com.bsd.pjcloud.app.api.entity.AppUser;
+import com.bsd.pjcloud.app.handler.LoginHandler;
+import com.bsd.pjcloud.app.mapper.AppSocialDetailsMapper;
+import com.bsd.pjcloud.app.mapper.AppUserMapper;
+import com.bsd.pjcloud.app.service.AppSocialDetailsService;
+import com.bsd.pjcloud.common.core.constant.CacheConstants;
+import com.bsd.pjcloud.common.security.util.SecurityUtils;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cache.CacheManager;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * @author pjcloud
+ * @date 2018年08月16日
+ */
+@Slf4j
+@AllArgsConstructor
+@Service("appSocialDetailsService")
+public class AppSocialDetailsServiceImpl extends ServiceImpl<AppSocialDetailsMapper, AppSocialDetails>
+		implements AppSocialDetailsService {
+
+	private final Map<String, LoginHandler> loginHandlerMap;
+
+	private final CacheManager cacheManager;
+
+	private final AppUserMapper appUserMapper;
+
+	/**
+	 * 绑定社交账号
+	 * @param type type
+	 * @param code code
+	 * @return
+	 */
+	@Override
+	public Boolean bindSocial(String type, String code) {
+		LoginHandler loginHandler = loginHandlerMap.get(type);
+		// 绑定逻辑
+		String identify = loginHandler.identify(code);
+		AppUser user = appUserMapper.selectById(SecurityUtils.getUser().getId());
+		loginHandler.bind(user, identify);
+
+		// 更新緩存
+		cacheManager.getCache(CacheConstants.USER_DETAILS_MINI).evict(user.getUsername());
+		return Boolean.TRUE;
+	}
+
+	/**
+	 * 根据入参查询用户信息
+	 * @param inStr TYPE@code
+	 * @return
+	 */
+	@Override
+	public AppUserInfo getUserInfo(String inStr) {
+		String[] inStrs = inStr.split(StringPool.AT);
+		String type = inStrs[0];
+		String loginStr = inStr.substring(type.length() + 1);
+		return loginHandlerMap.get(type).handle(loginStr);
+	}
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/service/impl/AppTabbarServiceImpl.java

@@ -0,0 +1,18 @@
+package com.bsd.pjcloud.app.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.app.api.entity.AppTabbarEntity;
+import com.bsd.pjcloud.app.mapper.AppTabbarMapper;
+import com.bsd.pjcloud.app.service.AppTabbarService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 导航栏
+ *
+ * @author pjcloud
+ * @date 2023-06-08 11:18:46
+ */
+@Service
+public class AppTabbarServiceImpl extends ServiceImpl<AppTabbarMapper, AppTabbarEntity> implements AppTabbarService {
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/service/impl/AppUserRoleServiceImpl.java

@@ -0,0 +1,34 @@
+/*
+ *    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.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.app.api.entity.AppUserRole;
+import com.bsd.pjcloud.app.mapper.AppUserRoleMapper;
+import com.bsd.pjcloud.app.service.AppUserRoleService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 用户角色表
+ *
+ * @author aeizzz
+ * @date 2022-12-07 09:52:03
+ */
+@Service
+public class AppUserRoleServiceImpl extends ServiceImpl<AppUserRoleMapper, AppUserRole> implements AppUserRoleService {
+
+}

pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/service/impl/AppUserServiceImpl.java

@@ -0,0 +1,318 @@
+/*
+ *    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.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.app.api.dto.AppUserDTO;
+import com.bsd.pjcloud.app.api.dto.AppUserInfo;
+import com.bsd.pjcloud.app.api.entity.AppRole;
+import com.bsd.pjcloud.app.api.entity.AppUser;
+import com.bsd.pjcloud.app.api.entity.AppUserRole;
+import com.bsd.pjcloud.app.api.vo.AppUserExcelVO;
+import com.bsd.pjcloud.app.api.vo.AppUserVO;
+import com.bsd.pjcloud.app.mapper.AppUserMapper;
+import com.bsd.pjcloud.app.service.AppRoleService;
+import com.bsd.pjcloud.app.service.AppUserRoleService;
+import com.bsd.pjcloud.app.service.AppUserService;
+import com.bsd.pjcloud.common.core.constant.CacheConstants;
+import com.bsd.pjcloud.common.core.constant.CommonConstants;
+import com.bsd.pjcloud.common.core.constant.enums.LoginTypeEnum;
+import com.bsd.pjcloud.common.core.constant.enums.UserTypeEnum;
+import com.bsd.pjcloud.common.core.exception.ErrorCodes;
+import com.bsd.pjcloud.common.core.util.MsgUtils;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.excel.vo.ErrorMessage;
+import com.bsd.pjcloud.common.security.service.PjcloudUser;
+import com.bsd.pjcloud.common.security.util.SecurityUtils;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.BindingResult;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * app用户表
+ *
+ * @author aeizzz
+ * @date 2022-12-07 09:52:03
+ */
+@Service
+@AllArgsConstructor
+@Slf4j
+public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> implements AppUserService {
+
+	private static final PasswordEncoder ENCODER = new BCryptPasswordEncoder();
+
+	private final AppUserRoleService appUserRoleService;
+
+	private final StringRedisTemplate redisTemplate;
+
+	private final AppRoleService appRoleService;
+
+	private final CacheManager cacheManager;
+
+	/**
+	 * 更新用户
+	 * @param userDTO
+	 * @return
+	 */
+	@Override
+	@CacheEvict(value = CacheConstants.USER_DETAILS_MINI, key = "#userDTO.username")
+	public Boolean updateUser(AppUserDTO userDTO) {
+		AppUser appUser = new AppUser();
+		BeanUtils.copyProperties(userDTO, appUser);
+		if (StrUtil.isNotBlank(userDTO.getPassword())) {
+			appUser.setPassword(ENCODER.encode(userDTO.getPassword()));
+		}
+		this.updateById(appUser);
+
+		appUserRoleService.remove(Wrappers.<AppUserRole>lambdaQuery().eq(AppUserRole::getUserId, appUser.getUserId()));
+		userDTO.getRole().forEach(roleId -> {
+			AppUserRole appUserRole = new AppUserRole();
+			appUserRole.setRoleId(roleId);
+			appUserRole.setUserId(userDTO.getUserId());
+			appUserRole.insert();
+		});
+		return Boolean.TRUE;
+	}
+
+	/**
+	 * 新增用户
+	 * @param userDTO
+	 * @return
+	 */
+	@Override
+	public Boolean saveUser(AppUserDTO userDTO) {
+		AppUser appUser = new AppUser();
+		BeanUtils.copyProperties(userDTO, appUser);
+		appUser.setDelFlag(CommonConstants.STATUS_NORMAL);
+		appUser.setPassword(ENCODER.encode(userDTO.getPassword()));
+		baseMapper.insert(appUser);
+		// 如果角色为空，赋默认角色
+		if (CollUtil.isNotEmpty(userDTO.getRole())) {
+			List<AppUserRole> userRoleList = userDTO.getRole().stream().map(roleId -> {
+				AppUserRole userRole = new AppUserRole();
+				userRole.setUserId(appUser.getUserId());
+				userRole.setRoleId(roleId);
+				return userRole;
+			}).collect(Collectors.toList());
+			appUserRoleService.saveBatch(userRoleList);
+		}
+		return Boolean.TRUE;
+	}
+
+	/**
+	 * 查询全部的用户
+	 * @param appUser
+	 * @return
+	 */
+	@Override
+	public List<AppUserExcelVO> listUser(AppUserDTO appUser) {
+		List<AppUser> appUsers = baseMapper.selectList(null);
+		List<AppUserExcelVO> appUserExcelVOS = appUsers.stream().map(item -> {
+			AppUserExcelVO appUserExcelVO = new AppUserExcelVO();
+			BeanUtils.copyProperties(item, appUserExcelVO);
+			return appUserExcelVO;
+		}).collect(Collectors.toList());
+		return appUserExcelVOS;
+	}
+
+	@Override
+	public IPage getUsersWithRolePage(Page page, AppUserDTO appUserDTO) {
+		return baseMapper.getUserVosPage(page, appUserDTO);
+	}
+
+	@Override
+	public AppUserInfo findUserInfo(AppUser user) {
+		AppUserInfo info = new AppUserInfo();
+		info.setAppUser(user);
+		// 设置角色列表 （ID）
+		List<Long> roleIds = appRoleService.findRolesByUserId(user.getUserId())
+			.stream()
+			.map(AppRole::getRoleId)
+			.collect(Collectors.toList());
+		info.setRoles(ArrayUtil.toArray(roleIds, Long.class));
+
+		// 设置权限列表（menu.permission）
+		Set<String> permissions = new HashSet<>();
+		info.setPermissions(ArrayUtil.toArray(permissions, String.class));
+		return info;
+	}
+
+	@Override
+	@CacheEvict(value = CacheConstants.USER_DETAILS_MINI, key = "#userDto.username")
+	public R updateUserInfo(AppUserDTO userDto) {
+		// C端客户修改手机号需要判断验证码是否正确
+		PjcloudUser user = SecurityUtils.getUser();
+		if (UserTypeEnum.TOC.getStatus().equals(user.getUserType()) && StrUtil.isNotBlank(userDto.getPhone())) {
+			String key = CacheConstants.DEFAULT_CODE_KEY + LoginTypeEnum.APPSMS.getType() + StringPool.AT
+					+ userDto.getPhone();
+			String codeObj = redisTemplate.opsForValue().get(key);
+
+			if (!userDto.getMobileCode().equals(codeObj)) {
+				return R.failed("验证码错误");
+			}
+		}
+
+		// 更新密码
+		if (StrUtil.isNotBlank(userDto.getPassword())) {
+			userDto.setPassword(ENCODER.encode(userDto.getPassword()));
+		}
+
+		AppUser appUser = baseMapper.selectById(userDto.getUserId());
+		BeanUtils.copyProperties(userDto, appUser);
+		return R.ok(this.updateById(appUser));
+	}
+
+	@Override
+	public AppUserVO selectUserVoById(Long userId) {
+		return baseMapper.getUserVoById(userId);
+	}
+
+	/**
+	 * 删除user用户同时删除user-role关系表
+	 * @param ids userIds
+	 */
+	@Override
+	public Boolean deleteAppUserByIds(Long[] ids) {
+		Cache cache = cacheManager.getCache(CacheConstants.USER_DETAILS_MINI);
+		for (AppUser appUser : baseMapper.selectBatchIds(CollUtil.toList(ids))) {
+			cache.evict(appUser.getUsername());
+		}
+		// 删除用户关联表
+		this.appUserRoleService
+			.remove(Wrappers.<AppUserRole>lambdaQuery().in(AppUserRole::getUserId, CollUtil.toList(ids)));
+
+		this.removeBatchByIds(CollUtil.toList(ids));
+
+		return Boolean.TRUE;
+
+	}
+
+	@Override
+	public R registerAppUser(AppUserDTO appUser) {
+		List<AppUser> appUserList = baseMapper
+			.selectList(Wrappers.<AppUser>lambdaQuery().eq(AppUser::getPhone, appUser.getPhone()));
+
+		if (CollUtil.isNotEmpty(appUserList)) {
+			return R.failed("手机号已注册，请使用验证码直接登录");
+		}
+
+		String key = CacheConstants.DEFAULT_CODE_KEY + LoginTypeEnum.APPSMS.getType() + StringPool.AT
+				+ appUser.getPhone();
+		String codeObj = redisTemplate.opsForValue().get(key);
+
+		if (!appUser.getMobileCode().equals(codeObj)) {
+			return R.failed("验证码错误");
+		}
+
+		AppUser app = new AppUser();
+		BeanUtils.copyProperties(appUser, app);
+		appUser.setUsername(app.getPhone());
+		appUser.setDelFlag(CommonConstants.STATUS_NORMAL);
+		appUser.setPassword(ENCODER.encode(appUser.getPassword()));
+		baseMapper.insert(appUser);
+		return null;
+	}
+
+	/**
+	 * @param excelVOList
+	 * @param bindingResult
+	 * @return
+	 */
+	@Override
+	public R importUser(List<AppUserExcelVO> excelVOList, BindingResult bindingResult) {
+		// 通用校验获取失败的数据
+		List<ErrorMessage> errorMessageList = (List<ErrorMessage>) bindingResult.getTarget();
+
+		// 执行数据插入操作 组装 UserDto
+		for (AppUserExcelVO excel : excelVOList) {
+			// 个性化校验逻辑
+			List<AppUser> userList = this.list();
+			List<AppRole> roleList = appRoleService.list();
+
+			Set<String> errorMsg = new HashSet<>();
+			// 校验用户名是否存在
+			boolean exsitUserName = userList.stream()
+				.anyMatch(sysUser -> excel.getUsername().equals(sysUser.getUsername()));
+
+			if (exsitUserName) {
+				errorMsg.add(MsgUtils.getMessage(ErrorCodes.SYS_USER_USERNAME_EXISTING, excel.getUsername()));
+			}
+
+			// 判断输入的角色名称列表是否合法
+			List<String> roleNameList = StrUtil.split(excel.getRoleNameList(), StrUtil.COMMA);
+			List<AppRole> roleCollList = roleList.stream()
+				.filter(role -> roleNameList.stream().anyMatch(name -> role.getRoleName().equals(name)))
+				.collect(Collectors.toList());
+
+			if (roleCollList.size() != roleNameList.size()) {
+				errorMsg.add(MsgUtils.getMessage(ErrorCodes.SYS_ROLE_ROLENAME_INEXISTENCE, excel.getRoleNameList()));
+			}
+			// 数据合法情况
+			if (CollUtil.isEmpty(errorMsg)) {
+				insertExcelUser(excel, roleCollList);
+			}
+			else {
+				// 数据不合法情况
+				errorMessageList.add(new ErrorMessage(excel.getLineNum(), errorMsg));
+			}
+
+		}
+
+		if (CollUtil.isNotEmpty(errorMessageList)) {
+			return R.failed(errorMessageList);
+		}
+		return R.ok(null, MsgUtils.getMessage(ErrorCodes.SYS_USER_IMPORT_SUCCEED));
+
+	}
+
+	private void insertExcelUser(AppUserExcelVO excel, List<AppRole> roleCollList) {
+		AppUserDTO userDTO = new AppUserDTO();
+		userDTO.setUsername(excel.getUsername());
+		userDTO.setPhone(excel.getPhone());
+		userDTO.setNickname(excel.getNickname());
+		userDTO.setName(excel.getName());
+		userDTO.setEmail(excel.getEmail());
+		// 批量导入初始密码为手机号
+		userDTO.setPassword(userDTO.getPhone());
+		// 根据角色名称查询角色ID
+		List<Long> roleIdList = roleCollList.stream().map(AppRole::getRoleId).collect(Collectors.toList());
+		userDTO.setRole(roleIdList);
+		// 插入用户
+		this.saveUser(userDTO);
+	}
+
+}