commit 46d1c1d7eda1528fe1c6e2fd4a1cb440e62efcf6 Author: runner Date: Wed Aug 26 16:23:30 2026 +0800 trigger: verify valid_volumes after runner restart diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml new file mode 100644 index 0000000..8b0e971 --- /dev/null +++ b/.gitea/workflows/deploy.yml @@ -0,0 +1,81 @@ +# ============================================================= +# freedom-admin CI/CD 工作流（后端） +# 触发条件：push 到 master 分支时自动构建并部署 +# +# 环境（已确认）： +# - runner: local-runner (act_runner v0.6.1)，labels: ubuntu-latest +# - job 容器挂载 /var/run/docker.sock 与 /opt/freedom（由 runner-config.toml 的 volumes 提供） +# - Gitea 内网地址：host.docker.internal:3000（Gitea Actions 实例地址） +# - 部署目录：/opt/freedom/deploy（含 docker-compose.yml 与 .env） +# +# 前置条件（管理员一次性完成）： +# - 宿主 /opt/freedom/deploy/docker-compose.yml 与 .env 已就位（含 DB 凭据） +# ============================================================= +name: CI/CD Deploy (Admin) + +on: + push: + branches: + - master + workflow_dispatch: + +jobs: + build-and-deploy: + name: 构建后端镜像并部署 + runs-on: ubuntu-latest + container: + image: docker:24.0-cli + # 挂载与 host 解析：workflow 级 volumes/options + runner-config valid_volumes 白名单 + volumes: + - /opt/freedom:/opt/freedom + options: --add-host=host.docker.internal:host-gateway + steps: + - name: 安装 git + run: apk add --no-cache git + + - name: Debug 网络环境 + run: | + set -x + { + echo "=== /etc/hosts ===" + cat /etc/hosts + echo "=== getent hosts host.docker.internal ===" + getent hosts host.docker.internal || echo "NOT_RESOLVED" + echo "=== GITHUB_TOKEN len ===" + echo "len=${#GITHUB_TOKEN}" + echo "=== GITHUB_REPOSITORY ===" + echo "${GITHUB_REPOSITORY}" + echo "=== ping test ===" + wget -q -T 3 -O /dev/null http://host.docker.internal:3000/api/v1/version && echo HTTP_OK || echo HTTP_FAIL + } | tee /opt/freedom/workspace-debug.txt + + - name: 拉取 master 代码 + run: | + set -euo pipefail + rm -rf /opt/freedom/workspace-admin + git clone --depth 1 --branch master \ + "http://oauth2:${GITHUB_TOKEN}@host.docker.internal:3000/${GITHUB_REPOSITORY}.git" \ + /opt/freedom/workspace-admin + cd /opt/freedom/workspace-admin + echo "==> 已拉取代码，最新提交:" + git log -1 --oneline + env: + GITHUB_TOKEN: ${{ github.token }} + + - name: 构建后端镜像 + run: | + set -euo pipefail + docker build -t freedom-admin:latest /opt/freedom/workspace-admin + + - name: 部署后端服务 + run: | + set -euo pipefail + cd /opt/freedom/deploy + test -f docker-compose.yml || { echo "错误: 缺少 docker-compose.yml，请先初始化部署目录"; exit 1; } + test -f .env || { echo "错误: 缺少 .env，请先初始化部署目录"; exit 1; } + docker compose up -d --force-recreate backend + + - name: 确认部署结果 + run: | + cd /opt/freedom/deploy + docker compose ps backend diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f7d02bc --- /dev/null +++ b/.gitignore @@ -0,0 +1,36 @@ +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +/out/ + +### Maven ### +target/ + +### WorkBuddy ### +.workbuddy/ diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 0000000..a45eb6b --- /dev/null +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,118 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if (mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if (mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if (!outputFile.getParentFile().exists()) { + if (!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..642d572 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..168733b --- /dev/null +++ b/Dockerfile @@ -0,0 +1,47 @@ +# ============================================================= +# freedom-admin 后端镜像 +# 构建阶段：Maven 3.6.3 + JDK8 打包（使用阿里云镜像加速依赖下载） +# 运行阶段：JRE8 运行 jar +# ============================================================= +FROM maven:3.6.3-jdk-8 AS builder +WORKDIR /build + +# 配置 Maven 国内镜像源，加速依赖下载 +RUN mkdir -p /root/.m2 && \ + echo '' > /root/.m2/settings.xml && \ + echo '> /root/.m2/settings.xml && \ + echo ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' >> /root/.m2/settings.xml && \ + echo ' xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">' >> /root/.m2/settings.xml && \ + echo ' ' >> /root/.m2/settings.xml && \ + echo ' ' >> /root/.m2/settings.xml && \ + echo ' aliyun' >> /root/.m2/settings.xml && \ + echo ' central' >> /root/.m2/settings.xml && \ + echo ' Aliyun Maven' >> /root/.m2/settings.xml && \ + echo ' https://maven.aliyun.com/repository/central' >> /root/.m2/settings.xml && \ + echo ' ' >> /root/.m2/settings.xml && \ + echo ' ' >> /root/.m2/settings.xml && \ + echo '' >> /root/.m2/settings.xml + +# 复制 pom 与源码（利用 Docker 分层缓存） +COPY pom.xml . +COPY src ./src + +# 打包（跳过测试），产物 target/freedom-admin-1.0.1.jar +RUN mvn -B clean package -DskipTests + +# ---------- 运行阶段 ---------- +FROM openjdk:8-jre-slim +WORKDIR /app + +# 设置时区 +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ + echo 'Asia/Shanghai' > /etc/timezone + +# 复制构建产物 +COPY --from=builder /build/target/*.jar /app/app.jar + +# 对外暴露端口（与 application.yml server.port 一致） +EXPOSE 8800 + +# 启动。数据库等敏感配置通过环境变量注入（见 docker-compose / .env） +ENTRYPOINT ["java", "-jar", "/app/app.jar"] diff --git a/README.en.md b/README.en.md new file mode 100644 index 0000000..df809f0 --- /dev/null +++ b/README.en.md @@ -0,0 +1,36 @@ +# freedom-admin + +#### Description +十分钟毕设-内部项目 + +#### Software Architecture +Software architecture description + +#### Installation + +1. xxxx +2. xxxx +3. xxxx + +#### Instructions + +1. xxxx +2. xxxx +3. xxxx + +#### Contribution + +1. Fork the repository +2. Create Feat_xxx branch +3. Commit your code +4. Create Pull Request + + +#### Gitee Feature + +1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md +2. Gitee blog [blog.gitee.com](https://blog.gitee.com) +3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) +4. The most valuable open source project [GVP](https://gitee.com/gvp) +5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) +6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md new file mode 100644 index 0000000..75b7337 --- /dev/null +++ b/README.md @@ -0,0 +1,110 @@ +# Freedom Admin + +基于 **Spring Boot 2.7.10** 的后台管理系统后端服务，提供用户、角色、部门、权限等基础管理能力。 + +## 技术栈 + +| 分类 | 技术 | +| ---- | ---- | +| 核心框架 | Spring Boot 2.7.10 | +| 安全框架 | Spring Security 3.3.2 + JWT（jjwt 0.9.1） | +| ORM | MyBatis-Plus 3.5.7 + PageHelper 2.1.0 | +| 模板引擎 | Thymeleaf（登录页等） | +| 数据库 | MySQL 8.0（utf8mb4） | +| 连接池 | HikariCP | +| 其他 | Lombok、Fastjson、Guava、Spring Mail | + +## 项目结构 + +``` +freedom-admin +├── sql/ +│ └── init.sql # 数据库初始化脚本（建库建表 + 基础数据） +├── src/main/java/com/freedom/admin/ +│ ├── AdminApplication.java # 启动类 +│ ├── base/ # 基础类与通用返回结构 +│ ├── common/ # 通用常量 / 工具 +│ ├── config/ # Spring Security、JWT 等配置 +│ ├── controller/ # 控制器层 +│ ├── entity/ # 实体类 +│ ├── mapper/ # MyBatis-Plus Mapper +│ ├── service/ # 业务层 +│ └── util/ # 工具类 +└── src/main/resources/ + ├── mapper/ # MyBatis XML 映射文件 + ├── logback-spring.xml # 日志配置（控制台 UTF-8） + └── application.yml # 应用配置 +``` + +## 数据模型 + +| 表 | 说明 | +| -- | ---- | +| `t_sys_user` | 用户表（BCRYPT 密码加密） | +| `t_sys_dept` | 部门表（支持树形层级） | +| `t_sys_role` | 角色表 | +| `t_sys_permission` | 权限 / 菜单表（动态路由数据源） | +| `t_sys_user_role` | 用户-角色关联表 | +| `t_sys_role_permission` | 角色-权限关联表 | + +## 功能特性 + +- **用户管理**：用户注册、登录、JWT 认证、信息维护 +- **角色管理**：角色 CRUD、角色-权限绑定 +- **部门管理**：树形部门结构 +- **权限管理**：菜单 / 权限点维护，驱动前端动态路由 +- **邮件服务**：基于 Spring Mail 的邮件发送能力 +- **系统特性**：统一异常处理、PageHelper 分页、逻辑删除、接口权限控制 + +## 快速开始 + +### 环境要求 + +- JDK 1.8+ +- Maven 3.6.3+ +- MySQL 8.0+ + +### 1. 初始化数据库 + +```bash +mysql -u root -p < sql/init.sql +``` + +脚本会自动创建 `freedom_db` 数据库、全部业务表并写入基础数据（默认管理员账号 `admin` / `123456`）。 + +### 2. 修改数据库配置 + +编辑 `src/main/resources/application.yml`： + +```yaml +spring: + datasource: + url: jdbc:mysql://localhost:3306/freedom_db?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true + username: root + password: your_password +``` + +### 3. 启动服务 + +```bash +# 开发运行 +mvn spring-boot:run + +# 或打包运行 +mvn clean package -DskipTests +java -jar target/freedom-admin-1.0.1.jar +``` + +> Windows 下可直接使用 `start.bat` 启动（已自动设置控制台 UTF-8 编码，避免中文日志乱码）。 + +启动后服务地址：`http://localhost:8800` + +## 注意事项 + +- JWT 密钥与过期时间在 `application.yml` 的 `jwt` 节点配置，生产环境请务必更换密钥。 +- 邮件授权码请使用邮箱服务商提供的 SMTP 授权码，勿直接使用登录密码。 +- 表 / 列中文注释建议使用 UTF-8 编码执行脚本，避免乱码入库。 + +## License + +本项目仅用于内部学习与研究使用。 diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml new file mode 100644 index 0000000..9009165 --- /dev/null +++ b/deploy/docker-compose.yml @@ -0,0 +1,57 @@ +# ============================================================= +# freedom 前后端部署编排（初始化到宿主 /opt/freedom/deploy/） +# +# 使用方式（在 /opt/freedom/deploy/ 目录下执行）： +# docker compose up -d # 全量部署（首次） +# docker compose up -d backend # 仅部署/更新后端（CI 使用） +# docker compose up -d web # 仅部署/更新前端（CI 使用） +# docker compose down # 停止所有服务 +# docker compose logs -f # 查看日志 +# +# 前置：同目录下需存在 .env 文件（数据库凭据），由初始化脚本创建。 +# DB_URL= jdbc:mysql://:3306/freedom_db?...（本机可用 192.168.1.158） +# DB_USERNAME= root +# DB_PASSWORD= <密码> +# +# 网络说明： +# - web（前端 Nginx）对外暴露 80 端口，是统一入口 +# - backend（后端）仅内网网络，通过服务名 backend:8800 被 Nginx 反代 +# ============================================================= +services: + # ---------------- 后端 ---------------- + # 服务名固定为 backend（前端 nginx.conf 中 proxy_pass http://backend:8800） + backend: + image: freedom-admin:${IMAGE_TAG:-latest} + container_name: freedom-admin + restart: unless-stopped + # 后端不直接暴露公网，仅加入内部网络供 Nginx 反代 + expose: + - "8800" + environment: + # 数据库连接（来自 .env，CI 部署时读取） + DB_URL: ${DB_URL} + DB_USERNAME: ${DB_USERNAME} + DB_PASSWORD: ${DB_PASSWORD} + TZ: Asia/Shanghai + volumes: + - ./logs/backend:/app/logs + networks: + - freedom-net + + # ---------------- 前端（统一入口） ---------------- + web: + image: freedom-web:${IMAGE_TAG:-latest} + container_name: freedom-web + restart: unless-stopped + ports: + - "80:80" + environment: + TZ: Asia/Shanghai + depends_on: + - backend + networks: + - freedom-net + +networks: + freedom-net: + driver: bridge diff --git a/mvnw b/mvnw new file mode 100644 index 0000000..a16b543 --- /dev/null +++ b/mvnw @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..c8d4337 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..8f0277f --- /dev/null +++ b/pom.xml @@ -0,0 +1,180 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.7.10 + + + com.freedom + freedom-admin + 1.0.1 + freedom-admin + freedom-admin + + + 1.8 + 3.6.3 + 3.1.2.RELEASE + 1.2.83 + 3.11 + 8.0.33 + + + + + org.springframework.boot + spring-boot-starter-security + 3.3.2 + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-web + + + org.thymeleaf.extras + thymeleaf-extras-springsecurity5 + ${thymeleaf-extras-springsecurity5.version} + + + mysql + mysql-connector-java + ${mysql-connector-java.version} + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.security + spring-security-test + test + + + + org.springframework.boot + spring-boot-starter-mail + + + + com.baomidou + mybatis-plus-boot-starter + 3.5.7 + + + + com.github.pagehelper + pagehelper-spring-boot-starter + 2.1.0 + + + org.mybatis + mybatis + + + org.mybatis + mybatis-spring + + + + + + io.jsonwebtoken + jjwt + 0.9.1 + + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + + org.apache.commons + commons-collections4 + 4.4 + + + + com.ibeetl + beetl + 3.16.2.RELEASE + + + + com.google.guava + guava + 32.1.2-jre + + + + com.alibaba + fastjson + ${fastjson.version} + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 1.4.1 + + + enforce + + enforce + + + + + ${maven.version} + + + ${java.version} + + + + org.jboss.netty + org.codehaus.groovy + + true + + + + + + + + + + + diff --git a/sql/init.sql b/sql/init.sql new file mode 100644 index 0000000..15cd8ff --- /dev/null +++ b/sql/init.sql @@ -0,0 +1,174 @@ +-- ============================================================ +-- freedom 系统初始化脚本 +-- 数据库: freedom_db +-- 目标: 远程 MySQL 124.221.214.237:3306 +-- 说明: 需在数据库外部执行 `CREATE DATABASE` 权限 +-- ============================================================ + +CREATE DATABASE IF NOT EXISTS `freedom_db` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +USE `freedom_db`; + +-- 外键约束关闭 +SET FOREIGN_KEY_CHECKS = 0; + +-- ============================================================ +-- 1. 用户表 t_sys_user +-- ============================================================ +DROP TABLE IF EXISTS `t_sys_user`; +CREATE TABLE `t_sys_user` ( + `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键', + `username` VARCHAR(50) NOT NULL COMMENT '登录用户名', + `password` VARCHAR(100) NOT NULL COMMENT '登陆密码', + `encode_type` VARCHAR(20) DEFAULT 'BCRYPT' COMMENT '加密方式（默认BCRYPT）', + `user_type` VARCHAR(20) DEFAULT NULL COMMENT '用户类型', + `nickname` VARCHAR(50) DEFAULT NULL COMMENT '用户昵称', + `avatar` VARCHAR(255) DEFAULT NULL COMMENT '用户头像', + `phone` VARCHAR(20) DEFAULT NULL COMMENT '手机号', + `email` VARCHAR(100) DEFAULT NULL COMMENT '电子邮箱', + `signature` VARCHAR(255) DEFAULT NULL COMMENT '个性签名', + `status` INT DEFAULT 0 COMMENT '状态', + `create_by` VARCHAR(50) DEFAULT NULL COMMENT '创建者', + `create_date` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_by` VARCHAR(50) DEFAULT NULL COMMENT '更新者', + `update_date` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `del_flag` TINYINT DEFAULT 0 COMMENT '删除标记', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_username` (`username`) +) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8mb4 COMMENT='用户表'; + +-- ============================================================ +-- 2. 部门表 t_sys_dept +-- ============================================================ +DROP TABLE IF EXISTS `t_sys_dept`; +CREATE TABLE `t_sys_dept` ( + `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键', + `parent_id` BIGINT DEFAULT 0 COMMENT '父ID', + `dept_code` VARCHAR(50) DEFAULT NULL COMMENT '编码', + `dept_name` VARCHAR(100) NOT NULL COMMENT '名称', + `dept_desc` VARCHAR(255) DEFAULT NULL COMMENT '描述', + `level` INT DEFAULT 1 COMMENT '级别', + `sort` INT DEFAULT 0 COMMENT '排序', + `create_by` VARCHAR(50) DEFAULT NULL COMMENT '创建者', + `create_date` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_by` VARCHAR(50) DEFAULT NULL COMMENT '更新者', + `update_date` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `del_flag` TINYINT DEFAULT 0 COMMENT '删除标记', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8mb4 COMMENT='部门表'; + +-- ============================================================ +-- 3. 角色表 t_sys_role +-- ============================================================ +DROP TABLE IF EXISTS `t_sys_role`; +CREATE TABLE `t_sys_role` ( + `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键', + `role_name` VARCHAR(50) NOT NULL COMMENT '角色名称', + `role_code` VARCHAR(50) DEFAULT NULL COMMENT '角色编号', + `role_desc` VARCHAR(255) DEFAULT NULL COMMENT '角色描述', + `is_default` VARCHAR(10) DEFAULT '0' COMMENT '默认角色', + `dept_id` BIGINT DEFAULT NULL COMMENT '该角色归属部门', + `sort` INT DEFAULT 0 COMMENT '角色排序', + `create_by` VARCHAR(50) DEFAULT NULL COMMENT '创建者', + `create_date` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_by` VARCHAR(50) DEFAULT NULL COMMENT '更新者', + `update_date` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `del_flag` TINYINT DEFAULT 0 COMMENT '删除标记', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8mb4 COMMENT='角色表'; + +-- ============================================================ +-- 4. 权限表 t_sys_permission +-- ============================================================ +DROP TABLE IF EXISTS `t_sys_permission`; +CREATE TABLE `t_sys_permission` ( + `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键', + `parent_id` BIGINT DEFAULT 0 COMMENT '父ID', + `permission_code` VARCHAR(50) DEFAULT NULL COMMENT '编码', + `permission_name` VARCHAR(100) NOT NULL COMMENT '名称', + `permission_desc` VARCHAR(255) DEFAULT NULL COMMENT '描述', + `level` INT DEFAULT 1 COMMENT '级别', + `icon` VARCHAR(100) DEFAULT NULL COMMENT '图标', + `url` VARCHAR(255) DEFAULT NULL COMMENT '链接地址', + `component` VARCHAR(255) DEFAULT NULL COMMENT '组件地址', + `sort` INT DEFAULT 0 COMMENT '排序', + `create_by` VARCHAR(50) DEFAULT NULL COMMENT '创建者', + `create_date` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_by` VARCHAR(50) DEFAULT NULL COMMENT '更新者', + `update_date` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `del_flag` TINYINT DEFAULT 0 COMMENT '删除标记', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8mb4 COMMENT='权限表'; + +-- ============================================================ +-- 5. 角色权限关联表 t_sys_role_permission +-- ============================================================ +DROP TABLE IF EXISTS `t_sys_role_permission`; +CREATE TABLE `t_sys_role_permission` ( + `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键', + `role_id` BIGINT NOT NULL COMMENT '角色ID', + `permission_id` BIGINT NOT NULL COMMENT '权限ID', + `create_by` VARCHAR(50) DEFAULT NULL COMMENT '创建者', + `create_date` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + PRIMARY KEY (`id`), + KEY `idx_role_permission_role` (`role_id`), + KEY `idx_role_permission_perm` (`permission_id`) +) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8mb4 COMMENT='角色权限关联表'; + +-- ============================================================ +-- 6. 用户角色关联表 t_sys_user_role +-- ============================================================ +DROP TABLE IF EXISTS `t_sys_user_role`; +CREATE TABLE `t_sys_user_role` ( + `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键', + `user_id` BIGINT NOT NULL COMMENT '用户ID', + `role_id` BIGINT NOT NULL COMMENT '角色ID', + `create_by` VARCHAR(50) DEFAULT NULL COMMENT '创建者', + `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + PRIMARY KEY (`id`), + KEY `idx_user_role_user` (`user_id`), + KEY `idx_user_role_role` (`role_id`) +) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8mb4 COMMENT='用户角色关联表'; + +SET FOREIGN_KEY_CHECKS = 1; + +-- ============================================================ +-- 基础数据 +-- ============================================================ + +-- 部门：总公司 / 技术部 +INSERT INTO `t_sys_dept` (`id`, `parent_id`, `dept_code`, `dept_name`, `dept_desc`, `level`, `sort`, `create_by`, `create_date`, `del_flag`) +VALUES + (1, 0, 'HEAD', '总公司', '总公司', 1, 1, 'admin', NOW(), 0), + (2, 1, 'TECH', '技术部', '技术部', 2, 1, 'admin', NOW(), 0); + +-- 用户：admin / 123456 (BCRYPT) +INSERT INTO `t_sys_user` (`id`, `username`, `password`, `encode_type`, `user_type`, `nickname`, `avatar`, `phone`, `email`, `signature`, `status`, `create_by`, `create_date`, `del_flag`) +VALUES + (1, 'admin', '$2a$10$re0cfTCIYGaxSjme0fTNEOk4K4hGNDwYNTjJ3dz6R8SZWfGV994M2', 'BCRYPT', 'SYSTEM', '超级管理员', NULL, '13800000000', 'admin@freedom.com', 'Freedom 系统管理员', 0, 'admin', NOW(), 0); + +-- 角色：超级管理员 +INSERT INTO `t_sys_role` (`id`, `role_name`, `role_code`, `role_desc`, `is_default`, `dept_id`, `sort`, `create_by`, `create_date`, `del_flag`) +VALUES + (1, '超级管理员', 'admin', '超级管理员，拥有所有权限', '1', 1, 1, 'admin', NOW(), 0); + +-- 权限菜单 +INSERT INTO `t_sys_permission` (`id`, `parent_id`, `permission_code`, `permission_name`, `permission_desc`, `level`, `icon`, `url`, `component`, `sort`, `create_by`, `create_date`, `del_flag`) +VALUES + (1, 0, 'system', '系统管理', '系统管理菜单', 1, 'ios-settings', '', '', 1, 'admin', NOW(), 0), + (2, 1, 'sys:user', '用户管理', '用户管理', 2, 'ios-person', '/sys/user', 'sys/user/user-list', 1, 'admin', NOW(), 0), + (3, 1, 'sys:role', '角色管理', '角色管理', 2, 'ios-people', '/sys/role', 'sys/role/role-list', 2, 'admin', NOW(), 0), + (4, 1, 'sys:dept', '部门管理', '部门管理', 2, 'ios-home', '/sys/dept', 'sys/dept/dept-list', 3, 'admin', NOW(), 0), + (5, 1, 'sys:permission', '权限管理', '权限管理', 2, 'ios-key', '/sys/permission', 'sys/permission/permission-list', 4, 'admin', NOW(), 0); + +-- 用户-角色关联：admin -> 超级管理员 +INSERT INTO `t_sys_user_role` (`id`, `user_id`, `role_id`, `create_by`, `create_time`) +VALUES (1, 1, 1, 'admin', NOW()); + +-- 角色-权限关联：超级管理员 -> 所有权限 +INSERT INTO `t_sys_role_permission` (`id`, `role_id`, `permission_id`, `create_by`, `create_date`) +VALUES + (1, 1, 1, 'admin', NOW()), + (2, 1, 2, 'admin', NOW()), + (3, 1, 3, 'admin', NOW()), + (4, 1, 4, 'admin', NOW()), + (5, 1, 5, 'admin', NOW()); diff --git a/src/main/java/com/freedom/admin/AdminApplication.java b/src/main/java/com/freedom/admin/AdminApplication.java new file mode 100644 index 0000000..0be132b --- /dev/null +++ b/src/main/java/com/freedom/admin/AdminApplication.java @@ -0,0 +1,20 @@ +package com.freedom.admin; + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @author zhangjiaxun + * @date 2021/2/8 15:39 + * @description 系统启动类 + */ +@SpringBootApplication +@MapperScan("com.freedom.admin.mapper") +public class AdminApplication { + + public static void main(String[] args) { + SpringApplication.run(AdminApplication.class, args); + } + +} diff --git a/src/main/java/com/freedom/admin/base/BaseController.java b/src/main/java/com/freedom/admin/base/BaseController.java new file mode 100644 index 0000000..3820503 --- /dev/null +++ b/src/main/java/com/freedom/admin/base/BaseController.java @@ -0,0 +1,53 @@ +package com.freedom.admin.base; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.freedom.admin.entity.TSysUser; +import com.freedom.admin.service.TSysUserService; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; + +/** + * @author zhangjiaxun + * @date 2021/2/2 17:47 + * @description + */ +@Log4j2 +public class BaseController { + + @Autowired + private TSysUserService tSysUserService; + + /** + * 获取当前登录用户账号 + * */ + public String getUsername() { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if(!authentication.isAuthenticated()){ + return null; + } + UserDetails userDetails = (UserDetails)authentication.getPrincipal(); + return userDetails.getUsername(); + } + + /** + * 获取当前用户信息 + * */ + public TSysUser getUser() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("username",getUsername()); + return tSysUserService.getOne(queryWrapper); + } + + /** + * 获取当前用户ID + * */ + public Long getUserId() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("username",getUsername()); + return tSysUserService.getOne(queryWrapper).getId(); + } + +} diff --git a/src/main/java/com/freedom/admin/common/Result.java b/src/main/java/com/freedom/admin/common/Result.java new file mode 100644 index 0000000..bdb8cbf --- /dev/null +++ b/src/main/java/com/freedom/admin/common/Result.java @@ -0,0 +1,99 @@ +package com.freedom.admin.common; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author zhangjiaxun + * @date 2021/1/27 13:55 + * @description 统一返回结果的类 + */ +@Data +public class Result implements Serializable { + + /** + * 是否成功 + * */ + private Boolean success; + + /** + * 返回码 + * */ + private Integer code; + + /** + * 返回消息 + * */ + private String message; + + /** + * 总数 + * */ + private Integer count; + + /** + * 返回数据 + * */ + private T data; + + /** + * token + * */ + private String token; + + /** + * 构造方法私有 + * */ + private Result() {} + + /** + * 成功静态方法 + * */ + public static Result ok() { + Result r = new Result(); + r.setSuccess(true); + r.setCode(ResultCode.SUCCESS.getCode()); + r.setMessage(ResultCode.SUCCESS.getDesc()); + return r; + } + + /** + * 失败静态方法 + * */ + public static Result error() { + Result r = new Result(); + r.setSuccess(false); + r.setCode(ResultCode.ERROR.getCode()); + r.setMessage(ResultCode.ERROR.getDesc()); + return r; + } + + /** + * 设置message + * */ + public Result message(String message){ + this.setMessage(message); + return this; + } + + /** + * 设置code + * */ + public Result code(Integer code) { + this.setCode(code); + return this; + } + + public Result token(String token){ + this.token = token; + return this; + } + + public Result setData(T data) { + this.data = data; + return this; + } + + +} diff --git a/src/main/java/com/freedom/admin/common/ResultCode.java b/src/main/java/com/freedom/admin/common/ResultCode.java new file mode 100644 index 0000000..f527789 --- /dev/null +++ b/src/main/java/com/freedom/admin/common/ResultCode.java @@ -0,0 +1,26 @@ +package com.freedom.admin.common; + +import lombok.Getter; + +/** + * @author zhangjiaxun + * @date 2021/1/27 14:01 + * @description 返回码值 + */ +@Getter +public enum ResultCode { + + SUCCESS(200,"请求成功"), + ERROR(500,"请求失败") + ; + + private Integer code; + + private String desc; + + ResultCode(Integer code, String desc) { + this.code = code; + this.desc = desc; + } + +} diff --git a/src/main/java/com/freedom/admin/config/GlobalExceptionHandler.java b/src/main/java/com/freedom/admin/config/GlobalExceptionHandler.java new file mode 100644 index 0000000..e71daba --- /dev/null +++ b/src/main/java/com/freedom/admin/config/GlobalExceptionHandler.java @@ -0,0 +1,39 @@ +package com.freedom.admin.config; + +import com.freedom.admin.common.Result; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * @author zhangjiaxun + * @date 2021/1/27 14:19 + * @description 全局异常处理 + */ +@ControllerAdvice +@Slf4j +public class GlobalExceptionHandler { + + /** + * 指定处理Exception.class异常 + * */ + @ExceptionHandler(Exception.class) + @ResponseBody + public Result error(Exception e){ + e.printStackTrace(); + return Result.error().message("执行了全局异常"); + } + + /** + * 指定处理MyException.class异常 + * */ + @ExceptionHandler(MyException.class) + @ResponseBody + public Result error(MyException e){ + log.error(e.getMessage()); + e.printStackTrace(); + return Result.error().code(e.getCode()).message(e.getMessage()); + } + +} diff --git a/src/main/java/com/freedom/admin/config/JwtAuthenticationTokenFilter.java b/src/main/java/com/freedom/admin/config/JwtAuthenticationTokenFilter.java new file mode 100644 index 0000000..57787cb --- /dev/null +++ b/src/main/java/com/freedom/admin/config/JwtAuthenticationTokenFilter.java @@ -0,0 +1,61 @@ +package com.freedom.admin.config; + +import com.freedom.admin.service.UserService; +import com.freedom.admin.utils.JwtUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * @author zhangjiaxun + * @date 2021/2/1 10:35 + * @description 继承OncePerRequestFilter以确保请求只被此过滤器执行一次 + */ +@Component +@Slf4j +public class JwtAuthenticationTokenFilter extends OncePerRequestFilter { + + @Value("${jwt.header}") + private String header; + @Autowired + private UserService userService; + @Autowired + private JwtUtils jwtUtils; + + @Override + protected void doFilterInternal(HttpServletRequest request, + HttpServletResponse response, + FilterChain filterChain) throws ServletException, IOException { + log.info("==============当前的请求路径url【{}】",request.getRequestURL()); + // token + String token = request.getHeader(header); + if (token !=null){ + // 获取username + String username = jwtUtils.getUsernameFormToken(token); + // 当username不为空且spring-security用户认证信息为空，进行认证 + if (username !=null && SecurityContextHolder.getContext().getAuthentication() ==null){ + UserDetails userDetails = userService.loadUserByUsername(username); + if (userDetails != null) { + UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails,null,userDetails.getAuthorities()); + authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request)); + SecurityContextHolder.getContext().setAuthentication(authentication); + } + } + } + // 调用下一个过滤器，沿着过滤器链 + filterChain.doFilter(request,response); + } + +} diff --git a/src/main/java/com/freedom/admin/config/MyAuthenticationFailureHandler.java b/src/main/java/com/freedom/admin/config/MyAuthenticationFailureHandler.java new file mode 100644 index 0000000..5d73cd9 --- /dev/null +++ b/src/main/java/com/freedom/admin/config/MyAuthenticationFailureHandler.java @@ -0,0 +1,35 @@ +package com.freedom.admin.config; + +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.authentication.AuthenticationFailureHandler; +import org.springframework.stereotype.Component; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * @author zhangjiaxun + * @date 2021/1/5 17:40 + * @description 对安全验证失败的请求进行响应处理 + */ +@Component +public class MyAuthenticationFailureHandler implements AuthenticationFailureHandler { + + @Override + public void onAuthenticationFailure(HttpServletRequest request, + HttpServletResponse response, + AuthenticationException e) throws IOException { + //修改编码格式 + request.setCharacterEncoding("utf-8"); + response.setContentType("application/json"); + + if (e instanceof BadCredentialsException){ + response.getWriter().write("用户名或密码错误"); + }else { + response.getWriter().write("登录失败！"); + } + + } +} diff --git a/src/main/java/com/freedom/admin/config/MyAuthenticationSuccessHandler.java b/src/main/java/com/freedom/admin/config/MyAuthenticationSuccessHandler.java new file mode 100644 index 0000000..d533664 --- /dev/null +++ b/src/main/java/com/freedom/admin/config/MyAuthenticationSuccessHandler.java @@ -0,0 +1,44 @@ +package com.freedom.admin.config; + +import com.alibaba.fastjson.JSON; +import com.freedom.admin.common.Result; +import com.freedom.admin.utils.JwtUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.web.authentication.AuthenticationSuccessHandler; +import org.springframework.stereotype.Component; + + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * @author zhangjiaxun + * @date 2021/1/5 17:40 + * @description 对安全验证成功的请求进行响应处理 + */ +@Component +@Slf4j +public class MyAuthenticationSuccessHandler implements AuthenticationSuccessHandler { + + @Autowired + private JwtUtils jwtUtils; + + @Override + public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException { + + UserDetails userDetails = (UserDetails)authentication.getPrincipal(); + // 生成token + String token = jwtUtils.generateToken(userDetails.getUsername()); + Result result = Result.ok().message("登录成功").token(token); + // 修改编码格式 + response.setCharacterEncoding("utf-8"); + response.setContentType("application/json"); + // 输出结果 + response.getWriter().write(JSON.toJSONString(result)); + } + +} diff --git a/src/main/java/com/freedom/admin/config/MyException.java b/src/main/java/com/freedom/admin/config/MyException.java new file mode 100644 index 0000000..05c6293 --- /dev/null +++ b/src/main/java/com/freedom/admin/config/MyException.java @@ -0,0 +1,27 @@ +package com.freedom.admin.config; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author zhangjiaxun + * @date 2021/1/27 14:25 + * @description 自定义异常 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class MyException extends RuntimeException { + + /** + * 状态码 + * */ + private Integer code; + + /** + * 状态码 + * */ + private String message; + +} diff --git a/src/main/java/com/freedom/admin/config/RestAuthenticationEntryPoint.java b/src/main/java/com/freedom/admin/config/RestAuthenticationEntryPoint.java new file mode 100644 index 0000000..d2a5e6c --- /dev/null +++ b/src/main/java/com/freedom/admin/config/RestAuthenticationEntryPoint.java @@ -0,0 +1,29 @@ +package com.freedom.admin.config; + +import com.alibaba.fastjson.JSON; +import com.freedom.admin.common.Result; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.stereotype.Component; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * @author zhangjiaxun + * @date 2021/2/1 14:03 + * @description 当未登录或者token失效访问接口时，自定义的返回结果 + */ +@Component +public class RestAuthenticationEntryPoint implements AuthenticationEntryPoint { + + @Override + public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e) throws IOException { + response.setCharacterEncoding("UTF-8"); + response.setContentType("application/json"); + response.getWriter().println(JSON.toJSONString(Result.error().message("尚未登录，或者登录过期 " + e.getMessage()))); + response.getWriter().flush(); + } + +} diff --git a/src/main/java/com/freedom/admin/config/WebSecurityConfig.java b/src/main/java/com/freedom/admin/config/WebSecurityConfig.java new file mode 100644 index 0000000..c7d0196 --- /dev/null +++ b/src/main/java/com/freedom/admin/config/WebSecurityConfig.java @@ -0,0 +1,124 @@ +package com.freedom.admin.config; + +import com.freedom.admin.service.impl.UserServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.builders.WebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.CorsConfigurationSource; + +/** + * @author zhangjiaxun + * @date 2021/1/5 17:40 + * @description + */ +@Configuration +public class WebSecurityConfig extends WebSecurityConfigurerAdapter { + + /** + * 无权限拦截器 + */ + @Autowired + private RestAuthenticationEntryPoint restAuthenticationEntryPoint; + + /** + * 登录成功逻辑 + */ + @Autowired + private MyAuthenticationSuccessHandler myAuthenticationSuccessHandler; + + /** + * 登录失败逻辑 + */ + @Autowired + private MyAuthenticationFailureHandler myAuthenticationFailureHandler; + + /** + * 继承OncePerRequestFilter以确保请求只被此过滤器执行一次 + */ + @Autowired + private JwtAuthenticationTokenFilter jwtAuthenticationTokenFilter; + + @Autowired + UserServiceImpl userDetailsService; + + @Override + public void configure(WebSecurity web) throws Exception { + // 放行静态资源 + web.ignoring().antMatchers("/login.html", "/pear.config.json", + "/admin/css/**","/admin/images/**", + "/component/code/**","/component/layui/**","/component/pear/**"); + } + + @Override + protected void configure(HttpSecurity http) throws Exception { + http.cors().and() + .csrf().disable() + .sessionManagement() + // 基于token，所以不需要session + .sessionCreationPolicy(SessionCreationPolicy.STATELESS) + .and() + .httpBasic() + .authenticationEntryPoint(restAuthenticationEntryPoint) + .and() + .authorizeRequests()// 验证码允许匿名访问 + .antMatchers("/email-sender/sendEmailVerificationCode","/sys-user/register") + .anonymous() + .and() + .formLogin() + .loginProcessingUrl("/login") + .successHandler(myAuthenticationSuccessHandler) + .failureHandler(myAuthenticationFailureHandler) + .usernameParameter("username") + .passwordParameter("password") + .and() + .logout() + .logoutUrl("/logout") + .and() + .rememberMe() + .rememberMeParameter("rememberme") + .and() + .addFilterBefore(jwtAuthenticationTokenFilter, UsernamePasswordAuthenticationFilter.class); + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth.userDetailsService(userDetailsService).passwordEncoder(passwordEncoder()); + } + + /** + * 跨越配置 + */ + @Bean + public CorsConfigurationSource corsConfigurationSource() { + return httpServletRequest -> { + CorsConfiguration cfg = new CorsConfiguration(); + cfg.addAllowedHeader("*"); + cfg.addAllowedMethod("*"); + // 设置允许跨域请求的域名 + cfg.addAllowedOrigin("http://localhost:8080"); + // 允许任何请求 + cfg.addAllowedHeader("*"); + cfg.addExposedHeader("token"); + // 是否允许证书 + cfg.setAllowCredentials(true); + // + cfg.checkOrigin("http://localhost:8080"); + return cfg; + }; + } + +} diff --git a/src/main/java/com/freedom/admin/controller/TSysDeptController.java b/src/main/java/com/freedom/admin/controller/TSysDeptController.java new file mode 100644 index 0000000..997d31a --- /dev/null +++ b/src/main/java/com/freedom/admin/controller/TSysDeptController.java @@ -0,0 +1,135 @@ +package com.freedom.admin.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.freedom.admin.common.Result; +import com.freedom.admin.entity.TSysDept; +import com.freedom.admin.service.TSysDeptService; +import lombok.extern.log4j.Log4j2; +import org.apache.commons.lang3.StringUtils; +import org.apache.ibatis.annotations.Param; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.security.PermitAll; +import java.util.List; +import java.util.Map; + +/** + * @author zhangjiaxun + * @date 2021/2/8 15:39 + * @description 系统-部门表 + */ +@RestController +@RequestMapping("/sys-dept") +@Log4j2 +public class TSysDeptController { + + @Autowired + private TSysDeptService tSysDeptService; + + /** + * 列表查询 + * + * @return Result + */ + @RequestMapping("/findPageList") + @PermitAll + public Result findPageList(@Param("pageNum") long pageNum, + @Param("pageSize") long pageSize, + TSysDept tSysDept){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("del_flag",0); + queryWrapper.eq(tSysDept.getParentId() != null,"parent_id",tSysDept.getParentId()); + queryWrapper.like(StringUtils.isNotBlank(tSysDept.getDeptName()),"dept_name", tSysDept.getDeptName()); + Page page = tSysDeptService.page(new Page<>(pageNum,pageSize), queryWrapper); + return Result.ok().setData(page); + } + + + /** + * 获取部门Tree数据 + * + * @return Result + */ + @RequestMapping("/getTreeList") + @PermitAll + public Result getTreeList() { + List> treeList = tSysDeptService.getTreeList(); + return Result.ok().setData(treeList); + } + + /** + * 获取部门TreeSelect数据 + * + * @return Result + */ + @RequestMapping("/getTreeSelectList") + @PermitAll + public Result getTreeSelectList() { + List> treeSelectListList = tSysDeptService.getTreeSelectList(); + return Result.ok().setData(treeSelectListList); + } + + /** + * 添加 + * + * @param tSysDept + * @return Result + */ + @RequestMapping("/add") + @PermitAll + public Result add(TSysDept tSysDept) { + boolean save = tSysDeptService.save(tSysDept); + return Result.ok().setData(save); + } + + /** + * 更新 + * + * @param tSysDept + * @return Result + */ + @RequestMapping("/update") + @PermitAll + public Result update(TSysDept tSysDept) { + log.info("先查询出父级部门，将要更新的子级部门level+1"); + if (tSysDept.getParentId() != null){ + Long parentId = 0L; + if (parentId.equals(tSysDept.getParentId())){ + tSysDept.setLevel(1); + }else { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("id",tSysDept.getParentId()); + TSysDept parentDept = tSysDeptService.getOne(queryWrapper); + if (parentDept == null){ + return Result.error().message("父级部门不存在"); + } + tSysDept.setLevel(parentDept.getLevel() + 1); + } + } + boolean update = tSysDeptService.updateById(tSysDept); + return Result.ok().setData(update); + } + + /** + * 删除部门（逻辑删除） + * + * @param tSysDept + * @return Result + */ + @RequestMapping("/delete") + @PermitAll + public Result delete(TSysDept tSysDept) { + if (tSysDept.getId() == null){ + return Result.error().message("部门ID不能为空"); + } + TSysDept dept = new TSysDept(); + dept.setId(tSysDept.getId()); + dept.setDelFlag(true); + boolean update = tSysDeptService.updateById(dept); + return Result.ok().setData(update); + } + +} diff --git a/src/main/java/com/freedom/admin/controller/TSysPermissionController.java b/src/main/java/com/freedom/admin/controller/TSysPermissionController.java new file mode 100644 index 0000000..6b030bd --- /dev/null +++ b/src/main/java/com/freedom/admin/controller/TSysPermissionController.java @@ -0,0 +1,179 @@ +package com.freedom.admin.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.freedom.admin.base.BaseController; +import com.freedom.admin.common.Result; +import com.freedom.admin.entity.TSysDept; +import com.freedom.admin.entity.TSysPermission; +import com.freedom.admin.service.TSysPermissionService; +import lombok.extern.log4j.Log4j2; +import org.apache.commons.lang3.StringUtils; +import org.apache.ibatis.annotations.Param; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.security.PermitAll; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * @author zhangjiaxun + * @date 2021/2/4 11:00 + * @description 控制层-系统权限 + */ +@RestController +@RequestMapping("/sys-permission") +@Log4j2 +public class TSysPermissionController extends BaseController { + + @Autowired + TSysPermissionService tSysPermissionService; + + /** + * 登录成功时，获取登录用户权限数据 + * + * @return Result + * */ + @RequestMapping("/getPermissionList") + @PreAuthorize("permitAll()") + public Result> getPermissionList(){ + List> permissionList = tSysPermissionService.getPermissionListByUserId(getUser().getId()); + return Result.ok().setData(permissionList); + } + + /** + * 获取权限tree数据 + * + * @return Result + */ + @RequestMapping("/getTreeList") + @PreAuthorize("permitAll()") + public Result> getTreeList(){ + List> treeList = tSysPermissionService.getTreeList(); + return Result.ok().setData(treeList); + } + + /** + * 获取权限TreeSelect数据 + * + * @return Result + */ + @RequestMapping("/getTreeSelectList") + @PermitAll + public Result getTreeSelectList() { + List> treeSelectListList = tSysPermissionService.getTreeSelectList(); + return Result.ok().setData(treeSelectListList); + } + + /** + * 菜单权限页面-获取菜单列表数据 + * + * @return Result + */ + @RequestMapping("/findPageList") + @PreAuthorize("permitAll()") + public Result findPageList(@Param("pageNum") long pageNum, + @Param("pageSize") long pageSize, + TSysPermission tSysPermission){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("del_flag",0); + queryWrapper.eq(tSysPermission.getParentId() != null,"parent_id", tSysPermission.getParentId()); + queryWrapper.like(StringUtils.isNotBlank(tSysPermission.getPermissionName()),"permission_name", tSysPermission.getPermissionName()); + Page page = tSysPermissionService.page(new Page<>(pageNum,pageSize), queryWrapper); + return Result.ok().setData(page); + } + + /** + * 菜单权限页面-获取菜单树 + * + * @return Result + */ + @RequestMapping("/getTreeListByRoleId") + @PreAuthorize("permitAll()") + public Result getTreeListByRoleId(@Param("roleId") Long roleId){ + List> treeList = tSysPermissionService.getTreeListByRoleId(roleId); + log.info("treeList:{}",treeList); + return Result.ok().setData(treeList); + } + + /** + * 添加 + * + * @param tSysPermission + * @return Result + */ + @RequestMapping("/add") + @PermitAll + public Result add(TSysPermission tSysPermission) { + boolean save = tSysPermissionService.save(tSysPermission); + return Result.ok().setData(save); + } + + /** + * 更新 + * + * @param tSysPermission + * @return Result + */ + @RequestMapping("/update") + @PermitAll + public Result update(TSysPermission tSysPermission) { + log.info("先查询出父级权限，将要更新的子级部门level+1"); + if (tSysPermission.getParentId() != null){ + Long parentId = 0L; + if (parentId.equals(tSysPermission.getParentId())){ + tSysPermission.setLevel(1); + }else { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("id",tSysPermission.getParentId()); + TSysPermission parentPermission = tSysPermissionService.getOne(queryWrapper); + if (parentPermission == null){ + return Result.error().message("父级菜单不存在"); + } + tSysPermission.setLevel(parentPermission.getLevel() + 1); + } + } + boolean update = tSysPermissionService.updateById(tSysPermission); + return Result.ok().setData(update); + } + + /** + * 删除菜单权限（前端 /delete 与 /remove 兼容） + * + * @param tSysPermission + * @return Result + */ + @RequestMapping("/delete") + @PermitAll + public Result delete(TSysPermission tSysPermission) { + try { + boolean remove = tSysPermissionService.removeByPermissionId(tSysPermission.getId()); + return Result.ok().setData(remove); + } catch (Exception e) { + return Result.error(); + } + } + + /** + * 删除页面 + * + * @param tSysPermission + * @return Result + */ + @RequestMapping("/remove") + @PermitAll + public Result remove(TSysPermission tSysPermission) { + log.info("先查询出父级权限，将要更新的子级部门level+1"); + try { + boolean remove = tSysPermissionService.removeByPermissionId(tSysPermission.getId()); + return Result.ok().setData(remove); + } catch (Exception e) { + return Result.error(); + } + } + +} diff --git a/src/main/java/com/freedom/admin/controller/TSysRoleController.java b/src/main/java/com/freedom/admin/controller/TSysRoleController.java new file mode 100644 index 0000000..8dbbe21 --- /dev/null +++ b/src/main/java/com/freedom/admin/controller/TSysRoleController.java @@ -0,0 +1,134 @@ +package com.freedom.admin.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.freedom.admin.base.BaseController; +import com.freedom.admin.common.Result; +import com.freedom.admin.config.MyException; +import com.freedom.admin.entity.TSysRole; +import com.freedom.admin.entity.TSysRolePermission; +import com.freedom.admin.entity.TSysUser; +import com.freedom.admin.service.TSysRolePermissionService; +import com.freedom.admin.service.TSysRoleService; +import org.apache.commons.lang3.StringUtils; +import org.apache.ibatis.annotations.Param; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.security.PermitAll; +import java.util.List; +import java.util.Map; + +/** + * @author zhangjiaxun + * @date 2021/2/8 15:39 + * @description + */ +@RestController +@RequestMapping("/sys-role") +public class TSysRoleController extends BaseController { + + @Autowired + private TSysRoleService tSysRoleService; + + @Autowired + private TSysRolePermissionService tSysRolePermissionService; + + /** + * 获取角色数据列表 + * + * @return Result + * */ + @RequestMapping("/findPageList") + @PermitAll + public Result findPageList(@Param("pageNum") long pageNum, + @Param("pageSize") long pageSize, + TSysRole tSysRole){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("del_flag",0); + queryWrapper.eq(StringUtils.isNotBlank(tSysRole.getRoleName()),"role_name", tSysRole.getRoleName()); + Page page = tSysRoleService.page(new Page<>(pageNum,pageSize), queryWrapper); + return Result.ok().setData(page); + } + + /** + * 添加 + * + * @param tSysRole + * @return Result + */ + @RequestMapping("/add") + @PermitAll + public Result add(TSysRole tSysRole) { + boolean save = tSysRoleService.save(tSysRole); + return Result.ok().setData(save); + } + + /** + * 更新 + * + * @param tSysRole + * @return Result + */ + @RequestMapping("/update") + @PermitAll + public Result update(TSysRole tSysRole) { + boolean update = tSysRoleService.updateById(tSysRole); + return Result.ok().setData(update); + } + + /** + * 获取角色下拉列表数据 + * + * @return Result + */ + @RequestMapping("/getRoleSelectList") + public Result> getRoleSelectList() { + List> roleSelectList = tSysRoleService.getRoleSelectList(); + return Result.ok().setData(roleSelectList); + } + + /** + * 添加角色权限 + * */ + @RequestMapping("/addRolePermission") + @PermitAll + public Result addRolePermission(Long roleId, String rolePermissionStr){ + try { + boolean save = tSysRolePermissionService.save(roleId, rolePermissionStr, getUsername()); + return Result.ok().setData(save); + } catch (MyException e) { + return Result.error().code(e.getCode()).message(e.getMessage()); + } + } + + /** + * 删除角色（逻辑删除 + 清理角色权限关联） + * */ + @RequestMapping("/delete") + @PermitAll + public Result delete(TSysRole tSysRole){ + try { + if (tSysRole.getId() == null) { + return Result.error().message("角色ID不能为空"); + } + // 删除角色权限关联 + QueryWrapper rolePermissionWrapper = new QueryWrapper<>(); + rolePermissionWrapper.eq("role_id", tSysRole.getId()); + tSysRolePermissionService.remove(rolePermissionWrapper); + // 逻辑删除角色 + TSysRole role = new TSysRole(); + role.setId(tSysRole.getId()); + role.setDelFlag(true); + boolean update = tSysRoleService.updateById(role); + if (!update) { + return Result.error().message("删除角色失败"); + } + return Result.ok(); + } catch (Exception e) { + return Result.error().message("删除角色失败"); + } + } + +} diff --git a/src/main/java/com/freedom/admin/controller/TSysUserController.java b/src/main/java/com/freedom/admin/controller/TSysUserController.java new file mode 100644 index 0000000..d17060a --- /dev/null +++ b/src/main/java/com/freedom/admin/controller/TSysUserController.java @@ -0,0 +1,231 @@ +package com.freedom.admin.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.freedom.admin.base.BaseController; +import com.freedom.admin.common.Result; +import com.freedom.admin.config.MyException; +import com.freedom.admin.entity.TSysUser; +import com.freedom.admin.entity.TSysUserRole; +import com.freedom.admin.mapper.TSysUserRoleMapper; +import com.freedom.admin.service.TSysUserService; +import com.freedom.admin.service.UserService; +import lombok.extern.log4j.Log4j2; +import org.apache.commons.lang3.StringUtils; +import org.apache.ibatis.annotations.Param; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.security.PermitAll; +import java.util.ArrayList; +import java.util.List; + +/** + * @author zhangjiaxun + * @date 2021/2/2 13:41 + * @description 控制层-用户表 + */ +@RestController +@RequestMapping("sys-user") +@Log4j2 +public class TSysUserController extends BaseController { + + @Autowired + private TSysUserService tSysUserService; + + @Autowired + private UserService userService; + + @Autowired + private TSysUserRoleMapper tSysUserRoleMapper; + + /** + * 用户注册 + * + * @param sysUser 用户信息 + * @return Result 响应结果 + * */ + @RequestMapping("register") + @PermitAll + public Result register(TSysUser sysUser){ + try { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("del_flag",0); + queryWrapper.eq("username", sysUser.getUsername()); + long count = tSysUserService.count(queryWrapper); + if (count > 0){ + return Result.error().message("账号已存在！"); + } + boolean register = tSysUserService.register(sysUser); + return Result.ok().setData(register); + } catch (MyException e) { + return Result.error().code(e.getCode()).message(e.getMessage()); + } + } + + /** + * 获取用户信息 + * */ + @RequestMapping("getUserInfo") + @PreAuthorize("hasAnyAuthority('user:getUserInfo')") + public Result getUserInfo(){ + TSysUser user = getUser(); + return Result.ok().setData(user); + } + + /** + * 获取当前登录用户个人中心信息 + * */ + @RequestMapping("getPersonalInfo") + @PermitAll + public Result getPersonalInfo(){ + TSysUser user = getUser(); + if (user == null) { + return Result.error().message("用户未登录"); + } + user.setPassword(null); + return Result.ok().setData(user); + } + + /** + * 修改密码 + * */ + @RequestMapping("updatePassword") + @PermitAll + public Result updatePassword(TSysUser tSysUser, String oldPassword, String newPassword){ + try { + if (StringUtils.isBlank(oldPassword) || StringUtils.isBlank(newPassword)) { + return Result.error().message("旧密码和新密码不能为空"); + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("del_flag",0); + queryWrapper.eq("id", tSysUser.getId()); + TSysUser user = tSysUserService.getOne(queryWrapper); + if (user == null) { + return Result.error().message("用户不存在"); + } + BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder(); + if (!bCryptPasswordEncoder.matches(oldPassword, user.getPassword())) { + return Result.error().code(419).message("旧密码不正确"); + } + user.setPassword(bCryptPasswordEncoder.encode(newPassword)); + user.setEncodeType("BCrypt"); + tSysUserService.updateById(user); + return Result.ok(); + } catch (Exception e) { + return Result.error().message("修改密码失败"); + } + } + + /** + * 重置密码 + * */ + @RequestMapping("resetPassword") + @PermitAll + public Result resetPassword(TSysUser tSysUser){ + try { + TSysUser user = new TSysUser(); + user.setId(tSysUser.getId()); + BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder(); + user.setPassword(bCryptPasswordEncoder.encode("123456")); + user.setEncodeType("BCrypt"); + tSysUserService.updateById(user); + return Result.ok().message("密码已重置为 123456"); + } catch (Exception e) { + return Result.error().message("重置密码失败"); + } + } + + /** + * 获取用户数据列表 + * */ + @RequestMapping("findPageList") + @PermitAll + public Result findPageList(@Param("pageNum") long pageNum, + @Param("pageSize") long pageSize, + TSysUser tSysUser){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("del_flag",0); + queryWrapper.eq(StringUtils.isNotBlank(tSysUser.getUsername()),"username", tSysUser.getUsername()); + Page page = tSysUserService.page(new Page<>(pageNum,pageSize), queryWrapper); + // 填充每个用户的角色ID，用于编辑回显 + if (page.getRecords() != null) { + for (TSysUser user : page.getRecords()) { + QueryWrapper roleWrapper = new QueryWrapper<>(); + roleWrapper.eq("user_id", user.getId()); + List userRoleList = tSysUserRoleMapper.selectList(roleWrapper); + if (userRoleList != null && !userRoleList.isEmpty()) { + List roleIdList = new ArrayList<>(); + for (TSysUserRole ur : userRoleList) { + roleIdList.add(String.valueOf(ur.getRoleId())); + } + user.setRoleIds(String.join(",", roleIdList)); + } + } + } + return Result.ok().setData(page); + } + + /** + * 获取用户列表数据 + * */ + @RequestMapping("add") + @PermitAll + public Result add(TSysUser tSysUser,String userRoleStr){ + try { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("del_flag",0); + queryWrapper.eq("username", tSysUser.getUsername()); + long count = tSysUserService.count(queryWrapper); + if (count > 0){ + return Result.error().message("账号已存在！"); + } + boolean save = tSysUserService.save(tSysUser, userRoleStr, getUsername()); + return Result.ok().setData(save); + } catch (MyException e) { + return Result.error().code(e.getCode()).message(e.getMessage()); + } + + } + + @RequestMapping("update") + @PermitAll + public Result update(TSysUser tSysUser,String userRoleStr){ + try { + tSysUserService.updateById(tSysUser); + // 更新用户角色关联 + if (StringUtils.isNotBlank(userRoleStr)) { + QueryWrapper delWrapper = new QueryWrapper<>(); + delWrapper.eq("user_id", tSysUser.getId()); + tSysUserRoleMapper.delete(delWrapper); + List roleList = com.alibaba.fastjson.JSONArray.parseArray(userRoleStr, TSysUserRole.class); + if (roleList != null && !roleList.isEmpty()) { + for (TSysUserRole ur : roleList) { + ur.setUserId(tSysUser.getId()); + ur.setCreateBy(getUsername()); + ur.setCreateTime(new java.util.Date()); + tSysUserRoleMapper.insert(ur); + } + } + } + } catch (Exception e) { + return Result.error(); + } + return Result.ok(); + } + + @RequestMapping("remove") + @PermitAll + public Result remove(TSysUser tSysUser){ + try { + tSysUserService.removeById(tSysUser.getId()); + } catch (Exception e) { + return Result.error(); + } + return Result.ok(); + } + +} diff --git a/src/main/java/com/freedom/admin/entity/TSysDept.java b/src/main/java/com/freedom/admin/entity/TSysDept.java new file mode 100644 index 0000000..ae77c7e --- /dev/null +++ b/src/main/java/com/freedom/admin/entity/TSysDept.java @@ -0,0 +1,76 @@ +package com.freedom.admin.entity; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; + +/** + * t_sys_dept + * @author + */ +@Data +public class TSysDept implements Serializable { + /** + * 主键 + */ + private Long id; + + /** + * 父ID + */ + private Long parentId; + + /** + * 编码 + */ + private String deptCode; + + /** + * 名称 + */ + private String deptName; + + /** + * 描述 + */ + private String deptDesc; + + /** + * 级别 + */ + private Integer level; + + /** + * 排序 + */ + private Integer sort; + + /** + * 创建者 + */ + private String createBy; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * 更新者 + */ + private String updateBy; + + /** + * 更新时间 + */ + private Date updateDate; + + /** + * 删除标记 + */ + private Boolean delFlag; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/freedom/admin/entity/TSysPermission.java b/src/main/java/com/freedom/admin/entity/TSysPermission.java new file mode 100644 index 0000000..4cd9b33 --- /dev/null +++ b/src/main/java/com/freedom/admin/entity/TSysPermission.java @@ -0,0 +1,89 @@ +package com.freedom.admin.entity; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * t_sys_permission + * @author + */ +@Data +public class TSysPermission implements Serializable { + /** + * 主键 + */ + private Long id; + + /** + * 父ID + */ + private Long parentId; + + /** + * 编码 + */ + private String permissionCode; + + /** + * 名称 + */ + private String permissionName; + + /** + * 描述 + */ + private String permissionDesc; + + /** + * 级别 + */ + private Integer level; + + /** + * 图标 + */ + private String icon; + + /** + * 链接地址 + */ + private String url; + + /** + * 组件地址 + */ + private String component; + + /** + * 排序 + */ + private Integer sort; + + /** + * 创建者 + */ + private String createBy; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * 更新者 + */ + private String updateBy; + + /** + * 编辑时间 + */ + private Date updateDate; + + /** + * 删除标记 + */ + private Boolean delFlag; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/freedom/admin/entity/TSysRole.java b/src/main/java/com/freedom/admin/entity/TSysRole.java new file mode 100644 index 0000000..b02acfd --- /dev/null +++ b/src/main/java/com/freedom/admin/entity/TSysRole.java @@ -0,0 +1,74 @@ +package com.freedom.admin.entity; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * t_sys_role + * @author + */ +@Data +public class TSysRole implements Serializable { + /** + * 主键 + */ + private Long id; + + /** + * 角色名称 + */ + private String roleName; + + /** + * 角色编号 + */ + private String roleCode; + + /** + * 角色描述 + */ + private String roleDesc; + + /** + * 默认角色 + */ + private String isDefault; + + /** + * 该角色归属部门 + */ + private Long deptId; + + /** + * 角色排序 + */ + private Integer sort; + + /** + * 创建者 + */ + private String createBy; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * 更新者 + */ + private String updateBy; + + /** + * 更新时间 + */ + private Date updateDate; + + /** + * 删除标记 + */ + private Boolean delFlag; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/freedom/admin/entity/TSysRolePermission.java b/src/main/java/com/freedom/admin/entity/TSysRolePermission.java new file mode 100644 index 0000000..5b16f3f --- /dev/null +++ b/src/main/java/com/freedom/admin/entity/TSysRolePermission.java @@ -0,0 +1,39 @@ +package com.freedom.admin.entity; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * t_sys_role_permission + * @author + */ +@Data +public class TSysRolePermission implements Serializable { + /** + * 主键 + */ + private Long id; + + /** + * 角色ID + */ + private Long roleId; + + /** + * 权限ID + */ + private Long permissionId; + + /** + * 创建者 + */ + private String createBy; + + /** + * 创建时间 + */ + private Date createDate; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/freedom/admin/entity/TSysUser.java b/src/main/java/com/freedom/admin/entity/TSysUser.java new file mode 100644 index 0000000..87b1c98 --- /dev/null +++ b/src/main/java/com/freedom/admin/entity/TSysUser.java @@ -0,0 +1,100 @@ +package com.freedom.admin.entity; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * t_sys_user + * @author + */ +@Data +public class TSysUser implements Serializable { + /** + * 主键 + */ + private Long id; + + /** + * 登录用户名 + */ + private String username; + + /** + * 登陆密码 + */ + private String password; + + /** + * 加密方式（默认MD5） + */ + private String encodeType; + + /** + * 用户类型 + */ + private String userType; + + /** + * 用户昵称 + */ + private String nickname; + + /** + * 用户头像 + */ + private String avatar; + + /** + * 手机号 + */ + private String phone; + + /** + * 电子邮箱 + */ + private String email; + + /** + * 个性签名 + */ + private String signature; + + /** + * 状态 + */ + private Integer status; + + /** + * 创建者 + */ + private String createBy; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * 更新者 + */ + private String updateBy; + + /** + * 更新时间 + */ + private Date updateDate; + + /** + * 删除标记 + */ + private Boolean delFlag; + + /** + * 角色ID集合（非表字段，用于列表回显） + */ + @com.baomidou.mybatisplus.annotation.TableField(exist = false) + private String roleIds; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/freedom/admin/entity/TSysUserRole.java b/src/main/java/com/freedom/admin/entity/TSysUserRole.java new file mode 100644 index 0000000..7773719 --- /dev/null +++ b/src/main/java/com/freedom/admin/entity/TSysUserRole.java @@ -0,0 +1,39 @@ +package com.freedom.admin.entity; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * t_sys_user_role + * @author + */ +@Data +public class TSysUserRole implements Serializable { + /** + * 主键 + */ + private Long id; + + /** + * 用户ID + */ + private Long userId; + + /** + * 角色ID + */ + private Long roleId; + + /** + * 创建者 + */ + private String createBy; + + /** + * 创建时间 + */ + private Date createTime; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/freedom/admin/mapper/TSysDeptMapper.java b/src/main/java/com/freedom/admin/mapper/TSysDeptMapper.java new file mode 100644 index 0000000..0cde75a --- /dev/null +++ b/src/main/java/com/freedom/admin/mapper/TSysDeptMapper.java @@ -0,0 +1,32 @@ +package com.freedom.admin.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.freedom.admin.entity.TSysDept; + +import java.util.List; +import java.util.Map; + +/** + * @author zhangjiaxun + * @date 2021/2/2 09:30 + * @description 数据访问层-部门表 + */ +public interface TSysDeptMapper extends BaseMapper { + + /** + * 获取部门数据提供给部门树 + * + * @param + * @return List> + * */ + List> getDeptListForTree(); + + /** + * 获取部门数据提供给部门下拉树 + * + * @param + * @return List> + * */ + List> getDeptListForTreeSelect(); + +} \ No newline at end of file diff --git a/src/main/java/com/freedom/admin/mapper/TSysPermissionMapper.java b/src/main/java/com/freedom/admin/mapper/TSysPermissionMapper.java new file mode 100644 index 0000000..df67a07 --- /dev/null +++ b/src/main/java/com/freedom/admin/mapper/TSysPermissionMapper.java @@ -0,0 +1,61 @@ +package com.freedom.admin.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.freedom.admin.entity.TSysPermission; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + * @author zhangjiaxun + * @date 2021/2/2 09:30 + * @description 数据访问层-权限表 + */ +public interface TSysPermissionMapper extends BaseMapper { + + /** + * 查询权限数据 + * + * @param userId 用户ID + * @return List + * */ + List selectListByUserId(@Param("userId") Long userId); + + /** + * 查询权限数据 + * + * @param userId 用户ID + * @return List> + * */ + List> selectMapListByUserId(@Param("userId") Long userId); + + /** + * 查询所有权限数据 + * + * @return List> + * */ + List> selectAllMapList(); + + /** + * 查询所有权限数据，提供给树 + * + * @return List> + * */ + List> getPermissionListForTree(); + + /** + * 根据角色ID查询权限数据 + * + * @param roleId 角色ID + * @return List> + * */ + List> getPermissionListByRoleId(@Param("roleId") Long roleId); + + /** + * 获取权限数据提供给treeSelect + * + * @return List> + * */ + List> getPermissionListForTreeSelect(); +} \ No newline at end of file diff --git a/src/main/java/com/freedom/admin/mapper/TSysRoleMapper.java b/src/main/java/com/freedom/admin/mapper/TSysRoleMapper.java new file mode 100644 index 0000000..0aa3e7d --- /dev/null +++ b/src/main/java/com/freedom/admin/mapper/TSysRoleMapper.java @@ -0,0 +1,23 @@ +package com.freedom.admin.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.freedom.admin.entity.TSysRole; + +import java.util.List; +import java.util.Map; + +/** + * @author zhangjiaxun + * @date 2021/2/2 09:30 + * @description 数据访问层-角色表 + */ +public interface TSysRoleMapper extends BaseMapper { + + /** + * 获取角色下拉列表数据 + * + * @return List> + * */ + List> getRoleSelectList(); + +} \ No newline at end of file diff --git a/src/main/java/com/freedom/admin/mapper/TSysRolePermissionMapper.java b/src/main/java/com/freedom/admin/mapper/TSysRolePermissionMapper.java new file mode 100644 index 0000000..3c7e2d9 --- /dev/null +++ b/src/main/java/com/freedom/admin/mapper/TSysRolePermissionMapper.java @@ -0,0 +1,13 @@ +package com.freedom.admin.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.freedom.admin.entity.TSysRolePermission; + +/** + * @author zhangjiaxun + * @date 2021/2/2 09:30 + * @description 数据访问层-角色权限关系表 + */ +public interface TSysRolePermissionMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/src/main/java/com/freedom/admin/mapper/TSysUserMapper.java b/src/main/java/com/freedom/admin/mapper/TSysUserMapper.java new file mode 100644 index 0000000..d07cf41 --- /dev/null +++ b/src/main/java/com/freedom/admin/mapper/TSysUserMapper.java @@ -0,0 +1,16 @@ +package com.freedom.admin.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.freedom.admin.entity.TSysUser; +import org.apache.ibatis.annotations.Param; + +/** + * @author zhangjiaxun + * @date 2021/2/2 09:30 + * @description 数据访问层-用户表 + */ +public interface TSysUserMapper extends BaseMapper { + + TSysUser selectOneByUsername(@Param("username") String username); + +} \ No newline at end of file diff --git a/src/main/java/com/freedom/admin/mapper/TSysUserRoleMapper.java b/src/main/java/com/freedom/admin/mapper/TSysUserRoleMapper.java new file mode 100644 index 0000000..614541d --- /dev/null +++ b/src/main/java/com/freedom/admin/mapper/TSysUserRoleMapper.java @@ -0,0 +1,13 @@ +package com.freedom.admin.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.freedom.admin.entity.TSysUserRole; + +/** + * @author zhangjiaxun + * @date 2021/2/2 09:30 + * @description 数据访问层-用户角色关系表 + */ +public interface TSysUserRoleMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/src/main/java/com/freedom/admin/service/TSysDeptService.java b/src/main/java/com/freedom/admin/service/TSysDeptService.java new file mode 100644 index 0000000..9d58f00 --- /dev/null +++ b/src/main/java/com/freedom/admin/service/TSysDeptService.java @@ -0,0 +1,29 @@ +package com.freedom.admin.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.freedom.admin.entity.TSysDept; + +import java.util.List; +import java.util.Map; + +/** + * @author zhangjiaxun + * @date 2021/2/9 10:15 + * @description + */ +public interface TSysDeptService extends IService { + + /** + * 获取部门Tree数据 + * @return List> + * */ + List> getTreeList(); + + /** + * 获取部门TreeSelect数据 + * + * @return List> + * */ + List> getTreeSelectList(); + +} diff --git a/src/main/java/com/freedom/admin/service/TSysPermissionService.java b/src/main/java/com/freedom/admin/service/TSysPermissionService.java new file mode 100644 index 0000000..5ea0772 --- /dev/null +++ b/src/main/java/com/freedom/admin/service/TSysPermissionService.java @@ -0,0 +1,52 @@ +package com.freedom.admin.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.freedom.admin.entity.TSysPermission; + +import java.util.List; +import java.util.Map; + +/** + * @author zhangjiaxun + * @date 2021/2/4 11:08 + * @description + */ +public interface TSysPermissionService extends IService { + + /** + * 获取权限数据 + * + * @param userId 用户ID + * @return List> + * */ + List> getPermissionListByUserId(Long userId); + + /** + * 获取权限树数据 + * + * @return List> + * */ + List> getTreeList(); + + /** + * 获取权限树数据 + * + * @param roleId 角色ID + * @return List> + * */ + List> getTreeListByRoleId(Long roleId); + + /** + * 获取权限treeSelect数据 + * + * @return List> + * */ + List> getTreeSelectList(); + + /** + * 根据菜单ID进行递归删除 + * + * @return Boolean + * */ + Boolean removeByPermissionId(Long id); +} diff --git a/src/main/java/com/freedom/admin/service/TSysRolePermissionService.java b/src/main/java/com/freedom/admin/service/TSysRolePermissionService.java new file mode 100644 index 0000000..e5f1b78 --- /dev/null +++ b/src/main/java/com/freedom/admin/service/TSysRolePermissionService.java @@ -0,0 +1,15 @@ +package com.freedom.admin.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.freedom.admin.entity.TSysRolePermission; + +/** + * @author zhangjiaxun + * @date 2021/2/14 9:21 + * @description + */ +public interface TSysRolePermissionService extends IService { + + boolean save(Long roleId, String rolePermissionStr, String operator); + +} diff --git a/src/main/java/com/freedom/admin/service/TSysRoleService.java b/src/main/java/com/freedom/admin/service/TSysRoleService.java new file mode 100644 index 0000000..cf63d50 --- /dev/null +++ b/src/main/java/com/freedom/admin/service/TSysRoleService.java @@ -0,0 +1,21 @@ +package com.freedom.admin.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.freedom.admin.entity.TSysRole; + +import java.util.List; +import java.util.Map; + +/** + * @author zhangjiaxun + * @date 2021/2/8 15:45 + * @description + */ +public interface TSysRoleService extends IService { + + /** + * 获取角色下拉列表数据 + */ + List> getRoleSelectList(); + +} diff --git a/src/main/java/com/freedom/admin/service/TSysUserService.java b/src/main/java/com/freedom/admin/service/TSysUserService.java new file mode 100644 index 0000000..d5bda0c --- /dev/null +++ b/src/main/java/com/freedom/admin/service/TSysUserService.java @@ -0,0 +1,23 @@ +package com.freedom.admin.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.freedom.admin.entity.TSysUser; + +/** + * @author zhangjiaxun + * @date 2021/2/4 9:28 + * @description + */ +public interface TSysUserService extends IService { + + /** + * 添加用户账号 + * */ + boolean save(TSysUser entity, String userRoleStr, String operator); + + /** + * 用户注册 + * */ + boolean register(TSysUser entity); + +} diff --git a/src/main/java/com/freedom/admin/service/UserService.java b/src/main/java/com/freedom/admin/service/UserService.java new file mode 100644 index 0000000..9064806 --- /dev/null +++ b/src/main/java/com/freedom/admin/service/UserService.java @@ -0,0 +1,12 @@ +package com.freedom.admin.service; + +import org.springframework.security.core.userdetails.UserDetailsService; + +/** + * @author zhangjiaxun + * @date 2021/1/5 18:58 + * @description + */ +public interface UserService extends UserDetailsService { + +} diff --git a/src/main/java/com/freedom/admin/service/impl/TSysDeptImpl.java b/src/main/java/com/freedom/admin/service/impl/TSysDeptImpl.java new file mode 100644 index 0000000..5a43caf --- /dev/null +++ b/src/main/java/com/freedom/admin/service/impl/TSysDeptImpl.java @@ -0,0 +1,120 @@ +package com.freedom.admin.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.freedom.admin.entity.TSysDept; +import com.freedom.admin.mapper.TSysDeptMapper; +import com.freedom.admin.service.TSysDeptService; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author zhangjiaxun + * @date 2021/2/9 10:23 + * @description + */ +@Service +@Log4j2 +public class TSysDeptImpl extends ServiceImpl implements TSysDeptService { + + private static final int TYPE_FOR_TREE = 1; + private static final int TYPE_FOR_TREE_SELECT = 2; + + @Autowired + private TSysDeptMapper tSysDeptMapper; + + @Override + public List> getTreeList() { + log.info("业务层--获取部门数据，提供给树"); + List> deptList = tSysDeptMapper.getDeptListForTree(); + log.info("业务层--添加顶级元素"); + addTopDeptElement(deptList, TYPE_FOR_TREE); + log.info("业务层--格式化部门数据为树形结构"); + List> treeList = formatDeptListToTreeList(deptList, -1L); + return treeList; + } + + @Override + public List> getTreeSelectList() { + log.info("业务层--获取部门数据"); + List> deptList = tSysDeptMapper.getDeptListForTreeSelect(); + log.info("业务层--添加顶级元素"); + addTopDeptElement(deptList, TYPE_FOR_TREE_SELECT); + log.info("业务层--格式化部门数据"); + List> treeSelectList = formatDeptListToTreeSelectList(deptList, -1L); + return treeSelectList; + } + + /** + * deptList数据格式化树形结构方法 + */ + public List> formatDeptListToTreeList(List> deptList, Long parentId) { + List> resultList = new ArrayList<>(); + for (Map dept : deptList) { + if ("0".equals(dept.get("level").toString())){ + dept.put("selected",true); + dept.put("expand",true); + } + if (dept.get("checked") != null){ + if ("1".equals(dept.get("checked"))){ + dept.put("checked",true); + }else if ("0".equals(dept.get("checked"))){ + dept.put("checked",false); + } + } + if (parentId.equals(dept.get("parentId"))) { + List> childList = formatDeptListToTreeList(deptList, Long.valueOf(dept.get("id").toString())); + dept.put("children", childList); + resultList.add(dept); + } + } + return resultList; + } + + + /** + * 添加顶级元素 + * */ + public void addTopDeptElement(List> deptList, int type){ + Map topDeptElementMap = new HashMap<>(); + if (type == TYPE_FOR_TREE){ + topDeptElementMap.put("id", 0L); + topDeptElementMap.put("parentId", -1L); + topDeptElementMap.put("title", "顶级"); + topDeptElementMap.put("deptCode", "dept_top"); + topDeptElementMap.put("deptDesc","dept_desc"); + topDeptElementMap.put("level", 0); + topDeptElementMap.put("delFlag", 0); + }else if (type == TYPE_FOR_TREE_SELECT){ + topDeptElementMap.put("id", 0L); + topDeptElementMap.put("parentId", -1L); + topDeptElementMap.put("label", "顶级"); + topDeptElementMap.put("level", 0); + } + + deptList.add(topDeptElementMap); + } + + /** + * deptList数据格式化下拉树数据 + */ + private List> formatDeptListToTreeSelectList(List> deptList, Long parentId) { + List> resultList = new ArrayList<>(); + for (Map dept : deptList) { + if (parentId.equals(dept.get("parentId"))) { + List> childList = formatDeptListToTreeSelectList(deptList, Long.valueOf(dept.get("id").toString())); + if (childList.size()>0 ){ + dept.put("children", childList); + } + resultList.add(dept); + } + } + return resultList; + } + +} diff --git a/src/main/java/com/freedom/admin/service/impl/TSysPermissionServiceImpl.java b/src/main/java/com/freedom/admin/service/impl/TSysPermissionServiceImpl.java new file mode 100644 index 0000000..81c1083 --- /dev/null +++ b/src/main/java/com/freedom/admin/service/impl/TSysPermissionServiceImpl.java @@ -0,0 +1,231 @@ +package com.freedom.admin.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.freedom.admin.entity.TSysPermission; +import com.freedom.admin.mapper.TSysPermissionMapper; +import com.freedom.admin.service.TSysPermissionService; +import com.google.common.base.Throwables; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * @author zhangjiaxun + * @date 2021/2/4 11:08 + * @description 业务层-系统权限 + */ +@Service +@Log4j2 +public class TSysPermissionServiceImpl extends ServiceImpl implements TSysPermissionService { + + private static final int TYPE_FOR_TREE = 1; + private static final int TYPE_FOR_TREE_SELECT = 2; + + @Autowired + private TSysPermissionMapper tSysPermissionMapper; + + @Override + public List> getPermissionListByUserId(Long userId) { + log.info("业务层---查询所有权限"); + List> allPermissionList = tSysPermissionMapper.selectAllMapList(); + log.info("业务层--查询用户权限"); + List> userPermissionList = tSysPermissionMapper.selectMapListByUserId(userId); + log.info("业务层--拼接出完整的权限"); + List> permissionList = getPermissionList(allPermissionList, userPermissionList); + log.info("业务层--添加顶级元素"); + addTopPermissionElement(permissionList, TYPE_FOR_TREE); + log.info("业务层--格式化数据为树形结构--结果：{}",permissionList); + List> permissionTreeList = formatPermissionListToTreeList(permissionList, -1L); + if (permissionTreeList !=null && permissionTreeList.size()>0){ + List> childrenList = (List>)permissionTreeList.get(0).get("children"); + return childrenList; + } + return permissionList; + } + + @Override + public List> getTreeList() { + log.info("业务层---查询所有权限提供给树"); + List> permissionListForTree = tSysPermissionMapper.getPermissionListForTree(); + log.info("业务层--添加顶级元素"); + addTopPermissionElement(permissionListForTree, TYPE_FOR_TREE); + log.info("业务层---格式化树数据为树形结构"); + List> treeList = formatPermissionListToTreeList(permissionListForTree, -1L); + return treeList; + } + + @Override + public List> getTreeSelectList() { + log.info("业务层--获取部门数据"); + List> permissionList = tSysPermissionMapper.getPermissionListForTreeSelect(); + log.info("业务层--添加顶级元素"); + addTopPermissionElement(permissionList, TYPE_FOR_TREE_SELECT); + log.info("业务层--格式化权限数据"); + List> treeSelectList = formatPermissionListToTreeSelectList(permissionList, -1L); + return treeSelectList; + } + + @Override + public List> getTreeListByRoleId(Long roleId) { + log.info("业务层---查询所有权限提供给树"); + List> permissionListForTree = tSysPermissionMapper.getPermissionListByRoleId(roleId); + log.info("业务层--添加顶级元素"); + addTopPermissionElement(permissionListForTree, TYPE_FOR_TREE); + log.info("业务层---格式化树数据为树形结构"); + List> treeList = formatPermissionListToTreeList(permissionListForTree, -1L); + return treeList; + } + + /** + * 添加上级权限 + * */ + public List> getPermissionList(List> allPermissionList, + List> userPermissionList){ + HashSet> permissionSet = new HashSet<>(); + if (userPermissionList !=null && userPermissionList.size()>0){ + // 循环添加数据，实际我们的菜单分为多级 + for (Map userPermissionMap : userPermissionList) { + for (Map allPermissionMap : allPermissionList) { + if (allPermissionMap.get("parentId").toString().equals("-1")){ + // 保证至少会有一个顶级菜单 + if (!permissionSet.contains(allPermissionMap)){ + // 保证不重复加入菜单列表结果集合中 + permissionSet.add(allPermissionMap); + } + } + + if (userPermissionMap.get("id").toString().equals(allPermissionMap.get("id").toString())){ + // 把自己菜单加入结果集合中 + permissionSet.add(allPermissionMap); + } + + if (userPermissionMap.get("parentId").toString().equals(allPermissionMap.get("id").toString())){ + if (!permissionSet.contains(allPermissionMap)){ + // 保证不重复加入菜单列表结果集合中 + permissionSet.add(allPermissionMap); + } + } + + } + } + } + List> permissionList = new ArrayList<>(permissionSet); + return permissionList; + } + + /** + * permissionList数据格式化树形结构方法 + * + * @param permissionList 权限数据 + * @param parentId 父ID + * @return List> + */ + private List> formatPermissionListToTreeList(List> permissionList, Long parentId) { + List> resultList = new ArrayList<>(); + for (Map permission : permissionList) { + if ("0".equals(permission.get("level").toString())){ + //permission.put("selected", true); + permission.put("checked", false); + } + permission.put("expand", true); + if (permission.get("checked") != null){ + if ("1".equals(permission.get("checked"))){ + permission.put("checked", true); + }else if ("0".equals(permission.get("checked"))){ + permission.put("checked", false); + } + } + if (parentId.equals(permission.get("parentId"))) { + List> childList = formatPermissionListToTreeList(permissionList, Long.valueOf(permission.get("id").toString())); + List> sortList = childList.stream().sorted(Comparator.comparing(map -> Integer.parseInt(map.get("sort").toString()))).collect(Collectors.toList()); + permission.put("children", sortList); + resultList.add(permission); + } + } + return resultList; + } + + /** + * permissionList格式化treeSelect结构 + * + * @param permissionList 权限数据 + * @param parentId 父ID + * @return List> + */ + private List> formatPermissionListToTreeSelectList(List> permissionList, Long parentId) { + List> resultList = new ArrayList<>(); + for (Map permission : permissionList) { + if ("0".equals(permission.get("level"))){ + permission.put("isDisabled",true); + } + if (parentId.equals(permission.get("parentId"))) { + List> childList = formatPermissionListToTreeSelectList(permissionList, Long.valueOf(permission.get("id").toString())); + if (childList.size()>0 ){ + permission.put("children", childList); + } + resultList.add(permission); + } + } + return resultList; + } + + /** + * 添加顶级元素 + * */ + public void addTopPermissionElement(List> permissionList, int type){ + Map topPermissionElementMap = new HashMap<>(); + if (type == TYPE_FOR_TREE){ + topPermissionElementMap.put("id", 0L); + topPermissionElementMap.put("parentId", -1L); + topPermissionElementMap.put("title", "顶级"); + topPermissionElementMap.put("icon", "ios-navigate"); + topPermissionElementMap.put("level", 0); + topPermissionElementMap.put("checked", 1); + topPermissionElementMap.put("sort", 0); + }else if (type == TYPE_FOR_TREE_SELECT){ + topPermissionElementMap.put("id", 0L); + topPermissionElementMap.put("parentId", -1L); + topPermissionElementMap.put("label", "顶级"); + topPermissionElementMap.put("level", 0); + topPermissionElementMap.put("sort", 0); + } + + permissionList.add(topPermissionElementMap); + } + + /** + * 递归删除 + * + * @param id 父ID + * @return Boolean ture/false + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean removeByPermissionId(Long id) { + try { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("parent_id", id); + queryWrapper.eq("del_flag",0); + List childrenList = tSysPermissionMapper.selectList(queryWrapper); + // 子菜单集合为空时，删除当前菜单，跳出此循环4 + if (childrenList == null || childrenList.size() == 0){ + tSysPermissionMapper.deleteById(id); + return Boolean.TRUE; + } + for (TSysPermission tSysPermission : childrenList) { + removeByPermissionId(tSysPermission.getId()); + } + + } catch (Exception e) { + log.error("递归删除菜单权限id:{}异常：{}", id ,Throwables.getStackTraceAsString(e)); + return Boolean.FALSE; + } + return Boolean.TRUE; + } + +} diff --git a/src/main/java/com/freedom/admin/service/impl/TSysRolePermissionServiceImpl.java b/src/main/java/com/freedom/admin/service/impl/TSysRolePermissionServiceImpl.java new file mode 100644 index 0000000..8ecb98c --- /dev/null +++ b/src/main/java/com/freedom/admin/service/impl/TSysRolePermissionServiceImpl.java @@ -0,0 +1,55 @@ +package com.freedom.admin.service.impl; + +import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.freedom.admin.config.MyException; +import com.freedom.admin.entity.TSysRolePermission; +import com.freedom.admin.mapper.TSysRolePermissionMapper; +import com.freedom.admin.service.TSysRolePermissionService; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +/** + * @author zhangjiaxun + * @date 2021/2/14 9:23 + * @description + */ +@Service +@Log4j2 +public class TSysRolePermissionServiceImpl extends ServiceImpl implements TSysRolePermissionService{ + + @Autowired + private TSysRolePermissionMapper tSysRolePermissionMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean save(Long roleId, String rolePermissionStr, String operator) { + log.info("业务层-删除权限"); + QueryWrapper deleteWrapper = new QueryWrapper<>(); + deleteWrapper.eq("role_id",roleId); + int deleteRolePermission = tSysRolePermissionMapper.delete(deleteWrapper); + List tSysRolePermissionList = JSONArray.parseArray(rolePermissionStr, TSysRolePermission.class); + if (tSysRolePermissionList == null || tSysRolePermissionList.size() == 0){ + throw new MyException(400,"添加用户权限为空！"); + } + log.info("业务层-添加权限"); + int insertRolePermissionCount = 0; + for (TSysRolePermission tSysRolePermission : tSysRolePermissionList) { + tSysRolePermission.setCreateBy(operator); + tSysRolePermission.setCreateDate(new Date()); + int insertTSysUserRole = tSysRolePermissionMapper.insert(tSysRolePermission); + insertRolePermissionCount = insertRolePermissionCount + insertTSysUserRole; + } + if (insertRolePermissionCount != tSysRolePermissionList.size()){ + throw new MyException(400,"添加权限失败！"); + } + return true; + } + +} diff --git a/src/main/java/com/freedom/admin/service/impl/TSysRoleServiceImpl.java b/src/main/java/com/freedom/admin/service/impl/TSysRoleServiceImpl.java new file mode 100644 index 0000000..2d4cf1b --- /dev/null +++ b/src/main/java/com/freedom/admin/service/impl/TSysRoleServiceImpl.java @@ -0,0 +1,28 @@ +package com.freedom.admin.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.freedom.admin.entity.TSysRole; +import com.freedom.admin.mapper.TSysRoleMapper; +import com.freedom.admin.service.TSysRoleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * @author zhangjiaxun + * @date 2021/2/8 15:47 + * @description + */ +@Service +public class TSysRoleServiceImpl extends ServiceImpl implements TSysRoleService { + + @Autowired + private TSysRoleMapper tSysRoleMapper; + + @Override + public List> getRoleSelectList() { + return tSysRoleMapper.getRoleSelectList(); + } +} diff --git a/src/main/java/com/freedom/admin/service/impl/TSysUserServiceImpl.java b/src/main/java/com/freedom/admin/service/impl/TSysUserServiceImpl.java new file mode 100644 index 0000000..8003d2b --- /dev/null +++ b/src/main/java/com/freedom/admin/service/impl/TSysUserServiceImpl.java @@ -0,0 +1,130 @@ +package com.freedom.admin.service.impl; + +import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.freedom.admin.config.MyException; +import com.freedom.admin.entity.TSysRole; +import com.freedom.admin.entity.TSysUser; +import com.freedom.admin.entity.TSysUserRole; +import com.freedom.admin.mapper.TSysRoleMapper; +import com.freedom.admin.mapper.TSysUserMapper; +import com.freedom.admin.mapper.TSysUserRoleMapper; +import com.freedom.admin.service.TSysUserService; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author zhangjiaxun + * @date 2021/2/4 9:29 + * @description + */ +@Service +@Log4j2 +public class TSysUserServiceImpl extends ServiceImpl implements TSysUserService { + + @Autowired + private TSysUserMapper sysUserMapper; + + @Autowired + private TSysRoleMapper sysRoleMapper; + + @Autowired + private TSysUserRoleMapper sysUserRoleMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean save(TSysUser tSysUser, String userRoleStr, String operator) { + log.info("业务层-添加用户账号"); + BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder(); + String encode = bCryptPasswordEncoder.encode("123456"); + tSysUser.setEncodeType("BCrypt"); + tSysUser.setPassword(encode); + tSysUser.setCreateBy(operator); + tSysUser.setCreateDate(new Date()); + tSysUser.setUpdateBy(tSysUser.getCreateBy()); + tSysUser.setUpdateDate(tSysUser.getCreateDate()); + int insertTSysUser = sysUserMapper.insert(tSysUser); + log.info("业务层-添加用户账号"); + if (insertTSysUser <= 0){ + throw new MyException(400,"添加用户账号失败！"); + } + List tSysUserRoleList = JSONArray.parseArray(userRoleStr, TSysUserRole.class); + if (tSysUserRoleList ==null || tSysUserRoleList.size() == 0){ + throw new MyException(400,"添加用户权限为空！"); + } + int insertUserRoleCount = 0; + for (TSysUserRole tSysUserRole : tSysUserRoleList) { + tSysUserRole.setUserId(tSysUser.getId()); + tSysUserRole.setCreateBy(operator); + tSysUserRole.setCreateTime(new Date()); + int insertTSysUserRole = sysUserRoleMapper.insert(tSysUserRole); + insertUserRoleCount = insertUserRoleCount + insertTSysUserRole; + } + if (insertUserRoleCount != tSysUserRoleList.size()){ + throw new MyException(400,"添加用户账号的权限失败！"); + } + return true; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean register(TSysUser sysUser) { + log.info("业务层-注册用户账号"); + BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder(); + String encode = bCryptPasswordEncoder.encode(sysUser.getPassword()); + sysUser.setEncodeType("BCrypt"); + sysUser.setPassword(encode); + sysUser.setCreateBy("注册页面"); + String []nickNameArr = { + "撸串研究生", + "一米五的小可爱", + "不解风情的老妖怪", + "自我否定先驱者", + "国家特级不保护动物", + "迪士尼在逃公主", + "资深网络表情包传播者", + "白日梦工厂厂长", + "内地十八线女明星", + "国家重度健忘症患者" + }; + int random=(int)(Math.random()*10); + sysUser.setNickname(nickNameArr[random]); + sysUser.setUpdateBy(sysUser.getCreateBy()); + sysUser.setUpdateDate(sysUser.getCreateDate()); + int insertSysUser = sysUserMapper.insert(sysUser); + log.info("业务层-添加用户账号"); + if (insertSysUser <= 0){ + throw new MyException(400,"添加用户账号失败！"); + } + QueryWrapper queryRoleWrapper = new QueryWrapper<>(); + queryRoleWrapper.eq("is_default", 1); + queryRoleWrapper.eq("del_flag", 0); + List sysRoleList = sysRoleMapper.selectList(queryRoleWrapper); + if (sysRoleList ==null || sysRoleList.size() == 0){ + throw new MyException(400,"添加用户权限为空，请管理员配置注册默认角色！"); + } + int insertUserRoleCount = 0; + for (TSysRole sysRole : sysRoleList) { + TSysUserRole sysUserRole = new TSysUserRole(); + sysUserRole.setRoleId(sysRole.getId()); + sysUserRole.setUserId(sysUser.getId()); + sysUserRole.setCreateBy("注册页面"); + sysUserRole.setCreateTime(new Date()); + int insertTSysUserRole = sysUserRoleMapper.insert(sysUserRole); + insertUserRoleCount = insertUserRoleCount + insertTSysUserRole; + } + if (insertUserRoleCount != sysRoleList.size()){ + throw new MyException(400,"添加用户账号的权限失败！"); + } + return true; + } + +} diff --git a/src/main/java/com/freedom/admin/service/impl/UserServiceImpl.java b/src/main/java/com/freedom/admin/service/impl/UserServiceImpl.java new file mode 100644 index 0000000..df9f0d1 --- /dev/null +++ b/src/main/java/com/freedom/admin/service/impl/UserServiceImpl.java @@ -0,0 +1,56 @@ +package com.freedom.admin.service.impl; + +import com.freedom.admin.entity.TSysPermission; +import com.freedom.admin.entity.TSysUser; +import com.freedom.admin.mapper.TSysPermissionMapper; +import com.freedom.admin.mapper.TSysUserMapper; +import com.freedom.admin.service.UserService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + + +/** + * @author zhangjiaxun + * @date 2021/1/5 16:10 + * @description + */ + +@Service +public class UserServiceImpl implements UserService { + + @Autowired + private TSysUserMapper tSysUserMapper; + + @Autowired + private TSysPermissionMapper tSysPermissionMapper; + + @Override + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + TSysUser tSysUser = tSysUserMapper.selectOneByUsername(username); + List authorities = new ArrayList<>(); + if(tSysUser!=null){ + // 设置权限 + List tbPermissionList = tSysPermissionMapper.selectListByUserId(tSysUser.getId()); + tbPermissionList.forEach(tbPermission -> { + if (tbPermission!=null && StringUtils.isNotBlank(tbPermission.getPermissionCode())){ + GrantedAuthority grantedAuthority = new SimpleGrantedAuthority(tbPermission.getPermissionCode()); + authorities.add(grantedAuthority); + } + }); + // 封装成UserDetails的实现类 + return new User(tSysUser.getUsername(),tSysUser.getPassword(),authorities); + }else { + throw new UsernameNotFoundException("用户名不存在"); + } + } + +} diff --git a/src/main/java/com/freedom/admin/utils/AlipayBean.java b/src/main/java/com/freedom/admin/utils/AlipayBean.java new file mode 100644 index 0000000..6a08ab3 --- /dev/null +++ b/src/main/java/com/freedom/admin/utils/AlipayBean.java @@ -0,0 +1,39 @@ +package com.freedom.admin.utils; + +import lombok.Data; + +/** + * @description: TODO + * @author: zhangjiaxun + * @date: 2021年03月13日 22:29:00 + */ +@Data +public class AlipayBean { + + /** + * 商户订单号，必填 + * */ + private String out_trade_no; + + /** + * 订单名称，必填 + * */ + private String subject; + + /** + * 订单名称，必填 + * */ + private StringBuffer total_amount; + + /** + * 商品描述，可空 + * */ + private String body; + + /** + * 超时时间参数 + * */ + private String timeout_express; + + private String product_code; +} diff --git a/src/main/java/com/freedom/admin/utils/JwtUtils.java b/src/main/java/com/freedom/admin/utils/JwtUtils.java new file mode 100644 index 0000000..8627d01 --- /dev/null +++ b/src/main/java/com/freedom/admin/utils/JwtUtils.java @@ -0,0 +1,75 @@ +package com.freedom.admin.utils; + +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.SignatureAlgorithm; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import java.util.Date; + +/** + * @author zhangjiaxun + * @date 2021/2/1 10:06 + * @description JwtUtils + */ +@Component +public class JwtUtils { + + @Value("${jwt.secret}") + private String secret; + + @Value("${jwt.expiration}") + private Long expiration; + + /** + * 创建token + * + * @param username 用户名 + * @return token令牌 + * */ + public String generateToken(String username){ + return Jwts.builder() + .signWith(SignatureAlgorithm.HS512,secret) + .setSubject(username) + .setIssuedAt(new Date()) + .setExpiration(new Date(System.currentTimeMillis() + expiration * 1000)) + .compact(); + } + + /** + * 获取body + * + * @param token 令牌 + * @return body包含您想要签署的任何信息 + * */ + public Claims getBody(String token){ + return Jwts.parser() + .setSigningKey(secret) + .parseClaimsJws(token).getBody(); + } + + /** + * 是否已过期 + * + * @param token 令牌 + * @return 是否过期 + * */ + public boolean isExpiration(String token){ + return getBody(token) + .getExpiration() + .before(new Date()); + } + + /** + * 获取用户名 + * + * @param token 令牌 + * @return username用户名 + * */ + public String getUsernameFormToken(String token){ + return getBody(token) + .getSubject(); + } + +} diff --git a/src/main/java/com/freedom/admin/utils/SimilarityUtil.java b/src/main/java/com/freedom/admin/utils/SimilarityUtil.java new file mode 100644 index 0000000..a3bddf1 --- /dev/null +++ b/src/main/java/com/freedom/admin/utils/SimilarityUtil.java @@ -0,0 +1,73 @@ +package com.freedom.admin.utils; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: 相似度计算工具类 + * @author: zhangjiaxun + * @date: 2021年04月11日 16:07:00 + */ +public class SimilarityUtil { + + public static double similarity(List va, List vb) { + if (va.size() > vb.size()) { + int temp = va.size() - vb.size(); + for (int i = 0; i < temp; i++) { + vb.add(0.00); + } + + } else if (va.size() < vb.size()) { + int temp = vb.size() - va.size(); + for (int i = 0; i < temp; i++) { + va.add(0.00); + } + + } + + int size = va.size(); + + double simVal = 0.00; + double num = 0.00; + double den = 1.00; + double powaSum = 0.00; + double powbSum = 0.00; + + for (int i = 0; i < size; i++) { + double a = Double.parseDouble(va.get(i).toString()); + double b = Double.parseDouble(vb.get(i).toString()); + + num = num + a * b; + powaSum = powaSum + Math.pow(a, 2); + powbSum = powbSum + Math.pow(b, 2); + } + + double sqrta = Math.sqrt(powaSum); + double sqrtb = Math.sqrt(powbSum); + + den = sqrta * sqrtb; + simVal = num / den; + return simVal; + } + + public static void main(String[] args) { + double a[] = {(double) 4.5, 5, 5, 5,0}; + double b[] = {(double) 3.5, 5, 5, 5,0}; + + ArrayList vitem = new ArrayList(); + ArrayList va = new ArrayList(); + ArrayList vb = new ArrayList(); + for (int i = 0; i < a.length; i++){ + va.add(new Double(a[i])); + vb.add(new Double(b[i])); + } + + System.out.print("小红"); + System.out.println(va); + System.out.print("xxx"); + System.out.println(vb); + double simVal = SimilarityUtil.similarity(va, vb); + System.out.println("The sim value is:" + simVal); + } + +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..7cbc79a --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,74 @@ +#server.port +server: + port: 8800 + servlet: + context-path: / +#spring.datasource +spring: + datasource: + type: com.zaxxer.hikari.HikariDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + # 支持通过环境变量覆盖（生产/Docker 部署时注入内网地址），默认回退到公网地址便于本地开发 + url: ${DB_URL:jdbc:mysql://124.221.214.237:3306/freedom_db?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true} + username: ${DB_USERNAME:root} + password: ${DB_PASSWORD:1Qaz@4772} + hikari: + initialization-fail-timeout: 1000 # 连接初始化失败超时时间 + minimum-idle: 5 + idle-timeout: 600000 + maximum-pool-size: 10 + auto-commit: true + pool-name: MyHikariCP + max-lifetime: 1800000 + connection-timeout: 30000 + connection-test-query: SELECT 1 + #email配置 + mail: + #smtp服务主机 qq邮箱则为smtp.qq.com + host: smtp.qq.com + #服务协议 + protocol: smtp + # 编码集 + default-encoding: UTF-8 + #发送邮件的账户 + username: 732128096@qq.com + #授权码 + password: nsbrkfdzzmdlbddi + #是否验证邮箱 + test-connection: false + properties: + mail: + smtp: + auth: true + starttls: + enable: true + required: true + #启动时不检查thymeleaf + thymeleaf: + check-template: false + check-template-location: false +#mybatis-plus +mybatis-plus: + mapper-locations: classpath:/mapper/*.xml + type-aliases-package: com.freedom.admin.entity + global-config: + db-config: + id-type: auto + logic-delete-field: delFlag + logic-delete-value: 1 + logic-not-delete-value: 0 + configuration: + map-underscore-to-camel-case: true + call-setters-on-nulls: true + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl +#分页插件 +pagehelper: + helper-dialect: mysql + reasonable: true + support-methods-arguments: true + params: count=countSql +#jwt +jwt: + header: Authorization #JWT存储的请求头 + secret: springsecurity-demo #JWT加解密使用的密钥 + expiration: 604800 #JWT的超期限时间(60*60*24*7) diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..d61cc3b --- /dev/null +++ b/src/main/resources/logback-spring.xml @@ -0,0 +1,22 @@ + + + + + + UTF-8 + %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%thread] %logger{50} - %msg%n + + + + + + + + + + diff --git a/src/main/resources/mapper/TSysDeptMapper.xml b/src/main/resources/mapper/TSysDeptMapper.xml new file mode 100644 index 0000000..4007029 --- /dev/null +++ b/src/main/resources/mapper/TSysDeptMapper.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + id, parent_id, dept_code, `dept_name`, `dept_desc`, `level`, sort, create_by, create_date, update_by, + update_date, del_flag + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/TSysPermissionMapper.xml b/src/main/resources/mapper/TSysPermissionMapper.xml new file mode 100644 index 0000000..a6b490c --- /dev/null +++ b/src/main/resources/mapper/TSysPermissionMapper.xml @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + a.id, a.parent_id, a.permission_code, a.`permission_name`, a.`permission_desc`, a.`level`, a.icon, a.url, a.component, a.sort, a.create_by, + a.create_date, a.update_by, a.update_date, a.del_flag + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/TSysRoleMapper.xml b/src/main/resources/mapper/TSysRoleMapper.xml new file mode 100644 index 0000000..fad0ffc --- /dev/null +++ b/src/main/resources/mapper/TSysRoleMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + id, role_name, role_code, role_desc, is_default, dept_id, sort, create_by, create_date, + update_by, update_date, del_flag + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/TSysRolePermissionMapper.xml b/src/main/resources/mapper/TSysRolePermissionMapper.xml new file mode 100644 index 0000000..3b62b67 --- /dev/null +++ b/src/main/resources/mapper/TSysRolePermissionMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + id, role_id, menu_id, create_by, create_date + + + \ No newline at end of file diff --git a/src/main/resources/mapper/TSysUserMapper.xml b/src/main/resources/mapper/TSysUserMapper.xml new file mode 100644 index 0000000..164307c --- /dev/null +++ b/src/main/resources/mapper/TSysUserMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + id, username, `password`, encode_type, user_type, nickname, avatar, phone, email, + signature, status, create_by, create_date, update_by, update_date, del_flag + + + \ No newline at end of file diff --git a/src/main/resources/mapper/TSysUserRoleMapper.xml b/src/main/resources/mapper/TSysUserRoleMapper.xml new file mode 100644 index 0000000..41cba32 --- /dev/null +++ b/src/main/resources/mapper/TSysUserRoleMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + id, user_id, role_id, create_by, create_time + + + \ No newline at end of file diff --git a/src/test/java/com/freedom/admin/AdminApplicationTests.java b/src/test/java/com/freedom/admin/AdminApplicationTests.java new file mode 100644 index 0000000..f3bde0c --- /dev/null +++ b/src/test/java/com/freedom/admin/AdminApplicationTests.java @@ -0,0 +1,13 @@ +package com.freedom.admin; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class AdminApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/start.bat b/start.bat new file mode 100644 index 0000000..d74ec56 --- /dev/null +++ b/start.bat @@ -0,0 +1,5 @@ +@echo off +chcp 65001 >nul +cd /d %~dp0 +echo Starting Freedom-Admin on http://localhost:8800 ... +mvn spring-boot:run