2021年9月2日10:07:12 1.增加微信小程序接口 2.4G开关功能接口

spring-boot/.gitignore

@@ -1,15 +1,8 @@
-######################################################################
+HELP.md
-# Build Tools
-
-.gradle
-/build/
-!gradle/wrapper/gradle-wrapper.jar
-
 target/
 !.mvn/wrapper/maven-wrapper.jar
-
+!**/src/main/**/target/
-######################################################################
+!**/src/test/**/target/
-# IDE
 
 ### STS ###
 .apt_generated
@@ -18,6 +11,7 @@ target/
 .project
 .settings
 .springBeans
+.sts4-cache
 
 ### IntelliJ IDEA ###
 .idea
@@ -26,19 +20,14 @@ target/
 *.ipr
 
 ### NetBeans ###
-nbproject/private/
+/nbproject/private/
-build/*
+/nbbuild/
-nbbuild/
+/dist/
-dist/
+/nbdist/
-nbdist/
+/.nb-gradle/
-.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
 
-######################################################################
+### VS Code ###
-# Others
+.vscode/
-*.log
-*.xml.versionsBackup
-*.swp
-
-!*/build/*.java
-!*/build/*.html
-!*/build/*.xml

spring-boot/.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,117 @@
+/*
+ * 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();
+    }
+
+}

spring-boot/.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.2/apache-maven-3.8.2-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

spring-boot/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 "$@"

spring-boot/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%

spring-boot/pom.xml

@@ -8,6 +8,7 @@
     <artifactId>ruoyi</artifactId>
     <version>3.4.0</version>
 
+
     <name>ruoyi</name>
     <url>http://www.ruoyi.vip</url>
     <description>若依管理系统</description>
@@ -193,7 +194,12 @@
                 <artifactId>ruoyi-common</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
-
+            <!-- https://mvnrepository.com/artifact/com.zaxxer/HikariCP -->
+            <dependency>
+                <groupId>com.zaxxer</groupId>
+                <artifactId>HikariCP</artifactId>
+                <version>3.2.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -204,6 +210,7 @@
         <module>ruoyi-quartz</module>
         <module>ruoyi-generator</module>
         <module>ruoyi-common</module>
+        <module>xiaoyi-mpgb</module>
     </modules>
     <packaging>pom</packaging>
 

spring-boot/ruoyi-admin/pom.xml

@@ -50,7 +50,7 @@
             <artifactId>springfox-swagger-ui</artifactId>
         </dependency>
 
-         <!-- Mysql驱动包 -->
+        <!-- Mysql驱动包 -->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
@@ -73,6 +73,17 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-generator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+            <version>4.0.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+            <version>4.0.3</version>
+        </dependency>
+
 
     </dependencies>
 
@@ -101,7 +112,7 @@
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                     <warName>${project.artifactId}</warName>
                 </configuration>
-           </plugin>   
+            </plugin>
         </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>

spring-boot/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -9,11 +9,9 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  *
  * @author ruoyi
  */
-@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
-public class RuoYiApplication
+public class RuoYiApplication {
-{
+    public static void main(String[] args) {
-    public static void main(String[] args)
-    {
         // System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(RuoYiApplication.class, args);
         System.out.println("(♥◠‿◠)ﾉﾞ  若依启动成功   ლ(´ڡ`ლ)ﾞ  \n" +

spring-boot/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java

@@ -8,11 +8,9 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
  *
  * @author ruoyi
  */
-public class RuoYiServletInitializer extends SpringBootServletInitializer
+public class RuoYiServletInitializer extends SpringBootServletInitializer {
-{
     @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-    {
         return application.sources(RuoYiApplication.class);
     }
 }

spring-boot/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java

@@ -6,6 +6,7 @@ import java.util.concurrent.TimeUnit;
 import javax.annotation.Resource;
 import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.FastByteArrayOutputStream;
@@ -24,8 +25,7 @@ import com.ruoyi.common.utils.uuid.IdUtils;
  * @author ruoyi
  */
 @RestController
-public class CaptchaController
+public class CaptchaController {
-{
     @Resource(name = "captchaProducer")
     private Producer captchaProducer;
 
@@ -43,8 +43,7 @@ public class CaptchaController
      * 生成验证码
      */
     @GetMapping("/captchaImage")
-    public AjaxResult getCode(HttpServletResponse response) throws IOException
+    public AjaxResult getCode(HttpServletResponse response) throws IOException {
-    {
         // 保存验证码信息
         String uuid = IdUtils.simpleUUID();
         String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
@@ -53,15 +52,12 @@ public class CaptchaController
         BufferedImage image = null;
 
         // 生成验证码
-        if ("math".equals(captchaType))
+        if ("math".equals(captchaType)) {
-        {
             String capText = captchaProducerMath.createText();
             capStr = capText.substring(0, capText.lastIndexOf("@"));
             code = capText.substring(capText.lastIndexOf("@") + 1);
             image = captchaProducerMath.createImage(capStr);
-        }
+        } else if ("char".equals(captchaType)) {
-        else if ("char".equals(captchaType))
-        {
             capStr = code = captchaProducer.createText();
             image = captchaProducer.createImage(capStr);
         }
@@ -69,12 +65,9 @@ public class CaptchaController
         redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
         // 转换流信息写出
         FastByteArrayOutputStream os = new FastByteArrayOutputStream();
-        try
+        try {
-        {
             ImageIO.write(image, "jpg", os);
-        }
+        } catch (IOException e) {
-        catch (IOException e)
-        {
             return AjaxResult.error(e.getMessage());
         }
 

spring-boot/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.common;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,8 +25,7 @@ import com.ruoyi.framework.config.ServerConfig;
  * @author ruoyi
  */
 @RestController
-public class CommonController
+public class CommonController {
-{
     private static final Logger log = LoggerFactory.getLogger(CommonController.class);
 
     @Autowired
@@ -35,15 +35,12 @@ public class CommonController
      * 通用下载请求
      *
      * @param fileName 文件名称
-     * @param delete 是否删除
+     * @param delete   是否删除
      */
     @GetMapping("common/download")
-    public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request)
+    public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request) {
-    {
+        try {
-        try
+            if (!FileUtils.checkAllowDownload(fileName)) {
-        {
-            if (!FileUtils.checkAllowDownload(fileName))
-            {
                 throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName));
             }
             String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
@@ -52,13 +49,10 @@ public class CommonController
             response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
             FileUtils.setAttachmentResponseHeader(response, realFileName);
             FileUtils.writeBytes(filePath, response.getOutputStream());
-            if (delete)
+            if (delete) {
-            {
                 FileUtils.deleteFile(filePath);
             }
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             log.error("下载文件失败", e);
         }
     }
@@ -67,10 +61,8 @@ public class CommonController
      * 通用上传请求
      */
     @PostMapping("/common/upload")
-    public AjaxResult uploadFile(MultipartFile file) throws Exception
+    public AjaxResult uploadFile(MultipartFile file) throws Exception {
-    {
+        try {
-        try
-        {
             // 上传文件路径
             String filePath = RuoYiConfig.getUploadPath();
             // 上传并返回新文件名称
@@ -80,9 +72,7 @@ public class CommonController
             ajax.put("fileName", fileName);
             ajax.put("url", url);
             return ajax;
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             return AjaxResult.error(e.getMessage());
         }
     }
@@ -92,12 +82,9 @@ public class CommonController
      */
     @GetMapping("/common/download/resource")
     public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response)
-            throws Exception
+            throws Exception {
-    {
+        try {
-        try
+            if (!FileUtils.checkAllowDownload(resource)) {
-        {
-            if (!FileUtils.checkAllowDownload(resource))
-            {
                 throw new Exception(StringUtils.format("资源文件({})非法，不允许下载。 ", resource));
             }
             // 本地资源路径
@@ -109,9 +96,7 @@ public class CommonController
             response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
             FileUtils.setAttachmentResponseHeader(response, downloadName);
             FileUtils.writeBytes(downloadPath, response.getOutputStream());
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             log.error("下载文件失败", e);
         }
     }

spring-boot/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java

@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisCallback;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -22,15 +23,13 @@ import com.ruoyi.common.utils.StringUtils;
  */
 @RestController
 @RequestMapping("/monitor/cache")
-public class CacheController
+public class CacheController {
-{
     @Autowired
     private RedisTemplate<String, String> redisTemplate;
 
     @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
     @GetMapping()
-    public AjaxResult getInfo() throws Exception
+    public AjaxResult getInfo() throws Exception {
-    {
         Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info());
         Properties commandStats = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info("commandstats"));
         Object dbSize = redisTemplate.execute((RedisCallback<Object>) connection -> connection.dbSize());

spring-boot/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java

@@ -14,12 +14,10 @@ import com.ruoyi.framework.web.domain.Server;
  */
 @RestController
 @RequestMapping("/monitor/server")
-public class ServerController
+public class ServerController {
-{
     @PreAuthorize("@ss.hasPermi('monitor:server:list')")
     @GetMapping()
-    public AjaxResult getInfo() throws Exception
+    public AjaxResult getInfo() throws Exception {
-    {
         Server server = new Server();
         server.copyTo();
         return AjaxResult.success(server);

spring-boot/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.monitor;
 
 import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -24,15 +25,13 @@ import com.ruoyi.system.service.ISysLogininforService;
  */
 @RestController
 @RequestMapping("/monitor/logininfor")
-public class SysLogininforController extends BaseController
+public class SysLogininforController extends BaseController {
-{
     @Autowired
     private ISysLogininforService logininforService;
 
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysLogininfor logininfor)
+    public TableDataInfo list(SysLogininfor logininfor) {
-    {
         startPage();
         List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
         return getDataTable(list);
@@ -41,8 +40,7 @@ public class SysLogininforController extends BaseController
     @Log(title = "登录日志", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
     @GetMapping("/export")
-    public AjaxResult export(SysLogininfor logininfor)
+    public AjaxResult export(SysLogininfor logininfor) {
-    {
         List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
         ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class);
         return util.exportExcel(list, "登录日志");
@@ -51,16 +49,14 @@ public class SysLogininforController extends BaseController
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
     @Log(title = "登录日志", businessType = BusinessType.DELETE)
     @DeleteMapping("/{infoIds}")
-    public AjaxResult remove(@PathVariable Long[] infoIds)
+    public AjaxResult remove(@PathVariable Long[] infoIds) {
-    {
         return toAjax(logininforService.deleteLogininforByIds(infoIds));
     }
 
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
     @Log(title = "登录日志", businessType = BusinessType.CLEAN)
     @DeleteMapping("/clean")
-    public AjaxResult clean()
+    public AjaxResult clean() {
-    {
         logininforService.cleanLogininfor();
         return AjaxResult.success();
     }

spring-boot/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.monitor;
 
 import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -24,15 +25,13 @@ import com.ruoyi.system.service.ISysOperLogService;
  */
 @RestController
 @RequestMapping("/monitor/operlog")
-public class SysOperlogController extends BaseController
+public class SysOperlogController extends BaseController {
-{
     @Autowired
     private ISysOperLogService operLogService;
 
     @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysOperLog operLog)
+    public TableDataInfo list(SysOperLog operLog) {
-    {
         startPage();
         List<SysOperLog> list = operLogService.selectOperLogList(operLog);
         return getDataTable(list);
@@ -41,8 +40,7 @@ public class SysOperlogController extends BaseController
     @Log(title = "操作日志", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
     @GetMapping("/export")
-    public AjaxResult export(SysOperLog operLog)
+    public AjaxResult export(SysOperLog operLog) {
-    {
         List<SysOperLog> list = operLogService.selectOperLogList(operLog);
         ExcelUtil<SysOperLog> util = new ExcelUtil<SysOperLog>(SysOperLog.class);
         return util.exportExcel(list, "操作日志");
@@ -50,16 +48,14 @@ public class SysOperlogController extends BaseController
 
     @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
     @DeleteMapping("/{operIds}")
-    public AjaxResult remove(@PathVariable Long[] operIds)
+    public AjaxResult remove(@PathVariable Long[] operIds) {
-    {
         return toAjax(operLogService.deleteOperLogByIds(operIds));
     }
 
     @Log(title = "操作日志", businessType = BusinessType.CLEAN)
     @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
     @DeleteMapping("/clean")
-    public AjaxResult clean()
+    public AjaxResult clean() {
-    {
         operLogService.cleanOperLog();
         return AjaxResult.success();
     }

spring-boot/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -30,8 +31,7 @@ import com.ruoyi.system.service.ISysUserOnlineService;
  */
 @RestController
 @RequestMapping("/monitor/online")
-public class SysUserOnlineController extends BaseController
+public class SysUserOnlineController extends BaseController {
-{
     @Autowired
     private ISysUserOnlineService userOnlineService;
 
@@ -40,36 +40,24 @@ public class SysUserOnlineController extends BaseController
 
     @PreAuthorize("@ss.hasPermi('monitor:online:list')")
     @GetMapping("/list")
-    public TableDataInfo list(String ipaddr, String userName)
+    public TableDataInfo list(String ipaddr, String userName) {
-    {
         Collection<String> keys = redisCache.keys(Constants.LOGIN_TOKEN_KEY + "*");
         List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
-        for (String key : keys)
+        for (String key : keys) {
-        {
             LoginUser user = redisCache.getCacheObject(key);
-            if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
+            if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) {
-            {
+                if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) {
-                if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))
-                {
                     userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
                 }
-            }
+            } else if (StringUtils.isNotEmpty(ipaddr)) {
-            else if (StringUtils.isNotEmpty(ipaddr))
+                if (StringUtils.equals(ipaddr, user.getIpaddr())) {
-            {
-                if (StringUtils.equals(ipaddr, user.getIpaddr()))
-                {
                     userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
                 }
-            }
+            } else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser())) {
-            else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser()))
+                if (StringUtils.equals(userName, user.getUsername())) {
-            {
-                if (StringUtils.equals(userName, user.getUsername()))
-                {
                     userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
                 }
-            }
+            } else {
-            else
-            {
                 userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
             }
         }
@@ -84,8 +72,7 @@ public class SysUserOnlineController extends BaseController
     @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
     @Log(title = "在线用户", businessType = BusinessType.FORCE)
     @DeleteMapping("/{tokenId}")
-    public AjaxResult forceLogout(@PathVariable String tokenId)
+    public AjaxResult forceLogout(@PathVariable String tokenId) {
-    {
         redisCache.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId);
         return AjaxResult.success();
     }

spring-boot/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.system;
 
 import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -31,8 +32,7 @@ import com.ruoyi.system.service.ISysConfigService;
  */
 @RestController
 @RequestMapping("/system/config")
-public class SysConfigController extends BaseController
+public class SysConfigController extends BaseController {
-{
     @Autowired
     private ISysConfigService configService;
 
@@ -41,8 +41,7 @@ public class SysConfigController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:config:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysConfig config)
+    public TableDataInfo list(SysConfig config) {
-    {
         startPage();
         List<SysConfig> list = configService.selectConfigList(config);
         return getDataTable(list);
@@ -51,8 +50,7 @@ public class SysConfigController extends BaseController
     @Log(title = "参数管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:config:export')")
     @GetMapping("/export")
-    public AjaxResult export(SysConfig config)
+    public AjaxResult export(SysConfig config) {
-    {
         List<SysConfig> list = configService.selectConfigList(config);
         ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
         return util.exportExcel(list, "参数数据");
@@ -63,8 +61,7 @@ public class SysConfigController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:config:query')")
     @GetMapping(value = "/{configId}")
-    public AjaxResult getInfo(@PathVariable Long configId)
+    public AjaxResult getInfo(@PathVariable Long configId) {
-    {
         return AjaxResult.success(configService.selectConfigById(configId));
     }
 
@@ -72,8 +69,7 @@ public class SysConfigController extends BaseController
      * 根据参数键名查询参数值
      */
     @GetMapping(value = "/configKey/{configKey}")
-    public AjaxResult getConfigKey(@PathVariable String configKey)
+    public AjaxResult getConfigKey(@PathVariable String configKey) {
-    {
         return AjaxResult.success(configService.selectConfigByKey(configKey));
     }
 
@@ -84,10 +80,8 @@ public class SysConfigController extends BaseController
     @Log(title = "参数管理", businessType = BusinessType.INSERT)
     @PostMapping
     @RepeatSubmit
-    public AjaxResult add(@Validated @RequestBody SysConfig config)
+    public AjaxResult add(@Validated @RequestBody SysConfig config) {
-    {
+        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
-        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
-        {
             return AjaxResult.error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
         config.setCreateBy(SecurityUtils.getUsername());
@@ -100,10 +94,8 @@ public class SysConfigController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:config:edit')")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysConfig config)
+    public AjaxResult edit(@Validated @RequestBody SysConfig config) {
-    {
+        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
-        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
-        {
             return AjaxResult.error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
         config.setUpdateBy(SecurityUtils.getUsername());
@@ -116,8 +108,7 @@ public class SysConfigController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:config:remove')")
     @Log(title = "参数管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{configIds}")
-    public AjaxResult remove(@PathVariable Long[] configIds)
+    public AjaxResult remove(@PathVariable Long[] configIds) {
-    {
         return toAjax(configService.deleteConfigByIds(configIds));
     }
 
@@ -127,8 +118,7 @@ public class SysConfigController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:config:remove')")
     @Log(title = "参数管理", businessType = BusinessType.CLEAN)
     @DeleteMapping("/clearCache")
-    public AjaxResult clearCache()
+    public AjaxResult clearCache() {
-    {
         configService.clearCache();
         return AjaxResult.success();
     }

spring-boot/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.system;
 
 import java.util.Iterator;
 import java.util.List;
+
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -31,8 +32,7 @@ import com.ruoyi.system.service.ISysDeptService;
  */
 @RestController
 @RequestMapping("/system/dept")
-public class SysDeptController extends BaseController
+public class SysDeptController extends BaseController {
-{
     @Autowired
     private ISysDeptService deptService;
 
@@ -41,8 +41,7 @@ public class SysDeptController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list")
-    public AjaxResult list(SysDept dept)
+    public AjaxResult list(SysDept dept) {
-    {
         List<SysDept> depts = deptService.selectDeptList(dept);
         return AjaxResult.success(depts);
     }
@@ -52,16 +51,13 @@ public class SysDeptController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list/exclude/{deptId}")
-    public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
+    public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) {
-    {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
         Iterator<SysDept> it = depts.iterator();
-        while (it.hasNext())
+        while (it.hasNext()) {
-        {
             SysDept d = (SysDept) it.next();
             if (d.getDeptId().intValue() == deptId
-                    || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""))
+                    || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + "")) {
-            {
                 it.remove();
             }
         }
@@ -73,8 +69,7 @@ public class SysDeptController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dept:query')")
     @GetMapping(value = "/{deptId}")
-    public AjaxResult getInfo(@PathVariable Long deptId)
+    public AjaxResult getInfo(@PathVariable Long deptId) {
-    {
         return AjaxResult.success(deptService.selectDeptById(deptId));
     }
 
@@ -82,8 +77,7 @@ public class SysDeptController extends BaseController
      * 获取部门下拉树列表
      */
     @GetMapping("/treeselect")
-    public AjaxResult treeselect(SysDept dept)
+    public AjaxResult treeselect(SysDept dept) {
-    {
         List<SysDept> depts = deptService.selectDeptList(dept);
         return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
     }
@@ -92,8 +86,7 @@ public class SysDeptController extends BaseController
      * 加载对应角色部门列表树
      */
     @GetMapping(value = "/roleDeptTreeselect/{roleId}")
-    public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId)
+    public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId) {
-    {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
         AjaxResult ajax = AjaxResult.success();
         ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
@@ -107,10 +100,8 @@ public class SysDeptController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dept:add')")
     @Log(title = "部门管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysDept dept)
+    public AjaxResult add(@Validated @RequestBody SysDept dept) {
-    {
+        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
-        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
-        {
             return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
         dept.setCreateBy(SecurityUtils.getUsername());
@@ -123,19 +114,13 @@ public class SysDeptController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dept:edit')")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysDept dept)
+    public AjaxResult edit(@Validated @RequestBody SysDept dept) {
-    {
+        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
-        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
-        {
             return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
-        }
+        } else if (dept.getParentId().equals(dept.getDeptId())) {
-        else if (dept.getParentId().equals(dept.getDeptId()))
-        {
             return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
-        }
+        } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
-        else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
+                && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0) {
-                && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0)
-        {
             return AjaxResult.error("该部门包含未停用的子部门！");
         }
         dept.setUpdateBy(SecurityUtils.getUsername());
@@ -148,14 +133,11 @@ public class SysDeptController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dept:remove')")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{deptId}")
-    public AjaxResult remove(@PathVariable Long deptId)
+    public AjaxResult remove(@PathVariable Long deptId) {
-    {
+        if (deptService.hasChildByDeptId(deptId)) {
-        if (deptService.hasChildByDeptId(deptId))
-        {
             return AjaxResult.error("存在下级部门,不允许删除");
         }
-        if (deptService.checkDeptExistUser(deptId))
+        if (deptService.checkDeptExistUser(deptId)) {
-        {
             return AjaxResult.error("部门存在用户,不允许删除");
         }
         return toAjax(deptService.deleteDeptById(deptId));

spring-boot/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java

@@ -2,6 +2,8 @@ package com.ruoyi.web.controller.system;
 
 import java.util.ArrayList;
 import java.util.List;
+
+import com.alibaba.druid.pool.DruidDataSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -32,8 +34,7 @@ import com.ruoyi.system.service.ISysDictTypeService;
  */
 @RestController
 @RequestMapping("/system/dict/data")
-public class SysDictDataController extends BaseController
+public class SysDictDataController extends BaseController {
-{
     @Autowired
     private ISysDictDataService dictDataService;
 
@@ -42,9 +43,10 @@ public class SysDictDataController extends BaseController
 
     @PreAuthorize("@ss.hasPermi('system:dict:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysDictData dictData)
+    public TableDataInfo list(SysDictData dictData) {
-    {
+
         startPage();
+
         List<SysDictData> list = dictDataService.selectDictDataList(dictData);
         return getDataTable(list);
     }
@@ -52,8 +54,7 @@ public class SysDictDataController extends BaseController
     @Log(title = "字典数据", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:dict:export')")
     @GetMapping("/export")
-    public AjaxResult export(SysDictData dictData)
+    public AjaxResult export(SysDictData dictData) {
-    {
         List<SysDictData> list = dictDataService.selectDictDataList(dictData);
         ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
         return util.exportExcel(list, "字典数据");
@@ -64,8 +65,7 @@ public class SysDictDataController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dict:query')")
     @GetMapping(value = "/{dictCode}")
-    public AjaxResult getInfo(@PathVariable Long dictCode)
+    public AjaxResult getInfo(@PathVariable Long dictCode) {
-    {
         return AjaxResult.success(dictDataService.selectDictDataById(dictCode));
     }
 
@@ -73,11 +73,9 @@ public class SysDictDataController extends BaseController
      * 根据字典类型查询字典数据信息
      */
     @GetMapping(value = "/type/{dictType}")
-    public AjaxResult dictType(@PathVariable String dictType)
+    public AjaxResult dictType(@PathVariable String dictType) {
-    {
         List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
-        if (StringUtils.isNull(data))
+        if (StringUtils.isNull(data)) {
-        {
             data = new ArrayList<SysDictData>();
         }
         return AjaxResult.success(data);
@@ -89,8 +87,7 @@ public class SysDictDataController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:add')")
     @Log(title = "字典数据", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysDictData dict)
+    public AjaxResult add(@Validated @RequestBody SysDictData dict) {
-    {
         dict.setCreateBy(SecurityUtils.getUsername());
         return toAjax(dictDataService.insertDictData(dict));
     }
@@ -101,8 +98,7 @@ public class SysDictDataController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:edit')")
     @Log(title = "字典数据", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysDictData dict)
+    public AjaxResult edit(@Validated @RequestBody SysDictData dict) {
-    {
         dict.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(dictDataService.updateDictData(dict));
     }
@@ -113,8 +109,7 @@ public class SysDictDataController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictCodes}")
-    public AjaxResult remove(@PathVariable Long[] dictCodes)
+    public AjaxResult remove(@PathVariable Long[] dictCodes) {
-    {
         return toAjax(dictDataService.deleteDictDataByIds(dictCodes));
     }
 }

spring-boot/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.system;
 
 import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -30,15 +31,13 @@ import com.ruoyi.system.service.ISysDictTypeService;
  */
 @RestController
 @RequestMapping("/system/dict/type")
-public class SysDictTypeController extends BaseController
+public class SysDictTypeController extends BaseController {
-{
     @Autowired
     private ISysDictTypeService dictTypeService;
 
     @PreAuthorize("@ss.hasPermi('system:dict:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysDictType dictType)
+    public TableDataInfo list(SysDictType dictType) {
-    {
         startPage();
         List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
         return getDataTable(list);
@@ -47,8 +46,7 @@ public class SysDictTypeController extends BaseController
     @Log(title = "字典类型", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:dict:export')")
     @GetMapping("/export")
-    public AjaxResult export(SysDictType dictType)
+    public AjaxResult export(SysDictType dictType) {
-    {
         List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
         ExcelUtil<SysDictType> util = new ExcelUtil<SysDictType>(SysDictType.class);
         return util.exportExcel(list, "字典类型");
@@ -59,8 +57,7 @@ public class SysDictTypeController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dict:query')")
     @GetMapping(value = "/{dictId}")
-    public AjaxResult getInfo(@PathVariable Long dictId)
+    public AjaxResult getInfo(@PathVariable Long dictId) {
-    {
         return AjaxResult.success(dictTypeService.selectDictTypeById(dictId));
     }
 
@@ -70,10 +67,8 @@ public class SysDictTypeController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:add')")
     @Log(title = "字典类型", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysDictType dict)
+    public AjaxResult add(@Validated @RequestBody SysDictType dict) {
-    {
+        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
-        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
-        {
             return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
         }
         dict.setCreateBy(SecurityUtils.getUsername());
@@ -86,10 +81,8 @@ public class SysDictTypeController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:edit')")
     @Log(title = "字典类型", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysDictType dict)
+    public AjaxResult edit(@Validated @RequestBody SysDictType dict) {
-    {
+        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
-        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
-        {
             return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
         }
         dict.setUpdateBy(SecurityUtils.getUsername());
@@ -102,8 +95,7 @@ public class SysDictTypeController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictIds}")
-    public AjaxResult remove(@PathVariable Long[] dictIds)
+    public AjaxResult remove(@PathVariable Long[] dictIds) {
-    {
         return toAjax(dictTypeService.deleteDictTypeByIds(dictIds));
     }
 
@@ -113,8 +105,7 @@ public class SysDictTypeController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.CLEAN)
     @DeleteMapping("/clearCache")
-    public AjaxResult clearCache()
+    public AjaxResult clearCache() {
-    {
         dictTypeService.clearCache();
         return AjaxResult.success();
     }
@@ -123,8 +114,7 @@ public class SysDictTypeController extends BaseController
      * 获取字典选择框列表
      */
     @GetMapping("/optionselect")
-    public AjaxResult optionselect()
+    public AjaxResult optionselect() {
-    {
         List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
         return AjaxResult.success(dictTypes);
     }

spring-boot/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -1,7 +1,11 @@
 package com.ruoyi.web.controller.system;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
+
+import com.ruoyi.common.core.domain.model.MpLoginBody;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -25,8 +29,7 @@ import com.ruoyi.system.service.ISysMenuService;
  * @author ruoyi
  */
 @RestController
-public class SysLoginController
+public class SysLoginController {
-{
     @Autowired
     private SysLoginService loginService;
 
@@ -46,8 +49,7 @@ public class SysLoginController
      * @return 结果
      */
     @PostMapping("/login")
-    public AjaxResult login(@RequestBody LoginBody loginBody)
+    public AjaxResult login(@RequestBody LoginBody loginBody) {
-    {
         AjaxResult ajax = AjaxResult.success();
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
@@ -56,14 +58,31 @@ public class SysLoginController
         return ajax;
     }
 
+    /**
+     * @return
+     * @Method 微信小程序用户登录
+     * @Description TODO
+     * @Param null
+     * @date 2021-08-26,0026 11:47
+     * @author admin
+     */
+    @PostMapping("/wxLogin")
+    public AjaxResult wxLogin(@RequestBody MpLoginBody loginBody) {
+        AjaxResult ajax = AjaxResult.success();
+        // 生成令牌
+        String token = loginService.mpLlogin(loginBody);
+        ajax.put(Constants.TOKEN, token);
+
+        return ajax;
+    }
+
     /**
      * 获取用户信息
      *
      * @return 用户信息
      */
     @GetMapping("getInfo")
-    public AjaxResult getInfo()
+    public AjaxResult getInfo() {
-    {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         SysUser user = loginUser.getUser();
         // 角色集合
@@ -83,8 +102,7 @@ public class SysLoginController
      * @return 路由信息
      */
     @GetMapping("getRouters")
-    public AjaxResult getRouters()
+    public AjaxResult getRouters() {
-    {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         // 用户信息
         SysUser user = loginUser.getUser();

spring-boot/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.system;
 
 import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -33,8 +34,7 @@ import com.ruoyi.system.service.ISysMenuService;
  */
 @RestController
 @RequestMapping("/system/menu")
-public class SysMenuController extends BaseController
+public class SysMenuController extends BaseController {
-{
     @Autowired
     private ISysMenuService menuService;
 
@@ -46,11 +46,11 @@ public class SysMenuController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:menu:list')")
     @GetMapping("/list")
-    public AjaxResult list(SysMenu menu)
+    public AjaxResult list(SysMenu menu) {
-    {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         Long userId = loginUser.getUser().getUserId();
         List<SysMenu> menus = menuService.selectMenuList(menu, userId);
+
         return AjaxResult.success(menus);
     }
 
@@ -59,8 +59,7 @@ public class SysMenuController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:menu:query')")
     @GetMapping(value = "/{menuId}")
-    public AjaxResult getInfo(@PathVariable Long menuId)
+    public AjaxResult getInfo(@PathVariable Long menuId) {
-    {
         return AjaxResult.success(menuService.selectMenuById(menuId));
     }
 
@@ -68,8 +67,7 @@ public class SysMenuController extends BaseController
      * 获取菜单下拉树列表
      */
     @GetMapping("/treeselect")
-    public AjaxResult treeselect(SysMenu menu)
+    public AjaxResult treeselect(SysMenu menu) {
-    {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         Long userId = loginUser.getUser().getUserId();
         List<SysMenu> menus = menuService.selectMenuList(menu, userId);
@@ -80,8 +78,7 @@ public class SysMenuController extends BaseController
      * 加载对应角色菜单列表树
      */
     @GetMapping(value = "/roleMenuTreeselect/{roleId}")
-    public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
+    public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId) {
-    {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         List<SysMenu> menus = menuService.selectMenuList(loginUser.getUser().getUserId());
         AjaxResult ajax = AjaxResult.success();
@@ -96,15 +93,11 @@ public class SysMenuController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:menu:add')")
     @Log(title = "菜单管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysMenu menu)
+    public AjaxResult add(@Validated @RequestBody SysMenu menu) {
-    {
+        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
-        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
-        {
             return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
-        }
+        } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
-        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
+                && !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS)) {
-                && !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
-        {
             return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
         }
         menu.setCreateBy(SecurityUtils.getUsername());
@@ -117,19 +110,13 @@ public class SysMenuController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:menu:edit')")
     @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysMenu menu)
+    public AjaxResult edit(@Validated @RequestBody SysMenu menu) {
-    {
+        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
-        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
-        {
             return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
-        }
+        } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
-        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
+                && !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS)) {
-                && !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS))
-        {
             return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
-        }
+        } else if (menu.getMenuId().equals(menu.getParentId())) {
-        else if (menu.getMenuId().equals(menu.getParentId()))
-        {
             return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
         }
         menu.setUpdateBy(SecurityUtils.getUsername());
@@ -142,14 +129,11 @@ public class SysMenuController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:menu:remove')")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{menuId}")
-    public AjaxResult remove(@PathVariable("menuId") Long menuId)
+    public AjaxResult remove(@PathVariable("menuId") Long menuId) {
-    {
+        if (menuService.hasChildByMenuId(menuId)) {
-        if (menuService.hasChildByMenuId(menuId))
-        {
             return AjaxResult.error("存在子菜单,不允许删除");
         }
-        if (menuService.checkMenuExistRole(menuId))
+        if (menuService.checkMenuExistRole(menuId)) {
-        {
             return AjaxResult.error("菜单已分配,不允许删除");
         }
         return toAjax(menuService.deleteMenuById(menuId));

spring-boot/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.system;
 
 import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -28,8 +29,7 @@ import com.ruoyi.system.service.ISysNoticeService;
  */
 @RestController
 @RequestMapping("/system/notice")
-public class SysNoticeController extends BaseController
+public class SysNoticeController extends BaseController {
-{
     @Autowired
     private ISysNoticeService noticeService;
 
@@ -38,8 +38,7 @@ public class SysNoticeController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:notice:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysNotice notice)
+    public TableDataInfo list(SysNotice notice) {
-    {
         startPage();
         List<SysNotice> list = noticeService.selectNoticeList(notice);
         return getDataTable(list);
@@ -50,8 +49,7 @@ public class SysNoticeController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:notice:query')")
     @GetMapping(value = "/{noticeId}")
-    public AjaxResult getInfo(@PathVariable Long noticeId)
+    public AjaxResult getInfo(@PathVariable Long noticeId) {
-    {
         return AjaxResult.success(noticeService.selectNoticeById(noticeId));
     }
 
@@ -61,8 +59,7 @@ public class SysNoticeController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:notice:add')")
     @Log(title = "通知公告", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysNotice notice)
+    public AjaxResult add(@Validated @RequestBody SysNotice notice) {
-    {
         notice.setCreateBy(SecurityUtils.getUsername());
         return toAjax(noticeService.insertNotice(notice));
     }
@@ -73,8 +70,7 @@ public class SysNoticeController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:notice:edit')")
     @Log(title = "通知公告", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysNotice notice)
+    public AjaxResult edit(@Validated @RequestBody SysNotice notice) {
-    {
         notice.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(noticeService.updateNotice(notice));
     }
@@ -85,8 +81,7 @@ public class SysNoticeController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:notice:remove')")
     @Log(title = "通知公告", businessType = BusinessType.DELETE)
     @DeleteMapping("/{noticeIds}")
-    public AjaxResult remove(@PathVariable Long[] noticeIds)
+    public AjaxResult remove(@PathVariable Long[] noticeIds) {
-    {
         return toAjax(noticeService.deleteNoticeByIds(noticeIds));
     }
 }

spring-boot/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.system;
 
 import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -30,8 +31,7 @@ import com.ruoyi.system.service.ISysPostService;
  */
 @RestController
 @RequestMapping("/system/post")
-public class SysPostController extends BaseController
+public class SysPostController extends BaseController {
-{
     @Autowired
     private ISysPostService postService;
 
@@ -40,8 +40,7 @@ public class SysPostController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:post:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysPost post)
+    public TableDataInfo list(SysPost post) {
-    {
         startPage();
         List<SysPost> list = postService.selectPostList(post);
         return getDataTable(list);
@@ -50,8 +49,7 @@ public class SysPostController extends BaseController
     @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:post:export')")
     @GetMapping("/export")
-    public AjaxResult export(SysPost post)
+    public AjaxResult export(SysPost post) {
-    {
         List<SysPost> list = postService.selectPostList(post);
         ExcelUtil<SysPost> util = new ExcelUtil<SysPost>(SysPost.class);
         return util.exportExcel(list, "岗位数据");
@@ -62,8 +60,7 @@ public class SysPostController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:post:query')")
     @GetMapping(value = "/{postId}")
-    public AjaxResult getInfo(@PathVariable Long postId)
+    public AjaxResult getInfo(@PathVariable Long postId) {
-    {
         return AjaxResult.success(postService.selectPostById(postId));
     }
 
@@ -73,14 +70,10 @@ public class SysPostController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:post:add')")
     @Log(title = "岗位管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysPost post)
+    public AjaxResult add(@Validated @RequestBody SysPost post) {
-    {
+        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) {
-        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
-        {
             return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
-        }
+        } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) {
-        else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
-        {
             return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
         }
         post.setCreateBy(SecurityUtils.getUsername());
@@ -93,14 +86,10 @@ public class SysPostController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:post:edit')")
     @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysPost post)
+    public AjaxResult edit(@Validated @RequestBody SysPost post) {
-    {
+        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) {
-        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
-        {
             return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
-        }
+        } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) {
-        else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
-        {
             return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
         }
         post.setUpdateBy(SecurityUtils.getUsername());
@@ -113,8 +102,7 @@ public class SysPostController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:post:remove')")
     @Log(title = "岗位管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{postIds}")
-    public AjaxResult remove(@PathVariable Long[] postIds)
+    public AjaxResult remove(@PathVariable Long[] postIds) {
-    {
         return toAjax(postService.deletePostByIds(postIds));
     }
 
@@ -122,8 +110,7 @@ public class SysPostController extends BaseController
      * 获取岗位选择框列表
      */
     @GetMapping("/optionselect")
-    public AjaxResult optionselect()
+    public AjaxResult optionselect() {
-    {
         List<SysPost> posts = postService.selectPostAll();
         return AjaxResult.success(posts);
     }

spring-boot/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.system;
 
 import java.io.IOException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -30,8 +31,7 @@ import com.ruoyi.system.service.ISysUserService;
  */
 @RestController
 @RequestMapping("/system/user/profile")
-public class SysProfileController extends BaseController
+public class SysProfileController extends BaseController {
-{
     @Autowired
     private ISysUserService userService;
 
@@ -42,8 +42,7 @@ public class SysProfileController extends BaseController
      * 个人信息
      */
     @GetMapping
-    public AjaxResult profile()
+    public AjaxResult profile() {
-    {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         SysUser user = loginUser.getUser();
         AjaxResult ajax = AjaxResult.success(user);
@@ -57,10 +56,8 @@ public class SysProfileController extends BaseController
      */
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult updateProfile(@RequestBody SysUser user)
+    public AjaxResult updateProfile(@RequestBody SysUser user) {
-    {
+        if (userService.updateUserProfile(user) > 0) {
-        if (userService.updateUserProfile(user) > 0)
-        {
             LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
             // 更新缓存用户信息
             loginUser.getUser().setNickName(user.getNickName());
@@ -78,21 +75,17 @@ public class SysProfileController extends BaseController
      */
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping("/updatePwd")
-    public AjaxResult updatePwd(String oldPassword, String newPassword)
+    public AjaxResult updatePwd(String oldPassword, String newPassword) {
-    {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         String userName = loginUser.getUsername();
         String password = loginUser.getPassword();
-        if (!SecurityUtils.matchesPassword(oldPassword, password))
+        if (!SecurityUtils.matchesPassword(oldPassword, password)) {
-        {
             return AjaxResult.error("修改密码失败，旧密码错误");
         }
-        if (SecurityUtils.matchesPassword(newPassword, password))
+        if (SecurityUtils.matchesPassword(newPassword, password)) {
-        {
             return AjaxResult.error("新密码不能与旧密码相同");
         }
-        if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0)
+        if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) {
-        {
             // 更新缓存用户密码
             loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword));
             tokenService.setLoginUser(loginUser);
@@ -106,14 +99,11 @@ public class SysProfileController extends BaseController
      */
     @Log(title = "用户头像", businessType = BusinessType.UPDATE)
     @PostMapping("/avatar")
-    public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws IOException
+    public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws IOException {
-    {
+        if (!file.isEmpty()) {
-        if (!file.isEmpty())
-        {
             LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
             String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file);
-            if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
+            if (userService.updateUserAvatar(loginUser.getUsername(), avatar)) {
-            {
                 AjaxResult ajax = AjaxResult.success();
                 ajax.put("imgUrl", avatar);
                 // 更新缓存用户头像

spring-boot/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.system;
 
 import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -36,8 +37,7 @@ import com.ruoyi.system.service.ISysUserService;
  */
 @RestController
 @RequestMapping("/system/role")
-public class SysRoleController extends BaseController
+public class SysRoleController extends BaseController {
-{
     @Autowired
     private ISysRoleService roleService;
 
@@ -52,8 +52,7 @@ public class SysRoleController extends BaseController
 
     @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysRole role)
+    public TableDataInfo list(SysRole role) {
-    {
         startPage();
         List<SysRole> list = roleService.selectRoleList(role);
         return getDataTable(list);
@@ -62,8 +61,7 @@ public class SysRoleController extends BaseController
     @Log(title = "角色管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:role:export')")
     @GetMapping("/export")
-    public AjaxResult export(SysRole role)
+    public AjaxResult export(SysRole role) {
-    {
         List<SysRole> list = roleService.selectRoleList(role);
         ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
         return util.exportExcel(list, "角色数据");
@@ -74,8 +72,7 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping(value = "/{roleId}")
-    public AjaxResult getInfo(@PathVariable Long roleId)
+    public AjaxResult getInfo(@PathVariable Long roleId) {
-    {
         return AjaxResult.success(roleService.selectRoleById(roleId));
     }
 
@@ -85,14 +82,10 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:add')")
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysRole role)
+    public AjaxResult add(@Validated @RequestBody SysRole role) {
-    {
+        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
-        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
-        {
             return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
-        }
+        } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
-        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
-        {
             return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
         role.setCreateBy(SecurityUtils.getUsername());
@@ -106,25 +99,19 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysRole role)
+    public AjaxResult edit(@Validated @RequestBody SysRole role) {
-    {
         roleService.checkRoleAllowed(role);
-        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
+        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
-        {
             return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
-        }
+        } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
-        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
-        {
             return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
         role.setUpdateBy(SecurityUtils.getUsername());
 
-        if (roleService.updateRole(role) > 0)
+        if (roleService.updateRole(role) > 0) {
-        {
             // 更新缓存用户权限
             LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-            if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
+            if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin()) {
-            {
                 loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
                 loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
                 tokenService.setLoginUser(loginUser);
@@ -140,8 +127,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/dataScope")
-    public AjaxResult dataScope(@RequestBody SysRole role)
+    public AjaxResult dataScope(@RequestBody SysRole role) {
-    {
         roleService.checkRoleAllowed(role);
         return toAjax(roleService.authDataScope(role));
     }
@@ -152,8 +138,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public AjaxResult changeStatus(@RequestBody SysRole role)
+    public AjaxResult changeStatus(@RequestBody SysRole role) {
-    {
         roleService.checkRoleAllowed(role);
         role.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(roleService.updateRoleStatus(role));
@@ -165,8 +150,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:remove')")
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{roleIds}")
-    public AjaxResult remove(@PathVariable Long[] roleIds)
+    public AjaxResult remove(@PathVariable Long[] roleIds) {
-    {
         return toAjax(roleService.deleteRoleByIds(roleIds));
     }
 
@@ -175,8 +159,7 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping("/optionselect")
-    public AjaxResult optionselect()
+    public AjaxResult optionselect() {
-    {
         return AjaxResult.success(roleService.selectRoleAll());
     }
 }

spring-boot/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -40,11 +40,10 @@ import com.ruoyi.system.service.ISysUserService;
  *
  * @author ruoyi
  */
-@Api(value="用户管理",tags="用户管理")
+@Api(value = "用户管理", tags = "用户管理")
 @RestController
 @RequestMapping("/system/user")
-public class SysUserController extends BaseController
+public class SysUserController extends BaseController {
-{
     @Autowired
     private ISysUserService userService;
 
@@ -63,8 +62,7 @@ public class SysUserController extends BaseController
     @ApiOperation(value = "获取用户列表", notes = "获取用户列表")
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysUser user)
+    public TableDataInfo list(SysUser user) {
-    {
         startPage();
         List<SysUser> list = userService.selectUserList(user);
         return getDataTable(list);
@@ -73,8 +71,7 @@ public class SysUserController extends BaseController
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:user:export')")
     @GetMapping("/export")
-    public AjaxResult export(SysUser user)
+    public AjaxResult export(SysUser user) {
-    {
         List<SysUser> list = userService.selectUserList(user);
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
         return util.exportExcel(list, "用户数据");
@@ -83,8 +80,7 @@ public class SysUserController extends BaseController
     @Log(title = "用户管理", businessType = BusinessType.IMPORT)
     @PreAuthorize("@ss.hasPermi('system:user:import')")
     @PostMapping("/importData")
-    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
-    {
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
         List<SysUser> userList = util.importExcel(file.getInputStream());
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
@@ -94,8 +90,7 @@ public class SysUserController extends BaseController
     }
 
     @GetMapping("/importTemplate")
-    public AjaxResult importTemplate()
+    public AjaxResult importTemplate() {
-    {
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
         return util.importTemplateExcel("用户数据");
     }
@@ -105,15 +100,13 @@ public class SysUserController extends BaseController
      */
     @ApiOperation(value = "根据用户编号获取详细信息", notes = "根据用户编号获取详细信息")
     @PreAuthorize("@ss.hasPermi('system:user:query')")
-    @GetMapping(value = { "/", "/{userId}" })
+    @GetMapping(value = {"/", "/{userId}"})
-    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
+    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) {
-    {
         AjaxResult ajax = AjaxResult.success();
         List<SysRole> roles = roleService.selectRoleAll();
         ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
         ajax.put("posts", postService.selectPostAll());
-        if (StringUtils.isNotNull(userId))
+        if (StringUtils.isNotNull(userId)) {
-        {
             ajax.put(AjaxResult.DATA_TAG, userService.selectUserById(userId));
             ajax.put("postIds", postService.selectPostListByUserId(userId));
             ajax.put("roleIds", roleService.selectRoleListByUserId(userId));
@@ -128,20 +121,14 @@ public class SysUserController extends BaseController
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation(value = "新增用户", notes = "新增用户")
-    public AjaxResult add(@Validated @RequestBody SysUser user)
+    public AjaxResult add(@Validated @RequestBody SysUser user) {
-    {
+        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) {
-        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName())))
-        {
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
-        }
+        } else if (StringUtils.isNotEmpty(user.getPhonenumber())
-        else if (StringUtils.isNotEmpty(user.getPhonenumber())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
-        {
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
-        }
+        } else if (StringUtils.isNotEmpty(user.getEmail())
-        else if (StringUtils.isNotEmpty(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
-        {
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setCreateBy(SecurityUtils.getUsername());
@@ -155,20 +142,14 @@ public class SysUserController extends BaseController
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping("/register")
     @ApiOperation(value = "用户注册", notes = "用户注册")
-    public AjaxResult register(@Validated @RequestBody SysUser user)
+    public AjaxResult register(@Validated @RequestBody SysUser user) {
-    {
+        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) {
-        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName())))
-        {
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
-        }
+        } else if (StringUtils.isNotEmpty(user.getPhonenumber())
-        else if (StringUtils.isNotEmpty(user.getPhonenumber())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
-        {
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
-        }
+        } else if (StringUtils.isNotEmpty(user.getEmail())
-        else if (StringUtils.isNotEmpty(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
-        {
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setDelFlag("0");
@@ -183,17 +164,13 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysUser user)
+    public AjaxResult edit(@Validated @RequestBody SysUser user) {
-    {
         userService.checkUserAllowed(user);
         if (StringUtils.isNotEmpty(user.getPhonenumber())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
-        {
             return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
-        }
+        } else if (StringUtils.isNotEmpty(user.getEmail())
-        else if (StringUtils.isNotEmpty(user.getEmail())
+                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
-        {
             return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setUpdateBy(SecurityUtils.getUsername());
@@ -207,8 +184,7 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:remove')")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
-    public AjaxResult remove(@PathVariable Long[] userIds)
+    public AjaxResult remove(@PathVariable Long[] userIds) {
-    {
         return toAjax(userService.deleteUserByIds(userIds));
     }
 
@@ -219,8 +195,7 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
-    public AjaxResult resetPwd(@RequestBody SysUser user)
+    public AjaxResult resetPwd(@RequestBody SysUser user) {
-    {
         userService.checkUserAllowed(user);
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         user.setUpdateBy(SecurityUtils.getUsername());
@@ -234,8 +209,7 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public AjaxResult changeStatus(@RequestBody SysUser user)
+    public AjaxResult changeStatus(@RequestBody SysUser user) {
-    {
         userService.checkUserAllowed(user);
         user.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(userService.updateUserStatus(user));

spring-boot/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java

@@ -13,12 +13,10 @@ import com.ruoyi.common.core.controller.BaseController;
  */
 @Controller
 @RequestMapping("/tool/swagger")
-public class SwaggerController extends BaseController
+public class SwaggerController extends BaseController {
-{
     @PreAuthorize("@ss.hasPermi('tool:swagger:view')")
     @GetMapping()
-    public String index()
+    public String index() {
-    {
         return redirect("/swagger-ui.html");
     }
 }

spring-boot/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -28,9 +29,9 @@ import io.swagger.annotations.ApiOperation;
 @Api("用户信息管理")
 @RestController
 @RequestMapping("/test/user")
-public class TestController extends BaseController
+public class TestController extends BaseController {
-{
     private final static Map<Integer, UserEntity> users = new LinkedHashMap<Integer, UserEntity>();
+
     {
         users.put(1, new UserEntity(1, "admin", "admin123", "15888888888"));
         users.put(2, new UserEntity(2, "ry", "admin123", "15666666666"));
@@ -38,8 +39,7 @@ public class TestController extends BaseController
 
     @ApiOperation("获取用户列表")
     @GetMapping("/list")
-    public AjaxResult userList()
+    public AjaxResult userList() {
-    {
         List<UserEntity> userList = new ArrayList<UserEntity>(users.values());
         return AjaxResult.success(userList);
     }
@@ -47,14 +47,10 @@ public class TestController extends BaseController
     @ApiOperation("获取用户详细")
     @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path")
     @GetMapping("/{userId}")
-    public AjaxResult getUser(@PathVariable Integer userId)
+    public AjaxResult getUser(@PathVariable Integer userId) {
-    {
+        if (!users.isEmpty() && users.containsKey(userId)) {
-        if (!users.isEmpty() && users.containsKey(userId))
-        {
             return AjaxResult.success(users.get(userId));
-        }
+        } else {
-        else
-        {
             return AjaxResult.error("用户不存在");
         }
     }
@@ -62,10 +58,8 @@ public class TestController extends BaseController
     @ApiOperation("新增用户")
     @ApiImplicitParam(name = "userEntity", value = "新增用户信息", dataType = "UserEntity")
     @PostMapping("/save")
-    public AjaxResult save(UserEntity user)
+    public AjaxResult save(UserEntity user) {
-    {
+        if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId())) {
-        if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
-        {
             return AjaxResult.error("用户ID不能为空");
         }
         return AjaxResult.success(users.put(user.getUserId(), user));
@@ -74,14 +68,11 @@ public class TestController extends BaseController
     @ApiOperation("更新用户")
     @ApiImplicitParam(name = "userEntity", value = "新增用户信息", dataType = "UserEntity")
     @PutMapping("/update")
-    public AjaxResult update(UserEntity user)
+    public AjaxResult update(UserEntity user) {
-    {
+        if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId())) {
-        if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
-        {
             return AjaxResult.error("用户ID不能为空");
         }
-        if (users.isEmpty() || !users.containsKey(user.getUserId()))
+        if (users.isEmpty() || !users.containsKey(user.getUserId())) {
-        {
             return AjaxResult.error("用户不存在");
         }
         users.remove(user.getUserId());
@@ -91,23 +82,18 @@ public class TestController extends BaseController
     @ApiOperation("删除用户信息")
     @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path")
     @DeleteMapping("/{userId}")
-    public AjaxResult delete(@PathVariable Integer userId)
+    public AjaxResult delete(@PathVariable Integer userId) {
-    {
+        if (!users.isEmpty() && users.containsKey(userId)) {
-        if (!users.isEmpty() && users.containsKey(userId))
-        {
             users.remove(userId);
             return AjaxResult.success();
-        }
+        } else {
-        else
-        {
             return AjaxResult.error("用户不存在");
         }
     }
 }
 
 @ApiModel("用户实体")
-class UserEntity
+class UserEntity {
-{
     @ApiModelProperty("用户ID")
     private Integer userId;
 
@@ -120,56 +106,46 @@ class UserEntity
     @ApiModelProperty("用户手机")
     private String mobile;
 
-    public UserEntity()
+    public UserEntity() {
-    {
 
     }
 
-    public UserEntity(Integer userId, String username, String password, String mobile)
+    public UserEntity(Integer userId, String username, String password, String mobile) {
-    {
         this.userId = userId;
         this.username = username;
         this.password = password;
         this.mobile = mobile;
     }
 
-    public Integer getUserId()
+    public Integer getUserId() {
-    {
         return userId;
     }
 
-    public void setUserId(Integer userId)
+    public void setUserId(Integer userId) {
-    {
         this.userId = userId;
     }
 
-    public String getUsername()
+    public String getUsername() {
-    {
         return username;
     }
 
-    public void setUsername(String username)
+    public void setUsername(String username) {
-    {
         this.username = username;
     }
 
-    public String getPassword()
+    public String getPassword() {
-    {
         return password;
     }
 
-    public void setPassword(String password)
+    public void setPassword(String password) {
-    {
         this.password = password;
     }
 
-    public String getMobile()
+    public String getMobile() {
-    {
         return mobile;
     }
 
-    public void setMobile(String mobile)
+    public void setMobile(String mobile) {
-    {
         this.mobile = mobile;
     }
 }

spring-boot/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.core.config;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -28,17 +29,22 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
  */
 @Configuration
 @EnableSwagger2
-public class SwaggerConfig
+public class SwaggerConfig {
-{
+    /**
-    /** 系统基础配置 */
+     * 系统基础配置
+     */
     @Autowired
     private RuoYiConfig ruoyiConfig;
 
-    /** 是否开启swagger */
+    /**
+     * 是否开启swagger
+     */
     @Value("${swagger.enabled}")
     private boolean enabled;
 
-    /** 设置请求的统一前缀 */
+    /**
+     * 设置请求的统一前缀
+     */
     @Value("${swagger.pathMapping}")
     private String pathMapping;
 
@@ -46,8 +52,7 @@ public class SwaggerConfig
      * 创建API
      */
     @Bean
-    public Docket createRestApi()
+    public Docket createRestApi() {
-    {
         return new Docket(DocumentationType.SWAGGER_2)
                 // 是否启用Swagger
                 .enable(enabled)
@@ -71,8 +76,7 @@ public class SwaggerConfig
     /**
      * 安全模式，这里指定token通过Authorization头请求头传递
      */
-    private List<ApiKey> securitySchemes()
+    private List<ApiKey> securitySchemes() {
-    {
         List<ApiKey> apiKeyList = new ArrayList<ApiKey>();
         apiKeyList.add(new ApiKey("Authorization", "Authorization", "header"));
         return apiKeyList;
@@ -81,8 +85,7 @@ public class SwaggerConfig
     /**
      * 安全上下文
      */
-    private List<SecurityContext> securityContexts()
+    private List<SecurityContext> securityContexts() {
-    {
         List<SecurityContext> securityContexts = new ArrayList<>();
         securityContexts.add(
                 SecurityContext.builder()
@@ -95,8 +98,7 @@ public class SwaggerConfig
     /**
      * 默认的安全上引用
      */
-    private List<SecurityReference> defaultAuth()
+    private List<SecurityReference> defaultAuth() {
-    {
         AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
         AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
         authorizationScopes[0] = authorizationScope;
@@ -108,8 +110,7 @@ public class SwaggerConfig
     /**
      * 添加摘要信息
      */
-    private ApiInfo apiInfo()
+    private ApiInfo apiInfo() {
-    {
         // 用ApiInfoBuilder进行定制
         return new ApiInfoBuilder()
                 // 设置标题

spring-boot/ruoyi-admin/src/main/resources/application-druid.yml

@@ -1,57 +1,57 @@
 # 数据源配置
 spring:
-    datasource:
+  datasource:
-        type: com.alibaba.druid.pool.DruidDataSource
+    type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: com.mysql.cj.jdbc.Driver
+    driverClassName: com.mysql.cj.jdbc.Driver
-        druid:
+    druid:
-            # 主库数据源
+      # 主库数据源
-            master:
+      master:
-                url: jdbc:mysql://localhost:3306/wumei-smart?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://host:3306/develop_xiaoyi_wumei?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
+        username: root
-                password: root
+        password: 123456
-            # 从库数据源
+      # 从库数据源
-            slave:
+      slave:
-                # 从数据源开关/默认关闭
+        # 从数据源开关/默认关闭
-                enabled: false
+        enabled: false
-                url: 
+        url:
-                username: 
+        username:
-                password: 
+        password:
-            # 初始连接数
+      # 初始连接数
-            initialSize: 5
+      initialSize: 5
-            # 最小连接池数量
+      # 最小连接池数量
-            minIdle: 10
+      minIdle: 10
-            # 最大连接池数量
+      # 最大连接池数量
-            maxActive: 20
+      maxActive: 20
-            # 配置获取连接等待超时的时间
+      # 配置获取连接等待超时的时间
-            maxWait: 60000
+      maxWait: 60000
-            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-            timeBetweenEvictionRunsMillis: 60000
+      timeBetweenEvictionRunsMillis: 60000
-            # 配置一个连接在池中最小生存的时间，单位是毫秒
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
-            minEvictableIdleTimeMillis: 300000
+      minEvictableIdleTimeMillis: 300000
-            # 配置一个连接在池中最大生存的时间，单位是毫秒
+      # 配置一个连接在池中最大生存的时间，单位是毫秒
-            maxEvictableIdleTimeMillis: 900000
+      maxEvictableIdleTimeMillis: 900000
-            # 配置检测连接是否有效
+      # 配置检测连接是否有效
-            validationQuery: SELECT 1 FROM DUAL
+      validationQuery: SELECT 1 FROM DUAL
-            testWhileIdle: true
+      testWhileIdle: true
-            testOnBorrow: false
+      testOnBorrow: false
-            testOnReturn: false
+      testOnReturn: false
-            webStatFilter: 
+      webStatFilter:
-                enabled: true
+        enabled: true
-            statViewServlet:
+      statViewServlet:
-                enabled: true
+        enabled: true
-                # 设置白名单，不填则允许所有访问
+        # 设置白名单，不填则允许所有访问
-                allow:
+        allow:
-                url-pattern: /druid/*
+        url-pattern: /druid/*
-                # 控制台管理用户名和密码
+        # 控制台管理用户名和密码
-                login-username: 
+        login-username:
-                login-password: 
+        login-password:
-            filter:
+      filter:
-                stat:
+        stat:
-                    enabled: true
+          enabled: true
-                    # 慢SQL记录
+          # 慢SQL记录
-                    log-slow-sql: true
+          log-slow-sql: true
-                    slow-sql-millis: 1000
+          slow-sql-millis: 1000
-                    merge-sql: true
+          merge-sql: true
-                wall:
+        wall:
-                    config:
+          config:
-                        multi-statement-allow: true
+            multi-statement-allow: true

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

@@ -18,7 +18,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8080
+  port: 9160
   servlet:
     # 应用的访问路径
     context-path: /
@@ -46,11 +46,11 @@ spring:
     active: druid
   # 文件上传
   servlet:
-     multipart:
+    multipart:
-       # 单个文件大小
+      # 单个文件大小
-       max-file-size:  10MB
+      max-file-size:  10MB
-       # 设置总上传的文件大小
+      # 设置总上传的文件大小
-       max-request-size:  20MB
+      max-request-size:  20MB
   # 服务模块
   devtools:
     restart:
@@ -82,29 +82,29 @@ spring:
   mqtt:
     username: admin                           # 账号
     password: admin                           # 密码
-    host-url: tcp://localhost:1883            # mqtt连接tcp地址
+    host-url: tcp://host:1883            # mqtt连接tcp地址
-    client-id: server-${random.value}         # 客户端Id，每个启动的id要不同 随机：${random.value}
+    client-id: server-xiaoyi-${random.value}         # 客户端Id，每个启动的id要不同 随机：${random.value}
     default-topic: test                       # 默认主题
     timeout: 100                              # 超时时间
     keepalive: 100                            # 保持连接数
 
 # token配置
 token:
-    # 令牌自定义标识
+  # 令牌自定义标识
-    header: Authorization
+  header: Authorization
-    # 令牌密钥
+  # 令牌密钥
-    secret: abcdefghijklmnopqrstuvwxyz
+  secret: abcdefghijklmnopqrstuvwxyz
-    # 令牌有效期（默认30分钟，设置为1周过期）
+  # 令牌有效期（默认30分钟，设置为1周过期）
-    expireTime: 10000
+  expireTime: 10000
 
 # MyBatis配置
 mybatis:
-    # 搜索指定包别名
+  # 搜索指定包别名
-    typeAliasesPackage: com.ruoyi.**.domain
+  typeAliasesPackage: com.ruoyi.**.domain
-    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+  # 配置mapper的扫描，找到所有的mapper.xml映射文件
-    mapperLocations: classpath*:mapper/**/*Mapper.xml
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
-    # 加载全局的配置文件
+  # 加载全局的配置文件
-    configLocation: classpath:mybatis/mybatis-config.xml
+  configLocation: classpath:mybatis/mybatis-config.xml
 
 # PageHelper分页插件
 pagehelper:
@@ -128,3 +128,19 @@ xss:
   excludes: /system/notice/*
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
+
+# 公众号配置(必填)
+wx:
+  miniapp:
+    appid: appid #  #
+    appSecret: appSecret # #
+    config-storage:
+      type: Memory                     # 配置类型: Memory(默认), Jedis, RedisTemplate
+      key-prefix: wa                 # 相关redis前缀配置: wa(默认)
+      redis:
+        host: 127.0.0.1
+        port: 6379
+        passowrd:
+      # http客户端配置
+      http-client-type: HttpClient      # http客户端类型: HttpClient(默认), OkHttp, JoddHttp
+

spring-boot/ruoyi-admin/src/main/resources/i18n/messages.properties

@@ -10,23 +10,18 @@ user.password.delete=对不起，您的账号已被删除
 user.blocked=用户已封禁，请联系管理员
 role.blocked=角色已封禁，请联系管理员
 user.logout.success=退出成功
-
 length.not.valid=长度必须在{min}到{max}个字符之间
-
 user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
 user.password.not.valid=* 5-50个字符
- 
 user.email.not.valid=邮箱格式错误
 user.mobile.phone.number.not.valid=手机号格式错误
 user.login.success=登录成功
 user.notfound=请重新登录
 user.forcelogout=管理员强制退出，请重新登录
 user.unknown.error=未知错误，请重新登录
-
 ##文件上传消息
 upload.exceed.maxSize=上传的文件大小超出限制的文件大小！<br/>允许的文件最大大小是：{0}MB！
 upload.filename.exceed.length=上传的文件名最长{0}个字符
-
 ##权限
 no.permission=您没有数据的权限，请联系管理员添加权限 [{0}]
 no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}]

spring-boot/ruoyi-admin/src/main/resources/logback.xml

@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/ruoyi/logs" />
+    <property name="log.path" value="/home/ruoyi/logs"/>
     <!-- 日志输出格式 -->
-	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
 
-	<!-- 控制台输出 -->
+    <!-- 控制台输出 -->
-	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
+        <encoder>
-			<pattern>${log.pattern}</pattern>
+            <pattern>${log.pattern}</pattern>
-		</encoder>
+        </encoder>
-	</appender>
+    </appender>
 
-	<!-- 系统日志输出 -->
+    <!-- 系统日志输出 -->
-	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-	    <file>${log.path}/sys-info.log</file>
+        <file>${log.path}/sys-info.log</file>
         <!-- 循环政策：基于时间创建日志文件 -->
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
-			<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
+            <!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+            <maxHistory>60</maxHistory>
-		</rollingPolicy>
+        </rollingPolicy>
-		<encoder>
+        <encoder>
-			<pattern>${log.pattern}</pattern>
+            <pattern>${log.pattern}</pattern>
-		</encoder>
+        </encoder>
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <!-- 过滤的级别 -->
             <level>INFO</level>
             <!-- 匹配时的操作：接收（记录） -->
@@ -33,16 +33,16 @@
             <!-- 不匹配时的操作：拒绝（不记录） -->
             <onMismatch>DENY</onMismatch>
         </filter>
-	</appender>
+    </appender>
 
-	<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-	    <file>${log.path}/sys-error.log</file>
+        <file>${log.path}/sys-error.log</file>
         <!-- 循环政策：基于时间创建日志文件 -->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
             <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
-			<!-- 日志最大的历史 60天 -->
+            <!-- 日志最大的历史 60天 -->
-			<maxHistory>60</maxHistory>
+            <maxHistory>60</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>
@@ -50,16 +50,16 @@
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <!-- 过滤的级别 -->
             <level>ERROR</level>
-			<!-- 匹配时的操作：接收（记录） -->
+            <!-- 匹配时的操作：接收（记录） -->
             <onMatch>ACCEPT</onMatch>
-			<!-- 不匹配时的操作：拒绝（不记录） -->
+            <!-- 不匹配时的操作：拒绝（不记录） -->
             <onMismatch>DENY</onMismatch>
         </filter>
     </appender>
 
-	<!-- 用户访问日志输出  -->
+    <!-- 用户访问日志输出  -->
     <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${log.path}/sys-user.log</file>
+        <file>${log.path}/sys-user.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 按天回滚 daily -->
             <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
@@ -71,22 +71,22 @@
         </encoder>
     </appender>
 
-	<!-- 系统模块日志级别控制  -->
+    <!-- 系统模块日志级别控制  -->
-	<logger name="com.ruoyi" level="info" />
+    <logger name="com.ruoyi" level="info"/>
-	<!-- Spring日志级别控制  -->
+    <!-- Spring日志级别控制  -->
-	<logger name="org.springframework" level="warn" />
+    <logger name="org.springframework" level="warn"/>
 
-	<root level="info">
-		<appender-ref ref="console" />
-	</root>
-	
-	<!--系统操作日志-->
     <root level="info">
-        <appender-ref ref="file_info" />
+        <appender-ref ref="console"/>
-        <appender-ref ref="file_error" />
     </root>
 
-	<!--系统用户操作日志-->
+    <!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="file_info"/>
+        <appender-ref ref="file_error"/>
+    </root>
+
+    <!--系统用户操作日志-->
     <logger name="sys-user" level="info">
         <appender-ref ref="sys-user"/>
     </logger>

spring-boot/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE configuration
-PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-config.dtd">
+        "http://mybatis.org/dtd/mybatis-3-config.dtd">
 <configuration>
 
-	<settings>
+    <settings>
-		<setting name="cacheEnabled"             value="true" />  <!-- 全局映射器启用缓存 -->
+        <setting name="cacheEnabled" value="true"/>  <!-- 全局映射器启用缓存 -->
-		<setting name="useGeneratedKeys"         value="true" />  <!-- 允许 JDBC 支持自动生成主键 -->
+        <setting name="useGeneratedKeys" value="true"/>  <!-- 允许 JDBC 支持自动生成主键 -->
-		<setting name="defaultExecutorType"      value="REUSE" /> <!-- 配置默认的执行器 -->
+        <setting name="defaultExecutorType" value="REUSE"/> <!-- 配置默认的执行器 -->
-		<setting name="logImpl"                  value="SLF4J" /> <!-- 指定 MyBatis 所用日志的具体实现 -->
+        <setting name="logImpl" value="SLF4J"/> <!-- 指定 MyBatis 所用日志的具体实现 -->
-		<!-- <setting name="mapUnderscoreToCamelCase" value="true"/>  驼峰式命名 -->
+        <!-- <setting name="mapUnderscoreToCamelCase" value="true"/>  驼峰式命名 -->
-	</settings>
+    </settings>
 
 </configuration>

spring-boot/ruoyi-common/pom.xml

@@ -118,6 +118,31 @@
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.20</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-miniapp</artifactId>
+            <version>4.1.5.B</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-miniapp</artifactId>
+            <version>4.1.5.B</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-mp</artifactId>
+            <version>4.1.5.B</version>
+        </dependency>
 
     </dependencies>
 

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java

@@ -14,8 +14,7 @@ import java.lang.annotation.Target;
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-public @interface DataScope
+public @interface DataScope {
-{
     /**
      * 部门表的别名
      */

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java

@@ -6,21 +6,21 @@ import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+
 import com.ruoyi.common.enums.DataSourceType;
 
 /**
  * 自定义多数据源切换注解
- *
+ * <p>
  * 优先级：先方法，后类，如果方法覆盖了类上的数据源类型，以方法的为准，否则以类上的为准
  *
  * @author ruoyi
  */
-@Target({ ElementType.METHOD, ElementType.TYPE })
+@Target({ElementType.METHOD, ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @Inherited
-public @interface DataSource
+public @interface DataSource {
-{
     /**
      * 切换数据源名称
      */

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java

@@ -13,8 +13,7 @@ import java.math.BigDecimal;
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
-public @interface Excel
+public @interface Excel {
-{
     /**
      * 导出时在excel中排序
      */
@@ -110,18 +109,15 @@ public @interface Excel
      */
     Align align() default Align.AUTO;
 
-    public enum Align
+    public enum Align {
-    {
         AUTO(0), LEFT(1), CENTER(2), RIGHT(3);
         private final int value;
 
-        Align(int value)
+        Align(int value) {
-        {
             this.value = value;
         }
 
-        public int value()
+        public int value() {
-        {
             return this.value;
         }
     }
@@ -131,34 +127,28 @@ public @interface Excel
      */
     Type type() default Type.ALL;
 
-    public enum Type
+    public enum Type {
-    {
         ALL(0), EXPORT(1), IMPORT(2);
         private final int value;
 
-        Type(int value)
+        Type(int value) {
-        {
             this.value = value;
         }
 
-        public int value()
+        public int value() {
-        {
             return this.value;
         }
     }
 
-    public enum ColumnType
+    public enum ColumnType {
-    {
         NUMERIC(0), STRING(1), IMAGE(2);
         private final int value;
 
-        ColumnType(int value)
+        ColumnType(int value) {
-        {
             this.value = value;
         }
 
-        public int value()
+        public int value() {
-        {
             return this.value;
         }
     }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java

@@ -12,7 +12,6 @@ import java.lang.annotation.Target;
  */
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface Excels
+public @interface Excels {
-{
     Excel[] value();
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java

@@ -5,6 +5,7 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.enums.OperatorType;
 
@@ -12,13 +13,11 @@ import com.ruoyi.common.enums.OperatorType;
  * 自定义操作日志记录注解
  *
  * @author ruoyi
- *
  */
-@Target({ ElementType.PARAMETER, ElementType.METHOD })
+@Target({ElementType.PARAMETER, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-public @interface Log
+public @interface Log {
-{
     /**
      * 模块
      */

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java

@@ -11,13 +11,11 @@ import java.lang.annotation.Target;
  * 自定义注解防止表单重复提交
  *
  * @author ruoyi
- *
  */
 @Inherited
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-public @interface RepeatSubmit
+public @interface RepeatSubmit {
-{
 
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java

@@ -10,107 +10,103 @@ import org.springframework.stereotype.Component;
  */
 @Component
 @ConfigurationProperties(prefix = "ruoyi")
-public class RuoYiConfig
+public class RuoYiConfig {
-{
+    /**
-    /** 项目名称 */
+     * 项目名称
+     */
     private String name;
 
-    /** 版本 */
+    /**
+     * 版本
+     */
     private String version;
 
-    /** 版权年份 */
+    /**
+     * 版权年份
+     */
     private String copyrightYear;
 
-    /** 实例演示开关 */
+    /**
+     * 实例演示开关
+     */
     private boolean demoEnabled;
 
-    /** 上传路径 */
+    /**
+     * 上传路径
+     */
     private static String profile;
 
-    /** 获取地址开关 */
+    /**
+     * 获取地址开关
+     */
     private static boolean addressEnabled;
 
-    public String getName()
+    public String getName() {
-    {
         return name;
     }
 
-    public void setName(String name)
+    public void setName(String name) {
-    {
         this.name = name;
     }
 
-    public String getVersion()
+    public String getVersion() {
-    {
         return version;
     }
 
-    public void setVersion(String version)
+    public void setVersion(String version) {
-    {
         this.version = version;
     }
 
-    public String getCopyrightYear()
+    public String getCopyrightYear() {
-    {
         return copyrightYear;
     }
 
-    public void setCopyrightYear(String copyrightYear)
+    public void setCopyrightYear(String copyrightYear) {
-    {
         this.copyrightYear = copyrightYear;
     }
 
-    public boolean isDemoEnabled()
+    public boolean isDemoEnabled() {
-    {
         return demoEnabled;
     }
 
-    public void setDemoEnabled(boolean demoEnabled)
+    public void setDemoEnabled(boolean demoEnabled) {
-    {
         this.demoEnabled = demoEnabled;
     }
 
-    public static String getProfile()
+    public static String getProfile() {
-    {
         return profile;
     }
 
-    public void setProfile(String profile)
+    public void setProfile(String profile) {
-    {
         RuoYiConfig.profile = profile;
     }
 
-    public static boolean isAddressEnabled()
+    public static boolean isAddressEnabled() {
-    {
         return addressEnabled;
     }
 
-    public void setAddressEnabled(boolean addressEnabled)
+    public void setAddressEnabled(boolean addressEnabled) {
-    {
         RuoYiConfig.addressEnabled = addressEnabled;
     }
 
     /**
      * 获取头像上传路径
      */
-    public static String getAvatarPath()
+    public static String getAvatarPath() {
-    {
         return getProfile() + "/avatar";
     }
 
     /**
      * 获取下载路径
      */
-    public static String getDownloadPath()
+    public static String getDownloadPath() {
-    {
         return getProfile() + "/download/";
     }
 
     /**
      * 获取上传路径
      */
-    public static String getUploadPath()
+    public static String getUploadPath() {
-    {
         return getProfile() + "/upload";
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/config/WxConfig.java

@@ -0,0 +1,36 @@
+package com.ruoyi.common.config;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
+import cn.binarywang.wx.miniapp.config.WxMaConfig;
+import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class WxConfig {
+
+    @Autowired
+    private WxProperties properties;
+
+    @Bean
+    public WxMaConfig wxMaConfig() {
+        WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
+
+        config.setAppid(properties.getAppId());
+        config.setSecret(properties.getAppSecret());
+        return config;
+    }
+
+    @Bean
+    public WxMaService wxMaService(WxMaConfig maConfig) {
+        WxMaService service = new WxMaServiceImpl();
+        service.setWxMaConfig(maConfig);
+        return service;
+    }
+
+}
+
+
+

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/config/WxMpConfig.java

@@ -0,0 +1,50 @@
+package com.ruoyi.common.config;
+
+import com.ruoyi.common.constant.Constants;
+import me.chanjar.weixin.mp.api.WxMpQrcodeService;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.api.impl.WxMpQrcodeServiceImpl;
+import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
+import me.chanjar.weixin.mp.config.WxMpConfigStorage;
+import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 类名: WxConfig
+ * 描述: TODO
+ * 时间: 2021/1/10 13:08
+ * 开发人: admin
+ */
+@Configuration
+public class WxMpConfig {
+
+    @Bean
+    public WxMpConfigStorage wxMpConfigStorage() {
+
+        WxMpDefaultConfigImpl wxMpInMemoryConfigStorage = new WxMpDefaultConfigImpl();
+        //设置appid  这个在项目中肯定是通过配置来实现
+        wxMpInMemoryConfigStorage.setAppId(Constants.wxAppId);
+        //设置密码
+        wxMpInMemoryConfigStorage.setSecret(Constants.wxAppSecret);
+        return wxMpInMemoryConfigStorage;
+
+    }
+
+    @Bean//文档中需要用到这个对象
+    public WxMpService wxMpService() {
+        WxMpServiceImpl wxMpService = new WxMpServiceImpl();
+        //设置微信配置的存储
+        wxMpService.setWxMpConfigStorage(wxMpConfigStorage());
+        return wxMpService;
+
+    }
+
+    @Bean//文档中需要用到这个对象
+    public WxMpQrcodeService wxMpQrcodeService() {
+        WxMpQrcodeService wxMpQrcodeService = new WxMpQrcodeServiceImpl(wxMpService());
+        //设置微信配置的存储
+        return wxMpQrcodeService;
+
+    }
+}

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/config/WxProperties.java

@@ -0,0 +1,69 @@
+package com.ruoyi.common.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ConfigurationProperties(prefix = "wx.miniapp")
+public class WxProperties {
+
+    private String appId;
+
+    private String appSecret;
+
+    private String mchId;
+
+    private String mchKey;
+
+    private String notifyUrl;
+
+    private String keyPath;
+
+    public String getNotifyUrl() {
+        return notifyUrl;
+    }
+
+    public void setNotifyUrl(String notifyUrl) {
+        this.notifyUrl = notifyUrl;
+    }
+
+    public String getMchKey() {
+        return mchKey;
+    }
+
+    public void setMchKey(String mchKey) {
+        this.mchKey = mchKey;
+    }
+
+    public String getAppId() {
+        return this.appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    public String getAppSecret() {
+        return appSecret;
+    }
+
+    public void setAppSecret(String appSecret) {
+        this.appSecret = appSecret;
+    }
+
+    public String getMchId() {
+        return mchId;
+    }
+
+    public void setMchId(String mchId) {
+        this.mchId = mchId;
+    }
+
+    public String getKeyPath() {
+        return keyPath;
+    }
+
+    public void setKeyPath(String keyPath) {
+        this.keyPath = keyPath;
+    }
+}

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java

@@ -5,8 +5,7 @@ package com.ruoyi.common.constant;
  *
  * @author ruoyi
  */
-public class Constants
+public class Constants {
-{
     /**
      * UTF-8 字符集
      */
@@ -126,4 +125,8 @@ public class Constants
      * 资源映射路径 前缀
      */
     public static final String RESOURCE_PREFIX = "/profile";
+    public static final String DEFAULT_AVATAR = "https://c-ssl.duitang.com/uploads/item/201912/27/20191227145714_rtHRc.thumb.1000_0.jpeg";
+
+    public static String wxAppId = "wx00e680cbf69d159c";
+    public static String wxAppSecret = "4902e0e4470663112f505f498b036c55";
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java

@@ -5,110 +5,177 @@ package com.ruoyi.common.constant;
  *
  * @author ruoyi
  */
-public class GenConstants
+public class GenConstants {
-{
+    /**
-    /** 单表（增删改查） */
+     * 单表（增删改查）
+     */
     public static final String TPL_CRUD = "crud";
 
-    /** 树表（增删改查） */
+    /**
+     * 树表（增删改查）
+     */
     public static final String TPL_TREE = "tree";
 
-    /** 主子表（增删改查） */
+    /**
+     * 主子表（增删改查）
+     */
     public static final String TPL_SUB = "sub";
 
-    /** 树编码字段 */
+    /**
+     * 树编码字段
+     */
     public static final String TREE_CODE = "treeCode";
 
-    /** 树父编码字段 */
+    /**
+     * 树父编码字段
+     */
     public static final String TREE_PARENT_CODE = "treeParentCode";
 
-    /** 树名称字段 */
+    /**
+     * 树名称字段
+     */
     public static final String TREE_NAME = "treeName";
 
-    /** 上级菜单ID字段 */
+    /**
+     * 上级菜单ID字段
+     */
     public static final String PARENT_MENU_ID = "parentMenuId";
 
-    /** 上级菜单名称字段 */
+    /**
+     * 上级菜单名称字段
+     */
     public static final String PARENT_MENU_NAME = "parentMenuName";
 
-    /** 数据库字符串类型 */
+    /**
-    public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2" };
+     * 数据库字符串类型
+     */
+    public static final String[] COLUMNTYPE_STR = {"char", "varchar", "nvarchar", "varchar2"};
 
-    /** 数据库文本类型 */
+    /**
-    public static final String[] COLUMNTYPE_TEXT = { "tinytext", "text", "mediumtext", "longtext" };
+     * 数据库文本类型
+     */
+    public static final String[] COLUMNTYPE_TEXT = {"tinytext", "text", "mediumtext", "longtext"};
 
-    /** 数据库时间类型 */
+    /**
-    public static final String[] COLUMNTYPE_TIME = { "datetime", "time", "date", "timestamp" };
+     * 数据库时间类型
+     */
+    public static final String[] COLUMNTYPE_TIME = {"datetime", "time", "date", "timestamp"};
 
-    /** 数据库数字类型 */
+    /**
-    public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer",
+     * 数据库数字类型
-            "bit", "bigint", "float", "double", "decimal" };
+     */
+    public static final String[] COLUMNTYPE_NUMBER = {"tinyint", "smallint", "mediumint", "int", "number", "integer",
+            "bit", "bigint", "float", "double", "decimal"};
 
-    /** 页面不需要编辑字段 */
+    /**
-    public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag" };
+     * 页面不需要编辑字段
+     */
+    public static final String[] COLUMNNAME_NOT_EDIT = {"id", "create_by", "create_time", "del_flag"};
 
-    /** 页面不需要显示的列表字段 */
+    /**
-    public static final String[] COLUMNNAME_NOT_LIST = { "id", "create_by", "create_time", "del_flag", "update_by",
+     * 页面不需要显示的列表字段
-            "update_time" };
+     */
+    public static final String[] COLUMNNAME_NOT_LIST = {"id", "create_by", "create_time", "del_flag", "update_by",
+            "update_time"};
 
-    /** 页面不需要查询字段 */
+    /**
-    public static final String[] COLUMNNAME_NOT_QUERY = { "id", "create_by", "create_time", "del_flag", "update_by",
+     * 页面不需要查询字段
-            "update_time", "remark" };
+     */
+    public static final String[] COLUMNNAME_NOT_QUERY = {"id", "create_by", "create_time", "del_flag", "update_by",
+            "update_time", "remark"};
 
-    /** Entity基类字段 */
+    /**
-    public static final String[] BASE_ENTITY = { "createBy", "createTime", "updateBy", "updateTime", "remark" };
+     * Entity基类字段
+     */
+    public static final String[] BASE_ENTITY = {"createBy", "createTime", "updateBy", "updateTime", "remark"};
 
-    /** Tree基类字段 */
+    /**
-    public static final String[] TREE_ENTITY = { "parentName", "parentId", "orderNum", "ancestors", "children" };
+     * Tree基类字段
+     */
+    public static final String[] TREE_ENTITY = {"parentName", "parentId", "orderNum", "ancestors", "children"};
 
-    /** 文本框 */
+    /**
+     * 文本框
+     */
     public static final String HTML_INPUT = "input";
 
-    /** 文本域 */
+    /**
+     * 文本域
+     */
     public static final String HTML_TEXTAREA = "textarea";
 
-    /** 下拉框 */
+    /**
+     * 下拉框
+     */
     public static final String HTML_SELECT = "select";
 
-    /** 单选框 */
+    /**
+     * 单选框
+     */
     public static final String HTML_RADIO = "radio";
 
-    /** 复选框 */
+    /**
+     * 复选框
+     */
     public static final String HTML_CHECKBOX = "checkbox";
 
-    /** 日期控件 */
+    /**
+     * 日期控件
+     */
     public static final String HTML_DATETIME = "datetime";
 
-    /** 图片上传控件 */
+    /**
+     * 图片上传控件
+     */
     public static final String HTML_IMAGE_UPLOAD = "imageUpload";
 
-    /** 文件上传控件 */
+    /**
+     * 文件上传控件
+     */
     public static final String HTML_FILE_UPLOAD = "fileUpload";
 
-    /** 富文本控件 */
+    /**
+     * 富文本控件
+     */
     public static final String HTML_EDITOR = "editor";
 
-    /** 字符串类型 */
+    /**
+     * 字符串类型
+     */
     public static final String TYPE_STRING = "String";
 
-    /** 整型 */
+    /**
+     * 整型
+     */
     public static final String TYPE_INTEGER = "Integer";
 
-    /** 长整型 */
+    /**
+     * 长整型
+     */
     public static final String TYPE_LONG = "Long";
 
-    /** 浮点型 */
+    /**
+     * 浮点型
+     */
     public static final String TYPE_DOUBLE = "Double";
 
-    /** 高精度计算类型 */
+    /**
+     * 高精度计算类型
+     */
     public static final String TYPE_BIGDECIMAL = "BigDecimal";
 
-    /** 时间类型 */
+    /**
+     * 时间类型
+     */
     public static final String TYPE_DATE = "Date";
 
-    /** 模糊查询 */
+    /**
+     * 模糊查询
+     */
     public static final String QUERY_LIKE = "LIKE";
 
-    /** 需要 */
+    /**
+     * 需要
+     */
     public static final String REQUIRE = "1";
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java

@@ -5,8 +5,7 @@ package com.ruoyi.common.constant;
  *
  * @author ruoyi
  */
-public class HttpStatus
+public class HttpStatus {
-{
     /**
      * 操作成功
      */

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java

@@ -5,27 +5,35 @@ package com.ruoyi.common.constant;
  *
  * @author ruoyi
  */
-public class ScheduleConstants
+public class ScheduleConstants {
-{
     public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME";
 
-    /** 执行目标key */
+    /**
+     * 执行目标key
+     */
     public static final String TASK_PROPERTIES = "TASK_PROPERTIES";
 
-    /** 默认 */
+    /**
+     * 默认
+     */
     public static final String MISFIRE_DEFAULT = "0";
 
-    /** 立即触发执行 */
+    /**
+     * 立即触发执行
+     */
     public static final String MISFIRE_IGNORE_MISFIRES = "1";
 
-    /** 触发一次执行 */
+    /**
+     * 触发一次执行
+     */
     public static final String MISFIRE_FIRE_AND_PROCEED = "2";
 
-    /** 不触发立即执行 */
+    /**
+     * 不触发立即执行
+     */
     public static final String MISFIRE_DO_NOTHING = "3";
 
-    public enum Status
+    public enum Status {
-    {
         /**
          * 正常
          */
@@ -37,13 +45,11 @@ public class ScheduleConstants
 
         private String value;
 
-        private Status(String value)
+        private Status(String value) {
-        {
             this.value = value;
         }
 
-        public String getValue()
+        public String getValue() {
-        {
             return value;
         }
     }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java

@@ -5,59 +5,90 @@ package com.ruoyi.common.constant;
  *
  * @author ruoyi
  */
-public class UserConstants
+public class UserConstants {
-{
     /**
      * 平台内系统用户的唯一标志
      */
     public static final String SYS_USER = "SYS_USER";
 
-    /** 正常状态 */
+    /**
+     * 正常状态
+     */
     public static final String NORMAL = "0";
 
-    /** 异常状态 */
+    /**
+     * 异常状态
+     */
     public static final String EXCEPTION = "1";
 
-    /** 用户封禁状态 */
+    /**
+     * 用户封禁状态
+     */
     public static final String USER_DISABLE = "1";
 
-    /** 角色封禁状态 */
+    /**
+     * 角色封禁状态
+     */
     public static final String ROLE_DISABLE = "1";
 
-    /** 部门正常状态 */
+    /**
+     * 部门正常状态
+     */
     public static final String DEPT_NORMAL = "0";
 
-    /** 部门停用状态 */
+    /**
+     * 部门停用状态
+     */
     public static final String DEPT_DISABLE = "1";
 
-    /** 字典正常状态 */
+    /**
+     * 字典正常状态
+     */
     public static final String DICT_NORMAL = "0";
 
-    /** 是否为系统默认（是） */
+    /**
+     * 是否为系统默认（是）
+     */
     public static final String YES = "Y";
 
-    /** 是否菜单外链（是） */
+    /**
+     * 是否菜单外链（是）
+     */
     public static final String YES_FRAME = "0";
 
-    /** 是否菜单外链（否） */
+    /**
+     * 是否菜单外链（否）
+     */
     public static final String NO_FRAME = "1";
 
-    /** 菜单类型（目录） */
+    /**
+     * 菜单类型（目录）
+     */
     public static final String TYPE_DIR = "M";
 
-    /** 菜单类型（菜单） */
+    /**
+     * 菜单类型（菜单）
+     */
     public static final String TYPE_MENU = "C";
 
-    /** 菜单类型（按钮） */
+    /**
+     * 菜单类型（按钮）
+     */
     public static final String TYPE_BUTTON = "F";
 
-    /** Layout组件标识 */
+    /**
+     * Layout组件标识
+     */
     public final static String LAYOUT = "Layout";
 
-    /** ParentView组件标识 */
+    /**
+     * ParentView组件标识
+     */
     public final static String PARENT_VIEW = "ParentView";
 
-    /** 校验返回结果码 */
+    /**
+     * 校验返回结果码
+     */
     public final static String UNIQUE = "0";
     public final static String NOT_UNIQUE = "1";
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

@@ -3,6 +3,7 @@ package com.ruoyi.common.core.controller;
 import java.beans.PropertyEditorSupport;
 import java.util.Date;
 import java.util.List;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.WebDataBinder;
@@ -23,22 +24,18 @@ import com.ruoyi.common.utils.sql.SqlUtil;
  *
  * @author ruoyi
  */
-public class BaseController
+public class BaseController {
-{
     protected final Logger logger = LoggerFactory.getLogger(BaseController.class);
 
     /**
      * 将前台传递过来的日期格式的字符串，自动转化为Date类型
      */
     @InitBinder
-    public void initBinder(WebDataBinder binder)
+    public void initBinder(WebDataBinder binder) {
-    {
         // Date 类型转换
-        binder.registerCustomEditor(Date.class, new PropertyEditorSupport()
+        binder.registerCustomEditor(Date.class, new PropertyEditorSupport() {
-        {
             @Override
-            public void setAsText(String text)
+            public void setAsText(String text) {
-            {
                 setValue(DateUtils.parseDate(text));
             }
         });
@@ -47,13 +44,11 @@ public class BaseController
     /**
      * 设置请求分页数据
      */
-    protected void startPage()
+    protected void startPage() {
-    {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
-        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize))
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
-        {
             String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
             PageHelper.startPage(pageNum, pageSize, orderBy);
         }
@@ -62,9 +57,8 @@ public class BaseController
     /**
      * 响应请求分页数据
      */
-    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @SuppressWarnings({"rawtypes", "unchecked"})
-    protected TableDataInfo getDataTable(List<?> list)
+    protected TableDataInfo getDataTable(List<?> list) {
-    {
         TableDataInfo rspData = new TableDataInfo();
         rspData.setCode(HttpStatus.SUCCESS);
         rspData.setMsg("查询成功");
@@ -79,16 +73,14 @@ public class BaseController
      * @param rows 影响行数
      * @return 操作结果
      */
-    protected AjaxResult toAjax(int rows)
+    protected AjaxResult toAjax(int rows) {
-    {
         return rows > 0 ? AjaxResult.success() : AjaxResult.error();
     }
 
     /**
      * 页面跳转
      */
-    public String redirect(String url)
+    public String redirect(String url) {
-    {
         return StringUtils.format("redirect:{}", url);
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java

@@ -1,6 +1,7 @@
 package com.ruoyi.common.core.domain;
 
 import java.util.HashMap;
+
 import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.utils.StringUtils;
 
@@ -9,34 +10,37 @@ import com.ruoyi.common.utils.StringUtils;
  *
  * @author ruoyi
  */
-public class AjaxResult extends HashMap<String, Object>
+public class AjaxResult extends HashMap<String, Object> {
-{
     private static final long serialVersionUID = 1L;
 
-    /** 状态码 */
+    /**
+     * 状态码
+     */
     public static final String CODE_TAG = "code";
 
-    /** 返回内容 */
+    /**
+     * 返回内容
+     */
     public static final String MSG_TAG = "msg";
 
-    /** 数据对象 */
+    /**
+     * 数据对象
+     */
     public static final String DATA_TAG = "data";
 
     /**
      * 初始化一个新创建的 AjaxResult 对象，使其表示一个空消息。
      */
-    public AjaxResult()
+    public AjaxResult() {
-    {
     }
 
     /**
      * 初始化一个新创建的 AjaxResult 对象
      *
      * @param code 状态码
-     * @param msg 返回内容
+     * @param msg  返回内容
      */
-    public AjaxResult(int code, String msg)
+    public AjaxResult(int code, String msg) {
-    {
         super.put(CODE_TAG, code);
         super.put(MSG_TAG, msg);
     }
@@ -45,15 +49,13 @@ public class AjaxResult extends HashMap<String, Object>
      * 初始化一个新创建的 AjaxResult 对象
      *
      * @param code 状态码
-     * @param msg 返回内容
+     * @param msg  返回内容
      * @param data 数据对象
      */
-    public AjaxResult(int code, String msg, Object data)
+    public AjaxResult(int code, String msg, Object data) {
-    {
         super.put(CODE_TAG, code);
         super.put(MSG_TAG, msg);
-        if (StringUtils.isNotNull(data))
+        if (StringUtils.isNotNull(data)) {
-        {
             super.put(DATA_TAG, data);
         }
     }
@@ -63,8 +65,7 @@ public class AjaxResult extends HashMap<String, Object>
      *
      * @return 成功消息
      */
-    public static AjaxResult success()
+    public static AjaxResult success() {
-    {
         return AjaxResult.success("操作成功");
     }
 
@@ -73,8 +74,7 @@ public class AjaxResult extends HashMap<String, Object>
      *
      * @return 成功消息
      */
-    public static AjaxResult success(Object data)
+    public static AjaxResult success(Object data) {
-    {
         return AjaxResult.success("操作成功", data);
     }
 
@@ -84,20 +84,18 @@ public class AjaxResult extends HashMap<String, Object>
      * @param msg 返回内容
      * @return 成功消息
      */
-    public static AjaxResult success(String msg)
+    public static AjaxResult success(String msg) {
-    {
         return AjaxResult.success(msg, null);
     }
 
     /**
      * 返回成功消息
      *
-     * @param msg 返回内容
+     * @param msg  返回内容
      * @param data 数据对象
      * @return 成功消息
      */
-    public static AjaxResult success(String msg, Object data)
+    public static AjaxResult success(String msg, Object data) {
-    {
         return new AjaxResult(HttpStatus.SUCCESS, msg, data);
     }
 
@@ -106,8 +104,7 @@ public class AjaxResult extends HashMap<String, Object>
      *
      * @return
      */
-    public static AjaxResult error()
+    public static AjaxResult error() {
-    {
         return AjaxResult.error("操作失败");
     }
 
@@ -117,20 +114,18 @@ public class AjaxResult extends HashMap<String, Object>
      * @param msg 返回内容
      * @return 警告消息
      */
-    public static AjaxResult error(String msg)
+    public static AjaxResult error(String msg) {
-    {
         return AjaxResult.error(msg, null);
     }
 
     /**
      * 返回错误消息
      *
-     * @param msg 返回内容
+     * @param msg  返回内容
      * @param data 数据对象
      * @return 警告消息
      */
-    public static AjaxResult error(String msg, Object data)
+    public static AjaxResult error(String msg, Object data) {
-    {
         return new AjaxResult(HttpStatus.ERROR, msg, data);
     }
 
@@ -138,11 +133,10 @@ public class AjaxResult extends HashMap<String, Object>
      * 返回错误消息
      *
      * @param code 状态码
-     * @param msg 返回内容
+     * @param msg  返回内容
      * @return 警告消息
      */
-    public static AjaxResult error(int code, String msg)
+    public static AjaxResult error(int code, String msg) {
-    {
         return new AjaxResult(code, msg, null);
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
@@ -11,104 +12,102 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  *
  * @author ruoyi
  */
-public class BaseEntity implements Serializable
+public class BaseEntity implements Serializable {
-{
     private static final long serialVersionUID = 1L;
 
-    /** 搜索值 */
+    /**
+     * 搜索值
+     */
     private String searchValue;
 
-    /** 创建者 */
+    /**
+     * 创建者
+     */
     private String createBy;
 
-    /** 创建时间 */
+    /**
+     * 创建时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
-    /** 更新者 */
+    /**
+     * 更新者
+     */
     private String updateBy;
 
-    /** 更新时间 */
+    /**
+     * 更新时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
-    /** 备注 */
+    /**
+     * 备注
+     */
     private String remark;
 
-    /** 请求参数 */
+    /**
+     * 请求参数
+     */
     private Map<String, Object> params;
 
-    public String getSearchValue()
+    public String getSearchValue() {
-    {
         return searchValue;
     }
 
-    public void setSearchValue(String searchValue)
+    public void setSearchValue(String searchValue) {
-    {
         this.searchValue = searchValue;
     }
 
-    public String getCreateBy()
+    public String getCreateBy() {
-    {
         return createBy;
     }
 
-    public void setCreateBy(String createBy)
+    public void setCreateBy(String createBy) {
-    {
         this.createBy = createBy;
     }
 
-    public Date getCreateTime()
+    public Date getCreateTime() {
-    {
         return createTime;
     }
 
-    public void setCreateTime(Date createTime)
+    public void setCreateTime(Date createTime) {
-    {
         this.createTime = createTime;
     }
 
-    public String getUpdateBy()
+    public String getUpdateBy() {
-    {
         return updateBy;
     }
 
-    public void setUpdateBy(String updateBy)
+    public void setUpdateBy(String updateBy) {
-    {
         this.updateBy = updateBy;
     }
 
-    public Date getUpdateTime()
+    public Date getUpdateTime() {
-    {
         return updateTime;
     }
 
-    public void setUpdateTime(Date updateTime)
+    public void setUpdateTime(Date updateTime) {
-    {
         this.updateTime = updateTime;
     }
 
-    public String getRemark()
+    public String getRemark() {
-    {
         return remark;
     }
 
-    public void setRemark(String remark)
+    public void setRemark(String remark) {
-    {
         this.remark = remark;
     }
 
-    public Map<String, Object> getParams()
+    public Map<String, Object> getParams() {
-    {
+        if (params == null) {
-        if (params == null)
-        {
             params = new HashMap<>();
         }
         return params;
     }
 
-    public void setParams(Map<String, Object> params)
+    public void setParams(Map<String, Object> params) {
-    {
         this.params = params;
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java

@@ -8,72 +8,71 @@ import java.util.List;
  *
  * @author ruoyi
  */
-public class TreeEntity extends BaseEntity
+public class TreeEntity extends BaseEntity {
-{
     private static final long serialVersionUID = 1L;
 
-    /** 父菜单名称 */
+    /**
+     * 父菜单名称
+     */
     private String parentName;
 
-    /** 父菜单ID */
+    /**
+     * 父菜单ID
+     */
     private Long parentId;
 
-    /** 显示顺序 */
+    /**
+     * 显示顺序
+     */
     private Integer orderNum;
 
-    /** 祖级列表 */
+    /**
+     * 祖级列表
+     */
     private String ancestors;
 
-    /** 子部门 */
+    /**
+     * 子部门
+     */
     private List<?> children = new ArrayList<>();
 
-    public String getParentName()
+    public String getParentName() {
-    {
         return parentName;
     }
 
-    public void setParentName(String parentName)
+    public void setParentName(String parentName) {
-    {
         this.parentName = parentName;
     }
 
-    public Long getParentId()
+    public Long getParentId() {
-    {
         return parentId;
     }
 
-    public void setParentId(Long parentId)
+    public void setParentId(Long parentId) {
-    {
         this.parentId = parentId;
     }
 
-    public Integer getOrderNum()
+    public Integer getOrderNum() {
-    {
         return orderNum;
     }
 
-    public void setOrderNum(Integer orderNum)
+    public void setOrderNum(Integer orderNum) {
-    {
         this.orderNum = orderNum;
     }
 
-    public String getAncestors()
+    public String getAncestors() {
-    {
         return ancestors;
     }
 
-    public void setAncestors(String ancestors)
+    public void setAncestors(String ancestors) {
-    {
         this.ancestors = ancestors;
     }
 
-    public List<?> getChildren()
+    public List<?> getChildren() {
-    {
         return children;
     }
 
-    public void setChildren(List<?> children)
+    public void setChildren(List<?> children) {
-    {
         this.children = children;
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java

@@ -3,6 +3,7 @@ package com.ruoyi.common.core.domain;
 import java.io.Serializable;
 import java.util.List;
 import java.util.stream.Collectors;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysMenu;
@@ -12,66 +13,62 @@ import com.ruoyi.common.core.domain.entity.SysMenu;
  *
  * @author ruoyi
  */
-public class TreeSelect implements Serializable
+public class TreeSelect implements Serializable {
-{
     private static final long serialVersionUID = 1L;
 
-    /** 节点ID */
+    /**
+     * 节点ID
+     */
     private Long id;
 
-    /** 节点名称 */
+    /**
+     * 节点名称
+     */
     private String label;
 
-    /** 子节点 */
+    /**
+     * 子节点
+     */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<TreeSelect> children;
 
-    public TreeSelect()
+    public TreeSelect() {
-    {
 
     }
 
-    public TreeSelect(SysDept dept)
+    public TreeSelect(SysDept dept) {
-    {
         this.id = dept.getDeptId();
         this.label = dept.getDeptName();
         this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
     }
 
-    public TreeSelect(SysMenu menu)
+    public TreeSelect(SysMenu menu) {
-    {
         this.id = menu.getMenuId();
         this.label = menu.getMenuName();
         this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
     }
 
-    public Long getId()
+    public Long getId() {
-    {
         return id;
     }
 
-    public void setId(Long id)
+    public void setId(Long id) {
-    {
         this.id = id;
     }
 
-    public String getLabel()
+    public String getLabel() {
-    {
         return label;
     }
 
-    public void setLabel(String label)
+    public void setLabel(String label) {
-    {
         this.label = label;
     }
 
-    public List<TreeSelect> getChildren()
+    public List<TreeSelect> getChildren() {
-    {
         return children;
     }
 
-    public void setChildren(List<TreeSelect> children)
+    public void setChildren(List<TreeSelect> children) {
-    {
         this.children = children;
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -5,6 +5,7 @@ import java.util.List;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.domain.BaseEntity;
@@ -14,189 +15,188 @@ import com.ruoyi.common.core.domain.BaseEntity;
  *
  * @author ruoyi
  */
-public class SysDept extends BaseEntity
+public class SysDept extends BaseEntity {
-{
     private static final long serialVersionUID = 1L;
 
-    /** 部门ID */
+    /**
+     * 部门ID
+     */
     private Long deptId;
 
-    /** 父部门ID */
+    /**
+     * 父部门ID
+     */
     private Long parentId;
 
-    /** 祖级列表 */
+    /**
+     * 祖级列表
+     */
     private String ancestors;
 
-    /** 部门名称 */
+    /**
+     * 部门名称
+     */
     private String deptName;
 
-    /** 显示顺序 */
+    /**
+     * 显示顺序
+     */
     private String orderNum;
 
-    /** 负责人 */
+    /**
+     * 负责人
+     */
     private String leader;
 
-    /** 联系电话 */
+    /**
+     * 联系电话
+     */
     private String phone;
 
-    /** 邮箱 */
+    /**
+     * 邮箱
+     */
     private String email;
 
-    /** 部门状态:0正常,1停用 */
+    /**
+     * 部门状态:0正常,1停用
+     */
     private String status;
 
-    /** 删除标志（0代表存在 2代表删除） */
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
     private String delFlag;
 
-    /** 父部门名称 */
+    /**
+     * 父部门名称
+     */
     private String parentName;
 
-    /** 子部门 */
+    /**
+     * 子部门
+     */
     private List<SysDept> children = new ArrayList<SysDept>();
 
-    public Long getDeptId()
+    public Long getDeptId() {
-    {
         return deptId;
     }
 
-    public void setDeptId(Long deptId)
+    public void setDeptId(Long deptId) {
-    {
         this.deptId = deptId;
     }
 
-    public Long getParentId()
+    public Long getParentId() {
-    {
         return parentId;
     }
 
-    public void setParentId(Long parentId)
+    public void setParentId(Long parentId) {
-    {
         this.parentId = parentId;
     }
 
-    public String getAncestors()
+    public String getAncestors() {
-    {
         return ancestors;
     }
 
-    public void setAncestors(String ancestors)
+    public void setAncestors(String ancestors) {
-    {
         this.ancestors = ancestors;
     }
 
     @NotBlank(message = "部门名称不能为空")
     @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
-    public String getDeptName()
+    public String getDeptName() {
-    {
         return deptName;
     }
 
-    public void setDeptName(String deptName)
+    public void setDeptName(String deptName) {
-    {
         this.deptName = deptName;
     }
 
     @NotBlank(message = "显示顺序不能为空")
-    public String getOrderNum()
+    public String getOrderNum() {
-    {
         return orderNum;
     }
 
-    public void setOrderNum(String orderNum)
+    public void setOrderNum(String orderNum) {
-    {
         this.orderNum = orderNum;
     }
 
-    public String getLeader()
+    public String getLeader() {
-    {
         return leader;
     }
 
-    public void setLeader(String leader)
+    public void setLeader(String leader) {
-    {
         this.leader = leader;
     }
 
     @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
-    public String getPhone()
+    public String getPhone() {
-    {
         return phone;
     }
 
-    public void setPhone(String phone)
+    public void setPhone(String phone) {
-    {
         this.phone = phone;
     }
 
     @Email(message = "邮箱格式不正确")
     @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
-    public String getEmail()
+    public String getEmail() {
-    {
         return email;
     }
 
-    public void setEmail(String email)
+    public void setEmail(String email) {
-    {
         this.email = email;
     }
 
-    public String getStatus()
+    public String getStatus() {
-    {
         return status;
     }
 
-    public void setStatus(String status)
+    public void setStatus(String status) {
-    {
         this.status = status;
     }
 
-    public String getDelFlag()
+    public String getDelFlag() {
-    {
         return delFlag;
     }
 
-    public void setDelFlag(String delFlag)
+    public void setDelFlag(String delFlag) {
-    {
         this.delFlag = delFlag;
     }
 
-    public String getParentName()
+    public String getParentName() {
-    {
         return parentName;
     }
 
-    public void setParentName(String parentName)
+    public void setParentName(String parentName) {
-    {
         this.parentName = parentName;
     }
 
-    public List<SysDept> getChildren()
+    public List<SysDept> getChildren() {
-    {
         return children;
     }
 
-    public void setChildren(List<SysDept> children)
+    public void setChildren(List<SysDept> children) {
-    {
         this.children = children;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("deptId", getDeptId())
+                .append("deptId", getDeptId())
-            .append("parentId", getParentId())
+                .append("parentId", getParentId())
-            .append("ancestors", getAncestors())
+                .append("ancestors", getAncestors())
-            .append("deptName", getDeptName())
+                .append("deptName", getDeptName())
-            .append("orderNum", getOrderNum())
+                .append("orderNum", getOrderNum())
-            .append("leader", getLeader())
+                .append("leader", getLeader())
-            .append("phone", getPhone())
+                .append("phone", getPhone())
-            .append("email", getEmail())
+                .append("email", getEmail())
-            .append("status", getStatus())
+                .append("status", getStatus())
-            .append("delFlag", getDelFlag())
+                .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
+                .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
+                .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
+                .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
+                .append("updateTime", getUpdateTime())
-            .toString();
+                .toString();
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java

@@ -2,6 +2,7 @@ package com.ruoyi.common.core.domain.entity;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -14,163 +15,161 @@ import com.ruoyi.common.core.domain.BaseEntity;
  *
  * @author ruoyi
  */
-public class SysDictData extends BaseEntity
+public class SysDictData extends BaseEntity {
-{
     private static final long serialVersionUID = 1L;
 
-    /** 字典编码 */
+    /**
+     * 字典编码
+     */
     @Excel(name = "字典编码", cellType = ColumnType.NUMERIC)
     private Long dictCode;
 
-    /** 字典排序 */
+    /**
+     * 字典排序
+     */
     @Excel(name = "字典排序", cellType = ColumnType.NUMERIC)
     private Long dictSort;
 
-    /** 字典标签 */
+    /**
+     * 字典标签
+     */
     @Excel(name = "字典标签")
     private String dictLabel;
 
-    /** 字典键值 */
+    /**
+     * 字典键值
+     */
     @Excel(name = "字典键值")
     private String dictValue;
 
-    /** 字典类型 */
+    /**
+     * 字典类型
+     */
     @Excel(name = "字典类型")
     private String dictType;
 
-    /** 样式属性（其他样式扩展） */
+    /**
+     * 样式属性（其他样式扩展）
+     */
     private String cssClass;
 
-    /** 表格字典样式 */
+    /**
+     * 表格字典样式
+     */
     private String listClass;
 
-    /** 是否默认（Y是 N否） */
+    /**
+     * 是否默认（Y是 N否）
+     */
     @Excel(name = "是否默认", readConverterExp = "Y=是,N=否")
     private String isDefault;
 
-    /** 状态（0正常 1停用） */
+    /**
+     * 状态（0正常 1停用）
+     */
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
-    public Long getDictCode()
+    public Long getDictCode() {
-    {
         return dictCode;
     }
 
-    public void setDictCode(Long dictCode)
+    public void setDictCode(Long dictCode) {
-    {
         this.dictCode = dictCode;
     }
 
-    public Long getDictSort()
+    public Long getDictSort() {
-    {
         return dictSort;
     }
 
-    public void setDictSort(Long dictSort)
+    public void setDictSort(Long dictSort) {
-    {
         this.dictSort = dictSort;
     }
 
     @NotBlank(message = "字典标签不能为空")
     @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
-    public String getDictLabel()
+    public String getDictLabel() {
-    {
         return dictLabel;
     }
 
-    public void setDictLabel(String dictLabel)
+    public void setDictLabel(String dictLabel) {
-    {
         this.dictLabel = dictLabel;
     }
 
     @NotBlank(message = "字典键值不能为空")
     @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
-    public String getDictValue()
+    public String getDictValue() {
-    {
         return dictValue;
     }
 
-    public void setDictValue(String dictValue)
+    public void setDictValue(String dictValue) {
-    {
         this.dictValue = dictValue;
     }
 
     @NotBlank(message = "字典类型不能为空")
     @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
-    public String getDictType()
+    public String getDictType() {
-    {
         return dictType;
     }
 
-    public void setDictType(String dictType)
+    public void setDictType(String dictType) {
-    {
         this.dictType = dictType;
     }
 
     @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
-    public String getCssClass()
+    public String getCssClass() {
-    {
         return cssClass;
     }
 
-    public void setCssClass(String cssClass)
+    public void setCssClass(String cssClass) {
-    {
         this.cssClass = cssClass;
     }
 
-    public String getListClass()
+    public String getListClass() {
-    {
         return listClass;
     }
 
-    public void setListClass(String listClass)
+    public void setListClass(String listClass) {
-    {
         this.listClass = listClass;
     }
 
-    public boolean getDefault()
+    public boolean getDefault() {
-    {
         return UserConstants.YES.equals(this.isDefault) ? true : false;
     }
 
-    public String getIsDefault()
+    public String getIsDefault() {
-    {
         return isDefault;
     }
 
-    public void setIsDefault(String isDefault)
+    public void setIsDefault(String isDefault) {
-    {
         this.isDefault = isDefault;
     }
 
-    public String getStatus()
+    public String getStatus() {
-    {
         return status;
     }
 
-    public void setStatus(String status)
+    public void setStatus(String status) {
-    {
         this.status = status;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("dictCode", getDictCode())
+                .append("dictCode", getDictCode())
-            .append("dictSort", getDictSort())
+                .append("dictSort", getDictSort())
-            .append("dictLabel", getDictLabel())
+                .append("dictLabel", getDictLabel())
-            .append("dictValue", getDictValue())
+                .append("dictValue", getDictValue())
-            .append("dictType", getDictType())
+                .append("dictType", getDictType())
-            .append("cssClass", getCssClass())
+                .append("cssClass", getCssClass())
-            .append("listClass", getListClass())
+                .append("listClass", getListClass())
-            .append("isDefault", getIsDefault())
+                .append("isDefault", getIsDefault())
-            .append("status", getStatus())
+                .append("status", getStatus())
-            .append("createBy", getCreateBy())
+                .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
+                .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
+                .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
+                .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
+                .append("remark", getRemark())
-            .toString();
+                .toString();
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java

@@ -2,6 +2,7 @@ package com.ruoyi.common.core.domain.entity;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -13,82 +14,81 @@ import com.ruoyi.common.core.domain.BaseEntity;
  *
  * @author ruoyi
  */
-public class SysDictType extends BaseEntity
+public class SysDictType extends BaseEntity {
-{
     private static final long serialVersionUID = 1L;
 
-    /** 字典主键 */
+    /**
+     * 字典主键
+     */
     @Excel(name = "字典主键", cellType = ColumnType.NUMERIC)
     private Long dictId;
 
-    /** 字典名称 */
+    /**
+     * 字典名称
+     */
     @Excel(name = "字典名称")
     private String dictName;
 
-    /** 字典类型 */
+    /**
+     * 字典类型
+     */
     @Excel(name = "字典类型")
     private String dictType;
 
-    /** 状态（0正常 1停用） */
+    /**
+     * 状态（0正常 1停用）
+     */
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
-    public Long getDictId()
+    public Long getDictId() {
-    {
         return dictId;
     }
 
-    public void setDictId(Long dictId)
+    public void setDictId(Long dictId) {
-    {
         this.dictId = dictId;
     }
 
     @NotBlank(message = "字典名称不能为空")
     @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符")
-    public String getDictName()
+    public String getDictName() {
-    {
         return dictName;
     }
 
-    public void setDictName(String dictName)
+    public void setDictName(String dictName) {
-    {
         this.dictName = dictName;
     }
 
     @NotBlank(message = "字典类型不能为空")
     @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
-    public String getDictType()
+    public String getDictType() {
-    {
         return dictType;
     }
 
-    public void setDictType(String dictType)
+    public void setDictType(String dictType) {
-    {
         this.dictType = dictType;
     }
 
-    public String getStatus()
+    public String getStatus() {
-    {
         return status;
     }
 
-    public void setStatus(String status)
+    public void setStatus(String status) {
-    {
         this.status = status;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("dictId", getDictId())
+                .append("dictId", getDictId())
-            .append("dictName", getDictName())
+                .append("dictName", getDictName())
-            .append("dictType", getDictType())
+                .append("dictType", getDictType())
-            .append("status", getStatus())
+                .append("status", getStatus())
-            .append("createBy", getCreateBy())
+                .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
+                .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
+                .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
+                .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
+                .append("remark", getRemark())
-            .toString();
+                .toString();
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.domain.BaseEntity;
@@ -13,233 +14,232 @@ import com.ruoyi.common.core.domain.BaseEntity;
  *
  * @author ruoyi
  */
-public class SysMenu extends BaseEntity
+public class SysMenu extends BaseEntity {
-{
     private static final long serialVersionUID = 1L;
 
-    /** 菜单ID */
+    /**
+     * 菜单ID
+     */
     private Long menuId;
 
-    /** 菜单名称 */
+    /**
+     * 菜单名称
+     */
     private String menuName;
 
-    /** 父菜单名称 */
+    /**
+     * 父菜单名称
+     */
     private String parentName;
 
-    /** 父菜单ID */
+    /**
+     * 父菜单ID
+     */
     private Long parentId;
 
-    /** 显示顺序 */
+    /**
+     * 显示顺序
+     */
     private String orderNum;
 
-    /** 路由地址 */
+    /**
+     * 路由地址
+     */
     private String path;
 
-    /** 组件路径 */
+    /**
+     * 组件路径
+     */
     private String component;
 
-    /** 是否为外链（0是 1否） */
+    /**
+     * 是否为外链（0是 1否）
+     */
     private String isFrame;
 
-    /** 是否缓存（0缓存 1不缓存） */
+    /**
+     * 是否缓存（0缓存 1不缓存）
+     */
     private String isCache;
 
-    /** 类型（M目录 C菜单 F按钮） */
+    /**
+     * 类型（M目录 C菜单 F按钮）
+     */
     private String menuType;
 
-    /** 显示状态（0显示 1隐藏） */
+    /**
+     * 显示状态（0显示 1隐藏）
+     */
     private String visible;
 
-    /** 菜单状态（0显示 1隐藏） */
+    /**
+     * 菜单状态（0显示 1隐藏）
+     */
     private String status;
 
-    /** 权限字符串 */
+    /**
+     * 权限字符串
+     */
     private String perms;
 
-    /** 菜单图标 */
+    /**
+     * 菜单图标
+     */
     private String icon;
 
-    /** 子菜单 */
+    /**
+     * 子菜单
+     */
     private List<SysMenu> children = new ArrayList<SysMenu>();
 
-    public Long getMenuId()
+    public Long getMenuId() {
-    {
         return menuId;
     }
 
-    public void setMenuId(Long menuId)
+    public void setMenuId(Long menuId) {
-    {
         this.menuId = menuId;
     }
 
     @NotBlank(message = "菜单名称不能为空")
     @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符")
-    public String getMenuName()
+    public String getMenuName() {
-    {
         return menuName;
     }
 
-    public void setMenuName(String menuName)
+    public void setMenuName(String menuName) {
-    {
         this.menuName = menuName;
     }
 
-    public String getParentName()
+    public String getParentName() {
-    {
         return parentName;
     }
 
-    public void setParentName(String parentName)
+    public void setParentName(String parentName) {
-    {
         this.parentName = parentName;
     }
 
-    public Long getParentId()
+    public Long getParentId() {
-    {
         return parentId;
     }
 
-    public void setParentId(Long parentId)
+    public void setParentId(Long parentId) {
-    {
         this.parentId = parentId;
     }
 
     @NotBlank(message = "显示顺序不能为空")
-    public String getOrderNum()
+    public String getOrderNum() {
-    {
         return orderNum;
     }
 
-    public void setOrderNum(String orderNum)
+    public void setOrderNum(String orderNum) {
-    {
         this.orderNum = orderNum;
     }
 
     @Size(min = 0, max = 200, message = "路由地址不能超过200个字符")
-    public String getPath()
+    public String getPath() {
-    {
         return path;
     }
 
-    public void setPath(String path)
+    public void setPath(String path) {
-    {
         this.path = path;
     }
 
     @Size(min = 0, max = 200, message = "组件路径不能超过255个字符")
-    public String getComponent()
+    public String getComponent() {
-    {
         return component;
     }
 
-    public void setComponent(String component)
+    public void setComponent(String component) {
-    {
         this.component = component;
     }
 
-    public String getIsFrame()
+    public String getIsFrame() {
-    {
         return isFrame;
     }
 
-    public void setIsFrame(String isFrame)
+    public void setIsFrame(String isFrame) {
-    {
         this.isFrame = isFrame;
     }
 
-    public String getIsCache()
+    public String getIsCache() {
-    {
         return isCache;
     }
 
-    public void setIsCache(String isCache)
+    public void setIsCache(String isCache) {
-    {
         this.isCache = isCache;
     }
 
     @NotBlank(message = "菜单类型不能为空")
-    public String getMenuType()
+    public String getMenuType() {
-    {
         return menuType;
     }
 
-    public void setMenuType(String menuType)
+    public void setMenuType(String menuType) {
-    {
         this.menuType = menuType;
     }
 
-    public String getVisible()
+    public String getVisible() {
-    {
         return visible;
     }
 
-    public void setVisible(String visible)
+    public void setVisible(String visible) {
-    {
         this.visible = visible;
     }
 
-    public String getStatus()
+    public String getStatus() {
-    {
         return status;
     }
 
-    public void setStatus(String status)
+    public void setStatus(String status) {
-    {
         this.status = status;
     }
 
     @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符")
-    public String getPerms()
+    public String getPerms() {
-    {
         return perms;
     }
 
-    public void setPerms(String perms)
+    public void setPerms(String perms) {
-    {
         this.perms = perms;
     }
 
-    public String getIcon()
+    public String getIcon() {
-    {
         return icon;
     }
 
-    public void setIcon(String icon)
+    public void setIcon(String icon) {
-    {
         this.icon = icon;
     }
 
-    public List<SysMenu> getChildren()
+    public List<SysMenu> getChildren() {
-    {
         return children;
     }
 
-    public void setChildren(List<SysMenu> children)
+    public void setChildren(List<SysMenu> children) {
-    {
         this.children = children;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("menuId", getMenuId())
+                .append("menuId", getMenuId())
-            .append("menuName", getMenuName())
+                .append("menuName", getMenuName())
-            .append("parentId", getParentId())
+                .append("parentId", getParentId())
-            .append("orderNum", getOrderNum())
+                .append("orderNum", getOrderNum())
-            .append("path", getPath())
+                .append("path", getPath())
-            .append("component", getComponent())
+                .append("component", getComponent())
-            .append("isFrame", getIsFrame())
+                .append("isFrame", getIsFrame())
-            .append("IsCache", getIsCache())
+                .append("IsCache", getIsCache())
-            .append("menuType", getMenuType())
+                .append("menuType", getMenuType())
-            .append("visible", getVisible())
+                .append("visible", getVisible())
-            .append("status ", getStatus())
+                .append("status ", getStatus())
-            .append("perms", getPerms())
+                .append("perms", getPerms())
-            .append("icon", getIcon())
+                .append("icon", getIcon())
-            .append("createBy", getCreateBy())
+                .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
+                .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
+                .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
+                .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
+                .append("remark", getRemark())
-            .toString();
+                .toString();
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java

@@ -2,6 +2,7 @@ package com.ruoyi.common.core.domain.entity;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -13,214 +14,209 @@ import com.ruoyi.common.core.domain.BaseEntity;
  *
  * @author ruoyi
  */
-public class SysRole extends BaseEntity
+public class SysRole extends BaseEntity {
-{
     private static final long serialVersionUID = 1L;
 
-    /** 角色ID */
+    /**
+     * 角色ID
+     */
     @Excel(name = "角色序号", cellType = ColumnType.NUMERIC)
     private Long roleId;
 
-    /** 角色名称 */
+    /**
+     * 角色名称
+     */
     @Excel(name = "角色名称")
     private String roleName;
 
-    /** 角色权限 */
+    /**
+     * 角色权限
+     */
     @Excel(name = "角色权限")
     private String roleKey;
 
-    /** 角色排序 */
+    /**
+     * 角色排序
+     */
     @Excel(name = "角色排序")
     private String roleSort;
 
-    /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限） */
+    /**
+     * 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限）
+     */
     @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限")
     private String dataScope;
 
-    /** 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） */
+    /**
+     * 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）
+     */
     private boolean menuCheckStrictly;
 
-    /** 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ） */
+    /**
+     * 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）
+     */
     private boolean deptCheckStrictly;
 
-    /** 角色状态（0正常 1停用） */
+    /**
+     * 角色状态（0正常 1停用）
+     */
     @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
-    /** 删除标志（0代表存在 2代表删除） */
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
     private String delFlag;
 
-    /** 用户是否存在此角色标识 默认不存在 */
+    /**
+     * 用户是否存在此角色标识 默认不存在
+     */
     private boolean flag = false;
 
-    /** 菜单组 */
+    /**
+     * 菜单组
+     */
     private Long[] menuIds;
 
-    /** 部门组（数据权限） */
+    /**
+     * 部门组（数据权限）
+     */
     private Long[] deptIds;
 
-    public SysRole()
+    public SysRole() {
-    {
 
     }
 
-    public SysRole(Long roleId)
+    public SysRole(Long roleId) {
-    {
         this.roleId = roleId;
     }
 
-    public Long getRoleId()
+    public Long getRoleId() {
-    {
         return roleId;
     }
 
-    public void setRoleId(Long roleId)
+    public void setRoleId(Long roleId) {
-    {
         this.roleId = roleId;
     }
 
-    public boolean isAdmin()
+    public boolean isAdmin() {
-    {
         return isAdmin(this.roleId);
     }
 
-    public static boolean isAdmin(Long roleId)
+    public static boolean isAdmin(Long roleId) {
-    {
         return roleId != null && 1L == roleId;
     }
 
     @NotBlank(message = "角色名称不能为空")
     @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
-    public String getRoleName()
+    public String getRoleName() {
-    {
         return roleName;
     }
 
-    public void setRoleName(String roleName)
+    public void setRoleName(String roleName) {
-    {
         this.roleName = roleName;
     }
 
     @NotBlank(message = "权限字符不能为空")
     @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
-    public String getRoleKey()
+    public String getRoleKey() {
-    {
         return roleKey;
     }
 
-    public void setRoleKey(String roleKey)
+    public void setRoleKey(String roleKey) {
-    {
         this.roleKey = roleKey;
     }
 
     @NotBlank(message = "显示顺序不能为空")
-    public String getRoleSort()
+    public String getRoleSort() {
-    {
         return roleSort;
     }
 
-    public void setRoleSort(String roleSort)
+    public void setRoleSort(String roleSort) {
-    {
         this.roleSort = roleSort;
     }
 
-    public String getDataScope()
+    public String getDataScope() {
-    {
         return dataScope;
     }
 
-    public void setDataScope(String dataScope)
+    public void setDataScope(String dataScope) {
-    {
         this.dataScope = dataScope;
     }
 
-    public boolean isMenuCheckStrictly()
+    public boolean isMenuCheckStrictly() {
-    {
         return menuCheckStrictly;
     }
 
-    public void setMenuCheckStrictly(boolean menuCheckStrictly)
+    public void setMenuCheckStrictly(boolean menuCheckStrictly) {
-    {
         this.menuCheckStrictly = menuCheckStrictly;
     }
 
-    public boolean isDeptCheckStrictly()
+    public boolean isDeptCheckStrictly() {
-    {
         return deptCheckStrictly;
     }
 
-    public void setDeptCheckStrictly(boolean deptCheckStrictly)
+    public void setDeptCheckStrictly(boolean deptCheckStrictly) {
-    {
         this.deptCheckStrictly = deptCheckStrictly;
     }
 
-    public String getStatus()
+    public String getStatus() {
-    {
         return status;
     }
 
-    public void setStatus(String status)
+    public void setStatus(String status) {
-    {
         this.status = status;
     }
 
-    public String getDelFlag()
+    public String getDelFlag() {
-    {
         return delFlag;
     }
 
-    public void setDelFlag(String delFlag)
+    public void setDelFlag(String delFlag) {
-    {
         this.delFlag = delFlag;
     }
 
-    public boolean isFlag()
+    public boolean isFlag() {
-    {
         return flag;
     }
 
-    public void setFlag(boolean flag)
+    public void setFlag(boolean flag) {
-    {
         this.flag = flag;
     }
 
-    public Long[] getMenuIds()
+    public Long[] getMenuIds() {
-    {
         return menuIds;
     }
 
-    public void setMenuIds(Long[] menuIds)
+    public void setMenuIds(Long[] menuIds) {
-    {
         this.menuIds = menuIds;
     }
 
-    public Long[] getDeptIds()
+    public Long[] getDeptIds() {
-    {
         return deptIds;
     }
 
-    public void setDeptIds(Long[] deptIds)
+    public void setDeptIds(Long[] deptIds) {
-    {
         this.deptIds = deptIds;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("roleId", getRoleId())
+                .append("roleId", getRoleId())
-            .append("roleName", getRoleName())
+                .append("roleName", getRoleName())
-            .append("roleKey", getRoleKey())
+                .append("roleKey", getRoleKey())
-            .append("roleSort", getRoleSort())
+                .append("roleSort", getRoleSort())
-            .append("dataScope", getDataScope())
+                .append("dataScope", getDataScope())
-            .append("menuCheckStrictly", isMenuCheckStrictly())
+                .append("menuCheckStrictly", isMenuCheckStrictly())
-            .append("deptCheckStrictly", isDeptCheckStrictly())
+                .append("deptCheckStrictly", isDeptCheckStrictly())
-            .append("status", getStatus())
+                .append("status", getStatus())
-            .append("delFlag", getDelFlag())
+                .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
+                .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
+                .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
+                .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
+                .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
+                .append("remark", getRemark())
-            .toString();
+                .toString();
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -5,6 +5,7 @@ import java.util.List;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -20,309 +21,315 @@ import com.ruoyi.common.core.domain.BaseEntity;
  *
  * @author ruoyi
  */
-public class SysUser extends BaseEntity
+public class SysUser extends BaseEntity {
-{
     private static final long serialVersionUID = 1L;
 
-    /** 用户ID */
+    /**
+     * 用户ID
+     */
     @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
     private Long userId;
 
-    /** 部门ID */
+    /**
+     * 部门ID
+     */
     @Excel(name = "部门编号", type = Type.IMPORT)
     private Long deptId;
 
-    /** 用户账号 */
+    /**
+     * 用户账号
+     */
     @Excel(name = "登录名称")
     private String userName;
 
-    /** 用户昵称 */
+    /**
+     * 用户昵称
+     */
     @Excel(name = "用户名称")
     private String nickName;
 
-    /** 用户邮箱 */
+    @Excel(name = "用户OpenId")
+    private String openId;
+
+    /**
+     * 用户邮箱
+     */
     @Excel(name = "用户邮箱")
     private String email;
 
-    /** 手机号码 */
+    /**
+     * 手机号码
+     */
     @Excel(name = "手机号码")
     private String phonenumber;
 
-    /** 用户性别 */
+    /**
+     * 用户性别
+     */
     @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
     private String sex;
 
-    /** 用户头像 */
+    /**
+     * 用户头像
+     */
     private String avatar;
 
-    /** 密码 */
+    /**
+     * 密码
+     */
     private String password;
 
-    /** 盐加密 */
+    /**
+     * 盐加密
+     */
     private String salt;
 
-    /** 帐号状态（0正常 1停用） */
+    /**
+     * 帐号状态（0正常 1停用）
+     */
     @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
-    /** 删除标志（0代表存在 2代表删除） */
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
     private String delFlag;
 
-    /** 最后登录IP */
+    /**
+     * 最后登录IP
+     */
     @Excel(name = "最后登录IP", type = Type.EXPORT)
     private String loginIp;
 
-    /** 最后登录时间 */
+    /**
+     * 最后登录时间
+     */
     @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
     private Date loginDate;
 
-    /** 部门对象 */
+    /**
+     * 部门对象
+     */
     @Excels({
-        @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
+            @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
-        @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
+            @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
     })
     private SysDept dept;
 
-    /** 角色对象 */
+    /**
+     * 角色对象
+     */
     private List<SysRole> roles;
 
-    /** 角色组 */
+    /**
+     * 角色组
+     */
     private Long[] roleIds;
 
-    /** 岗位组 */
+    /**
+     * 岗位组
+     */
     private Long[] postIds;
 
-    public SysUser()
+    public SysUser() {
-    {
 
     }
 
-    public SysUser(Long userId)
+    public String getOpenId() {
-    {
+        return openId;
+    }
+
+    public void setOpenId(String openId) {
+        this.openId = openId;
+    }
+
+    public SysUser(Long userId) {
         this.userId = userId;
     }
 
-    public Long getUserId()
+    public Long getUserId() {
-    {
         return userId;
     }
 
-    public void setUserId(Long userId)
+    public void setUserId(Long userId) {
-    {
         this.userId = userId;
     }
 
-    public boolean isAdmin()
+    public boolean isAdmin() {
-    {
         return isAdmin(this.userId);
     }
 
-    public static boolean isAdmin(Long userId)
+    public static boolean isAdmin(Long userId) {
-    {
         return userId != null && 1L == userId;
     }
 
-    public Long getDeptId()
+    public Long getDeptId() {
-    {
         return deptId;
     }
 
-    public void setDeptId(Long deptId)
+    public void setDeptId(Long deptId) {
-    {
         this.deptId = deptId;
     }
 
     @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
-    public String getNickName()
+    public String getNickName() {
-    {
         return nickName;
     }
 
-    public void setNickName(String nickName)
+    public void setNickName(String nickName) {
-    {
         this.nickName = nickName;
     }
 
     @NotBlank(message = "用户账号不能为空")
     @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
-    public String getUserName()
+    public String getUserName() {
-    {
         return userName;
     }
 
-    public void setUserName(String userName)
+    public void setUserName(String userName) {
-    {
         this.userName = userName;
     }
 
     @Email(message = "邮箱格式不正确")
     @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
-    public String getEmail()
+    public String getEmail() {
-    {
         return email;
     }
 
-    public void setEmail(String email)
+    public void setEmail(String email) {
-    {
         this.email = email;
     }
 
     @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
-    public String getPhonenumber()
+    public String getPhonenumber() {
-    {
         return phonenumber;
     }
 
-    public void setPhonenumber(String phonenumber)
+    public void setPhonenumber(String phonenumber) {
-    {
         this.phonenumber = phonenumber;
     }
 
-    public String getSex()
+    public String getSex() {
-    {
         return sex;
     }
 
-    public void setSex(String sex)
+    public void setSex(String sex) {
-    {
         this.sex = sex;
     }
 
-    public String getAvatar()
+    public String getAvatar() {
-    {
         return avatar;
     }
 
-    public void setAvatar(String avatar)
+    public void setAvatar(String avatar) {
-    {
         this.avatar = avatar;
     }
 
-	@JsonIgnore
+    @JsonIgnore
     @JsonProperty
-    public String getPassword()
+    public String getPassword() {
-    {
         return password;
     }
 
-    public void setPassword(String password)
+    public void setPassword(String password) {
-    {
         this.password = password;
     }
 
-    public String getSalt()
+    public String getSalt() {
-    {
         return salt;
     }
 
-    public void setSalt(String salt)
+    public void setSalt(String salt) {
-    {
         this.salt = salt;
     }
 
-    public String getStatus()
+    public String getStatus() {
-    {
         return status;
     }
 
-    public void setStatus(String status)
+    public void setStatus(String status) {
-    {
         this.status = status;
     }
 
-    public String getDelFlag()
+    public String getDelFlag() {
-    {
         return delFlag;
     }
 
-    public void setDelFlag(String delFlag)
+    public void setDelFlag(String delFlag) {
-    {
         this.delFlag = delFlag;
     }
 
-    public String getLoginIp()
+    public String getLoginIp() {
-    {
         return loginIp;
     }
 
-    public void setLoginIp(String loginIp)
+    public void setLoginIp(String loginIp) {
-    {
         this.loginIp = loginIp;
     }
 
-    public Date getLoginDate()
+    public Date getLoginDate() {
-    {
         return loginDate;
     }
 
-    public void setLoginDate(Date loginDate)
+    public void setLoginDate(Date loginDate) {
-    {
         this.loginDate = loginDate;
     }
 
-    public SysDept getDept()
+    public SysDept getDept() {
-    {
         return dept;
     }
 
-    public void setDept(SysDept dept)
+    public void setDept(SysDept dept) {
-    {
         this.dept = dept;
     }
 
-    public List<SysRole> getRoles()
+    public List<SysRole> getRoles() {
-    {
         return roles;
     }
 
-    public void setRoles(List<SysRole> roles)
+    public void setRoles(List<SysRole> roles) {
-    {
         this.roles = roles;
     }
 
-    public Long[] getRoleIds()
+    public Long[] getRoleIds() {
-    {
         return roleIds;
     }
 
-    public void setRoleIds(Long[] roleIds)
+    public void setRoleIds(Long[] roleIds) {
-    {
         this.roleIds = roleIds;
     }
 
-    public Long[] getPostIds()
+    public Long[] getPostIds() {
-    {
         return postIds;
     }
 
-    public void setPostIds(Long[] postIds)
+    public void setPostIds(Long[] postIds) {
-    {
         this.postIds = postIds;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("userId", getUserId())
+                .append("userId", getUserId())
-            .append("deptId", getDeptId())
+                .append("deptId", getDeptId())
-            .append("userName", getUserName())
+                .append("userName", getUserName())
-            .append("nickName", getNickName())
+                .append("nickName", getNickName())
-            .append("email", getEmail())
+                .append("email", getEmail())
-            .append("phonenumber", getPhonenumber())
+                .append("phonenumber", getPhonenumber())
-            .append("sex", getSex())
+                .append("sex", getSex())
-            .append("avatar", getAvatar())
+                .append("avatar", getAvatar())
-            .append("password", getPassword())
+                .append("password", getPassword())
-            .append("salt", getSalt())
+                .append("salt", getSalt())
-            .append("status", getStatus())
+                .append("status", getStatus())
-            .append("delFlag", getDelFlag())
+                .append("delFlag", getDelFlag())
-            .append("loginIp", getLoginIp())
+                .append("loginIp", getLoginIp())
-            .append("loginDate", getLoginDate())
+                .append("loginDate", getLoginDate())
-            .append("createBy", getCreateBy())
+                .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
+                .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
+                .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
+                .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
+                .append("remark", getRemark())
-            .append("dept", getDept())
+                .append("dept", getDept())
-            .toString();
+                .toString();
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java

@@ -5,8 +5,7 @@ package com.ruoyi.common.core.domain.model;
  *
  * @author ruoyi
  */
-public class LoginBody
+public class LoginBody {
-{
     /**
      * 用户名
      */
@@ -27,43 +26,35 @@ public class LoginBody
      */
     private String uuid = "";
 
-    public String getUsername()
+    public String getUsername() {
-    {
         return username;
     }
 
-    public void setUsername(String username)
+    public void setUsername(String username) {
-    {
         this.username = username;
     }
 
-    public String getPassword()
+    public String getPassword() {
-    {
         return password;
     }
 
-    public void setPassword(String password)
+    public void setPassword(String password) {
-    {
         this.password = password;
     }
 
-    public String getCode()
+    public String getCode() {
-    {
         return code;
     }
 
-    public void setCode(String code)
+    public void setCode(String code) {
-    {
         this.code = code;
     }
 
-    public String getUuid()
+    public String getUuid() {
-    {
         return uuid;
     }
 
-    public void setUuid(String uuid)
+    public void setUuid(String uuid) {
-    {
         this.uuid = uuid;
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java

@@ -1,7 +1,9 @@
 package com.ruoyi.common.core.domain.model;
 
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.Set;
+
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -12,8 +14,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
  *
  * @author ruoyi
  */
-public class LoginUser implements UserDetails
+public class LoginUser implements UserDetails {
-{
     private static final long serialVersionUID = 1L;
 
     /**
@@ -61,36 +62,32 @@ public class LoginUser implements UserDetails
      */
     private SysUser user;
 
-    public String getToken()
+    public String getToken() {
-    {
         return token;
     }
 
-    public void setToken(String token)
+    public void setToken(String token) {
-    {
         this.token = token;
     }
 
-    public LoginUser()
+    public LoginUser() {
-    {
     }
 
-    public LoginUser(SysUser user, Set<String> permissions)
+    public LoginUser(SysUser user, Set<String> permissions) {
-    {
         this.user = user;
         this.permissions = permissions;
     }
 
+
+
     @JsonIgnore
     @Override
-    public String getPassword()
+    public String getPassword() {
-    {
         return user.getPassword();
     }
 
     @Override
-    public String getUsername()
+    public String getUsername() {
-    {
         return user.getUserName();
     }
 
@@ -99,8 +96,7 @@ public class LoginUser implements UserDetails
      */
     @JsonIgnore
     @Override
-    public boolean isAccountNonExpired()
+    public boolean isAccountNonExpired() {
-    {
         return true;
     }
 
@@ -111,8 +107,7 @@ public class LoginUser implements UserDetails
      */
     @JsonIgnore
     @Override
-    public boolean isAccountNonLocked()
+    public boolean isAccountNonLocked() {
-    {
         return true;
     }
 
@@ -123,8 +118,7 @@ public class LoginUser implements UserDetails
      */
     @JsonIgnore
     @Override
-    public boolean isCredentialsNonExpired()
+    public boolean isCredentialsNonExpired() {
-    {
         return true;
     }
 
@@ -135,94 +129,77 @@ public class LoginUser implements UserDetails
      */
     @JsonIgnore
     @Override
-    public boolean isEnabled()
+    public boolean isEnabled() {
-    {
         return true;
     }
 
-    public Long getLoginTime()
+    public Long getLoginTime() {
-    {
         return loginTime;
     }
 
-    public void setLoginTime(Long loginTime)
+    public void setLoginTime(Long loginTime) {
-    {
         this.loginTime = loginTime;
     }
 
-    public String getIpaddr()
+    public String getIpaddr() {
-    {
         return ipaddr;
     }
 
-    public void setIpaddr(String ipaddr)
+    public void setIpaddr(String ipaddr) {
-    {
         this.ipaddr = ipaddr;
     }
 
-    public String getLoginLocation()
+    public String getLoginLocation() {
-    {
         return loginLocation;
     }
 
-    public void setLoginLocation(String loginLocation)
+    public void setLoginLocation(String loginLocation) {
-    {
         this.loginLocation = loginLocation;
     }
 
-    public String getBrowser()
+    public String getBrowser() {
-    {
         return browser;
     }
 
-    public void setBrowser(String browser)
+    public void setBrowser(String browser) {
-    {
         this.browser = browser;
     }
 
-    public String getOs()
+    public String getOs() {
-    {
         return os;
     }
 
-    public void setOs(String os)
+    public void setOs(String os) {
-    {
         this.os = os;
     }
 
-    public Long getExpireTime()
+    public Long getExpireTime() {
-    {
         return expireTime;
     }
 
-    public void setExpireTime(Long expireTime)
+    public void setExpireTime(Long expireTime) {
-    {
         this.expireTime = expireTime;
     }
 
-    public Set<String> getPermissions()
+    public Set<String> getPermissions() {
-    {
+        System.out.println("用户权限："+permissions);
         return permissions;
     }
 
-    public void setPermissions(Set<String> permissions)
+    public void setPermissions(Set<String> permissions) {
-    {
         this.permissions = permissions;
     }
 
-    public SysUser getUser()
+    public SysUser getUser() {
-    {
         return user;
     }
 
-    public void setUser(SysUser user)
+    public void setUser(SysUser user) {
-    {
         this.user = user;
     }
 
     @Override
-    public Collection<? extends GrantedAuthority> getAuthorities()
+    public Collection<? extends GrantedAuthority> getAuthorities() {
-    {
         return null;
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/MpLoginBody.java

@@ -0,0 +1,17 @@
+package com.ruoyi.common.core.domain.model;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+
+/**
+ * 微信小程序用户登录对象
+ *
+ * @author ruoyi
+ */
+@Data
+public class MpLoginBody {
+    private String code;
+
+    private JSONObject options; //{"path":"pages/mine/help/index","query":{},"scene":1001,"referrerInfo":{}}
+
+}

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java

@@ -7,66 +7,63 @@ import com.ruoyi.common.utils.StringUtils;
  *
  * @author ruoyi
  */
-public class PageDomain
+public class PageDomain {
-{
+    /**
-    /** 当前记录起始索引 */
+     * 当前记录起始索引
+     */
     private Integer pageNum;
 
-    /** 每页显示记录数 */
+    /**
+     * 每页显示记录数
+     */
     private Integer pageSize;
 
-    /** 排序列 */
+    /**
+     * 排序列
+     */
     private String orderByColumn;
 
-    /** 排序的方向desc或者asc */
+    /**
+     * 排序的方向desc或者asc
+     */
     private String isAsc = "asc";
 
-    public String getOrderBy()
+    public String getOrderBy() {
-    {
+        if (StringUtils.isEmpty(orderByColumn)) {
-        if (StringUtils.isEmpty(orderByColumn))
-        {
             return "";
         }
         return StringUtils.toUnderScoreCase(orderByColumn) + " " + isAsc;
     }
 
-    public Integer getPageNum()
+    public Integer getPageNum() {
-    {
         return pageNum;
     }
 
-    public void setPageNum(Integer pageNum)
+    public void setPageNum(Integer pageNum) {
-    {
         this.pageNum = pageNum;
     }
 
-    public Integer getPageSize()
+    public Integer getPageSize() {
-    {
         return pageSize;
     }
 
-    public void setPageSize(Integer pageSize)
+    public void setPageSize(Integer pageSize) {
-    {
         this.pageSize = pageSize;
     }
 
-    public String getOrderByColumn()
+    public String getOrderByColumn() {
-    {
         return orderByColumn;
     }
 
-    public void setOrderByColumn(String orderByColumn)
+    public void setOrderByColumn(String orderByColumn) {
-    {
         this.orderByColumn = orderByColumn;
     }
 
-    public String getIsAsc()
+    public String getIsAsc() {
-    {
         return isAsc;
     }
 
-    public void setIsAsc(String isAsc)
+    public void setIsAsc(String isAsc) {
-    {
         this.isAsc = isAsc;
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java

@@ -8,78 +8,75 @@ import java.util.List;
  *
  * @author ruoyi
  */
-public class TableDataInfo implements Serializable
+public class TableDataInfo implements Serializable {
-{
     private static final long serialVersionUID = 1L;
 
-    /** 总记录数 */
+    /**
+     * 总记录数
+     */
     private long total;
 
-    /** 列表数据 */
+    /**
+     * 列表数据
+     */
     private List<?> rows;
 
-    /** 消息状态码 */
+    /**
+     * 消息状态码
+     */
     private int code;
 
-    /** 消息内容 */
+    /**
+     * 消息内容
+     */
     private String msg;
 
     /**
      * 表格数据对象
      */
-    public TableDataInfo()
+    public TableDataInfo() {
-    {
     }
 
     /**
      * 分页
      *
-     * @param list 列表数据
+     * @param list  列表数据
      * @param total 总记录数
      */
-    public TableDataInfo(List<?> list, int total)
+    public TableDataInfo(List<?> list, int total) {
-    {
         this.rows = list;
         this.total = total;
     }
 
-    public long getTotal()
+    public long getTotal() {
-    {
         return total;
     }
 
-    public void setTotal(long total)
+    public void setTotal(long total) {
-    {
         this.total = total;
     }
 
-    public List<?> getRows()
+    public List<?> getRows() {
-    {
         return rows;
     }
 
-    public void setRows(List<?> rows)
+    public void setRows(List<?> rows) {
-    {
         this.rows = rows;
     }
 
-    public int getCode()
+    public int getCode() {
-    {
         return code;
     }
 
-    public void setCode(int code)
+    public void setCode(int code) {
-    {
         this.code = code;
     }
 
-    public String getMsg()
+    public String getMsg() {
-    {
         return msg;
     }
 
-    public void setMsg(String msg)
+    public void setMsg(String msg) {
-    {
         this.msg = msg;
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java

@@ -7,8 +7,7 @@ import com.ruoyi.common.utils.ServletUtils;
  *
  * @author ruoyi
  */
-public class TableSupport
+public class TableSupport {
-{
     /**
      * 当前记录起始索引
      */
@@ -32,8 +31,7 @@ public class TableSupport
     /**
      * 封装分页对象
      */
-    public static PageDomain getPageDomain()
+    public static PageDomain getPageDomain() {
-    {
         PageDomain pageDomain = new PageDomain();
         pageDomain.setPageNum(ServletUtils.getParameterToInt(PAGE_NUM));
         pageDomain.setPageSize(ServletUtils.getParameterToInt(PAGE_SIZE));
@@ -42,8 +40,7 @@ public class TableSupport
         return pageDomain;
     }
 
-    public static PageDomain buildPageRequest()
+    public static PageDomain buildPageRequest() {
-    {
         return getPageDomain();
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.BoundSetOperations;
 import org.springframework.data.redis.core.HashOperations;
@@ -18,59 +19,54 @@ import org.springframework.stereotype.Component;
  *
  * @author ruoyi
  **/
-@SuppressWarnings(value = { "unchecked", "rawtypes" })
+@SuppressWarnings(value = {"unchecked", "rawtypes"})
 @Component
-public class RedisCache
+public class RedisCache {
-{
     @Autowired
     public RedisTemplate redisTemplate;
 
     /**
      * 缓存基本的对象，Integer、String、实体类等
      *
-     * @param key 缓存的键值
+     * @param key   缓存的键值
      * @param value 缓存的值
      */
-    public <T> void setCacheObject(final String key, final T value)
+    public <T> void setCacheObject(final String key, final T value) {
-    {
         redisTemplate.opsForValue().set(key, value);
     }
 
     /**
      * 缓存基本的对象，Integer、String、实体类等
      *
-     * @param key 缓存的键值
+     * @param key      缓存的键值
-     * @param value 缓存的值
+     * @param value    缓存的值
-     * @param timeout 时间
+     * @param timeout  时间
      * @param timeUnit 时间颗粒度
      */
-    public <T> void setCacheObject(final String key, final T value, final Integer timeout, final TimeUnit timeUnit)
+    public <T> void setCacheObject(final String key, final T value, final Integer timeout, final TimeUnit timeUnit) {
-    {
         redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
     }
 
     /**
      * 设置有效时间
      *
-     * @param key Redis键
+     * @param key     Redis键
      * @param timeout 超时时间
      * @return true=设置成功；false=设置失败
      */
-    public boolean expire(final String key, final long timeout)
+    public boolean expire(final String key, final long timeout) {
-    {
         return expire(key, timeout, TimeUnit.SECONDS);
     }
 
     /**
      * 设置有效时间
      *
-     * @param key Redis键
+     * @param key     Redis键
      * @param timeout 超时时间
-     * @param unit 时间单位
+     * @param unit    时间单位
      * @return true=设置成功；false=设置失败
      */
-    public boolean expire(final String key, final long timeout, final TimeUnit unit)
+    public boolean expire(final String key, final long timeout, final TimeUnit unit) {
-    {
         return redisTemplate.expire(key, timeout, unit);
     }
 
@@ -80,8 +76,7 @@ public class RedisCache
      * @param key 缓存键值
      * @return 缓存键值对应的数据
      */
-    public <T> T getCacheObject(final String key)
+    public <T> T getCacheObject(final String key) {
-    {
         ValueOperations<String, T> operation = redisTemplate.opsForValue();
         return operation.get(key);
     }
@@ -91,8 +86,7 @@ public class RedisCache
      *
      * @param key
      */
-    public boolean deleteObject(final String key)
+    public boolean deleteObject(final String key) {
-    {
         return redisTemplate.delete(key);
     }
 
@@ -102,20 +96,18 @@ public class RedisCache
      * @param collection 多个对象
      * @return
      */
-    public long deleteObject(final Collection collection)
+    public long deleteObject(final Collection collection) {
-    {
         return redisTemplate.delete(collection);
     }
 
     /**
      * 缓存List数据
      *
-     * @param key 缓存的键值
+     * @param key      缓存的键值
      * @param dataList 待缓存的List数据
      * @return 缓存的对象
      */
-    public <T> long setCacheList(final String key, final List<T> dataList)
+    public <T> long setCacheList(final String key, final List<T> dataList) {
-    {
         Long count = redisTemplate.opsForList().rightPushAll(key, dataList);
         return count == null ? 0 : count;
     }
@@ -126,24 +118,21 @@ public class RedisCache
      * @param key 缓存的键值
      * @return 缓存键值对应的数据
      */
-    public <T> List<T> getCacheList(final String key)
+    public <T> List<T> getCacheList(final String key) {
-    {
         return redisTemplate.opsForList().range(key, 0, -1);
     }
 
     /**
      * 缓存Set
      *
-     * @param key 缓存键值
+     * @param key     缓存键值
      * @param dataSet 缓存的数据
      * @return 缓存数据的对象
      */
-    public <T> BoundSetOperations<String, T> setCacheSet(final String key, final Set<T> dataSet)
+    public <T> BoundSetOperations<String, T> setCacheSet(final String key, final Set<T> dataSet) {
-    {
         BoundSetOperations<String, T> setOperation = redisTemplate.boundSetOps(key);
         Iterator<T> it = dataSet.iterator();
-        while (it.hasNext())
+        while (it.hasNext()) {
-        {
             setOperation.add(it.next());
         }
         return setOperation;
@@ -155,8 +144,7 @@ public class RedisCache
      * @param key
      * @return
      */
-    public <T> Set<T> getCacheSet(final String key)
+    public <T> Set<T> getCacheSet(final String key) {
-    {
         return redisTemplate.opsForSet().members(key);
     }
 
@@ -166,8 +154,7 @@ public class RedisCache
      * @param key
      * @param dataMap
      */
-    public <T> void setCacheMap(final String key, final Map<String, T> dataMap)
+    public <T> void setCacheMap(final String key, final Map<String, T> dataMap) {
-    {
         if (dataMap != null) {
             redisTemplate.opsForHash().putAll(key, dataMap);
         }
@@ -179,32 +166,29 @@ public class RedisCache
      * @param key
      * @return
      */
-    public <T> Map<String, T> getCacheMap(final String key)
+    public <T> Map<String, T> getCacheMap(final String key) {
-    {
         return redisTemplate.opsForHash().entries(key);
     }
 
     /**
      * 往Hash中存入数据
      *
-     * @param key Redis键
+     * @param key   Redis键
-     * @param hKey Hash键
+     * @param hKey  Hash键
      * @param value 值
      */
-    public <T> void setCacheMapValue(final String key, final String hKey, final T value)
+    public <T> void setCacheMapValue(final String key, final String hKey, final T value) {
-    {
         redisTemplate.opsForHash().put(key, hKey, value);
     }
 
     /**
      * 获取Hash中的数据
      *
-     * @param key Redis键
+     * @param key  Redis键
      * @param hKey Hash键
      * @return Hash中的对象
      */
-    public <T> T getCacheMapValue(final String key, final String hKey)
+    public <T> T getCacheMapValue(final String key, final String hKey) {
-    {
         HashOperations<String, String, T> opsForHash = redisTemplate.opsForHash();
         return opsForHash.get(key, hKey);
     }
@@ -212,12 +196,11 @@ public class RedisCache
     /**
      * 获取多个Hash中的数据
      *
-     * @param key Redis键
+     * @param key   Redis键
      * @param hKeys Hash键集合
      * @return Hash对象集合
      */
-    public <T> List<T> getMultiCacheMapValue(final String key, final Collection<Object> hKeys)
+    public <T> List<T> getMultiCacheMapValue(final String key, final Collection<Object> hKeys) {
-    {
         return redisTemplate.opsForHash().multiGet(key, hKeys);
     }
 
@@ -227,8 +210,7 @@ public class RedisCache
      * @param pattern 字符串前缀
      * @return 对象列表
      */
-    public Collection<String> keys(final String pattern)
+    public Collection<String> keys(final String pattern) {
-    {
         return redisTemplate.keys(pattern);
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java

@@ -2,6 +2,7 @@ package com.ruoyi.common.core.text;
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+
 import com.ruoyi.common.utils.StringUtils;
 
 /**
@@ -9,20 +10,31 @@ import com.ruoyi.common.utils.StringUtils;
  *
  * @author ruoyi
  */
-public class CharsetKit
+public class CharsetKit {
-{
+    /**
-    /** ISO-8859-1 */
+     * ISO-8859-1
+     */
     public static final String ISO_8859_1 = "ISO-8859-1";
-    /** UTF-8 */
+    /**
+     * UTF-8
+     */
     public static final String UTF_8 = "UTF-8";
-    /** GBK */
+    /**
+     * GBK
+     */
     public static final String GBK = "GBK";
 
-    /** ISO-8859-1 */
+    /**
+     * ISO-8859-1
+     */
     public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1);
-    /** UTF-8 */
+    /**
+     * UTF-8
+     */
     public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8);
-    /** GBK */
+    /**
+     * GBK
+     */
     public static final Charset CHARSET_GBK = Charset.forName(GBK);
 
     /**
@@ -31,46 +43,40 @@ public class CharsetKit
      * @param charset 字符集，为空则返回默认字符集
      * @return Charset
      */
-    public static Charset charset(String charset)
+    public static Charset charset(String charset) {
-    {
         return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset);
     }
 
     /**
      * 转换字符串的字符集编码
      *
-     * @param source 字符串
+     * @param source      字符串
-     * @param srcCharset 源字符集，默认ISO-8859-1
+     * @param srcCharset  源字符集，默认ISO-8859-1
      * @param destCharset 目标字符集，默认UTF-8
      * @return 转换后的字符集
      */
-    public static String convert(String source, String srcCharset, String destCharset)
+    public static String convert(String source, String srcCharset, String destCharset) {
-    {
         return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset));
     }
 
     /**
      * 转换字符串的字符集编码
      *
-     * @param source 字符串
+     * @param source      字符串
-     * @param srcCharset 源字符集，默认ISO-8859-1
+     * @param srcCharset  源字符集，默认ISO-8859-1
      * @param destCharset 目标字符集，默认UTF-8
      * @return 转换后的字符集
      */
-    public static String convert(String source, Charset srcCharset, Charset destCharset)
+    public static String convert(String source, Charset srcCharset, Charset destCharset) {
-    {
+        if (null == srcCharset) {
-        if (null == srcCharset)
-        {
             srcCharset = StandardCharsets.ISO_8859_1;
         }
 
-        if (null == destCharset)
+        if (null == destCharset) {
-        {
             destCharset = StandardCharsets.UTF_8;
         }
 
-        if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset))
+        if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset)) {
-        {
             return source;
         }
         return new String(source.getBytes(srcCharset), destCharset);
@@ -79,8 +85,7 @@ public class CharsetKit
     /**
      * @return 系统字符集编码
      */
-    public static String systemCharset()
+    public static String systemCharset() {
-    {
         return Charset.defaultCharset().name();
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java

@@ -6,6 +6,7 @@ import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.text.NumberFormat;
 import java.util.Set;
+
 import com.ruoyi.common.utils.StringUtils;
 
 /**
@@ -13,25 +14,21 @@ import com.ruoyi.common.utils.StringUtils;
  *
  * @author ruoyi
  */
-public class Convert
+public class Convert {
-{
     /**
      * 转换为字符串<br>
      * 如果给定的值为null，或者转换失败，返回默认值<br>
      * 转换失败不会报错
      *
-     * @param value 被转换的值
+     * @param value        被转换的值
      * @param defaultValue 转换错误时的默认值
      * @return 结果
      */
-    public static String toStr(Object value, String defaultValue)
+    public static String toStr(Object value, String defaultValue) {
-    {
+        if (null == value) {
-        if (null == value)
-        {
             return defaultValue;
         }
-        if (value instanceof String)
+        if (value instanceof String) {
-        {
             return (String) value;
         }
         return value.toString();
@@ -45,8 +42,7 @@ public class Convert
      * @param value 被转换的值
      * @return 结果
      */
-    public static String toStr(Object value)
+    public static String toStr(Object value) {
-    {
         return toStr(value, null);
     }
 
@@ -55,18 +51,15 @@ public class Convert
      * 如果给定的值为null，或者转换失败，返回默认值<br>
      * 转换失败不会报错
      *
-     * @param value 被转换的值
+     * @param value        被转换的值
      * @param defaultValue 转换错误时的默认值
      * @return 结果
      */
-    public static Character toChar(Object value, Character defaultValue)
+    public static Character toChar(Object value, Character defaultValue) {
-    {
+        if (null == value) {
-        if (null == value)
-        {
             return defaultValue;
         }
-        if (value instanceof Character)
+        if (value instanceof Character) {
-        {
             return (Character) value;
         }
 
@@ -82,8 +75,7 @@ public class Convert
      * @param value 被转换的值
      * @return 结果
      */
-    public static Character toChar(Object value)
+    public static Character toChar(Object value) {
-    {
         return toChar(value, null);
     }
 
@@ -92,35 +84,27 @@ public class Convert
      * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<br>
      * 转换失败不会报错
      *
-     * @param value 被转换的值
+     * @param value        被转换的值
      * @param defaultValue 转换错误时的默认值
      * @return 结果
      */
-    public static Byte toByte(Object value, Byte defaultValue)
+    public static Byte toByte(Object value, Byte defaultValue) {
-    {
+        if (value == null) {
-        if (value == null)
-        {
             return defaultValue;
         }
-        if (value instanceof Byte)
+        if (value instanceof Byte) {
-        {
             return (Byte) value;
         }
-        if (value instanceof Number)
+        if (value instanceof Number) {
-        {
             return ((Number) value).byteValue();
         }
         final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr))
+        if (StringUtils.isEmpty(valueStr)) {
-        {
             return defaultValue;
         }
-        try
+        try {
-        {
             return Byte.parseByte(valueStr);
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             return defaultValue;
         }
     }
@@ -133,8 +117,7 @@ public class Convert
      * @param value 被转换的值
      * @return 结果
      */
-    public static Byte toByte(Object value)
+    public static Byte toByte(Object value) {
-    {
         return toByte(value, null);
     }
 
@@ -143,35 +126,27 @@ public class Convert
      * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<br>
      * 转换失败不会报错
      *
-     * @param value 被转换的值
+     * @param value        被转换的值
      * @param defaultValue 转换错误时的默认值
      * @return 结果
      */
-    public static Short toShort(Object value, Short defaultValue)
+    public static Short toShort(Object value, Short defaultValue) {
-    {
+        if (value == null) {
-        if (value == null)
-        {
             return defaultValue;
         }
-        if (value instanceof Short)
+        if (value instanceof Short) {
-        {
             return (Short) value;
         }
-        if (value instanceof Number)
+        if (value instanceof Number) {
-        {
             return ((Number) value).shortValue();
         }
         final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr))
+        if (StringUtils.isEmpty(valueStr)) {
-        {
             return defaultValue;
         }
-        try
+        try {
-        {
             return Short.parseShort(valueStr.trim());
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             return defaultValue;
         }
     }
@@ -184,8 +159,7 @@ public class Convert
      * @param value 被转换的值
      * @return 结果
      */
-    public static Short toShort(Object value)
+    public static Short toShort(Object value) {
-    {
         return toShort(value, null);
     }
 
@@ -194,31 +168,24 @@ public class Convert
      * 如果给定的值为空，或者转换失败，返回默认值<br>
      * 转换失败不会报错
      *
-     * @param value 被转换的值
+     * @param value        被转换的值
      * @param defaultValue 转换错误时的默认值
      * @return 结果
      */
-    public static Number toNumber(Object value, Number defaultValue)
+    public static Number toNumber(Object value, Number defaultValue) {
-    {
+        if (value == null) {
-        if (value == null)
-        {
             return defaultValue;
         }
-        if (value instanceof Number)
+        if (value instanceof Number) {
-        {
             return (Number) value;
         }
         final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr))
+        if (StringUtils.isEmpty(valueStr)) {
-        {
             return defaultValue;
         }
-        try
+        try {
-        {
             return NumberFormat.getInstance().parse(valueStr);
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             return defaultValue;
         }
     }
@@ -231,8 +198,7 @@ public class Convert
      * @param value 被转换的值
      * @return 结果
      */
-    public static Number toNumber(Object value)
+    public static Number toNumber(Object value) {
-    {
         return toNumber(value, null);
     }
 
@@ -241,35 +207,27 @@ public class Convert
      * 如果给定的值为空，或者转换失败，返回默认值<br>
      * 转换失败不会报错
      *
-     * @param value 被转换的值
+     * @param value        被转换的值
      * @param defaultValue 转换错误时的默认值
      * @return 结果
      */
-    public static Integer toInt(Object value, Integer defaultValue)
+    public static Integer toInt(Object value, Integer defaultValue) {
-    {
+        if (value == null) {
-        if (value == null)
-        {
             return defaultValue;
         }
-        if (value instanceof Integer)
+        if (value instanceof Integer) {
-        {
             return (Integer) value;
         }
-        if (value instanceof Number)
+        if (value instanceof Number) {
-        {
             return ((Number) value).intValue();
         }
         final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr))
+        if (StringUtils.isEmpty(valueStr)) {
-        {
             return defaultValue;
         }
-        try
+        try {
-        {
             return Integer.parseInt(valueStr.trim());
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             return defaultValue;
         }
     }
@@ -282,8 +240,7 @@ public class Convert
      * @param value 被转换的值
      * @return 结果
      */
-    public static Integer toInt(Object value)
+    public static Integer toInt(Object value) {
-    {
         return toInt(value, null);
     }
 
@@ -293,8 +250,7 @@ public class Convert
      * @param str 被转换的值
      * @return 结果
      */
-    public static Integer[] toIntArray(String str)
+    public static Integer[] toIntArray(String str) {
-    {
         return toIntArray(",", str);
     }
 
@@ -304,8 +260,7 @@ public class Convert
      * @param str 被转换的值
      * @return 结果
      */
-    public static Long[] toLongArray(String str)
+    public static Long[] toLongArray(String str) {
-    {
         return toLongArray(",", str);
     }
 
@@ -316,16 +271,13 @@ public class Convert
      * @param split 被转换的值
      * @return 结果
      */
-    public static Integer[] toIntArray(String split, String str)
+    public static Integer[] toIntArray(String split, String str) {
-    {
+        if (StringUtils.isEmpty(str)) {
-        if (StringUtils.isEmpty(str))
+            return new Integer[]{};
-        {
-            return new Integer[] {};
         }
         String[] arr = str.split(split);
         final Integer[] ints = new Integer[arr.length];
-        for (int i = 0; i < arr.length; i++)
+        for (int i = 0; i < arr.length; i++) {
-        {
             final Integer v = toInt(arr[i], 0);
             ints[i] = v;
         }
@@ -336,19 +288,16 @@ public class Convert
      * 转换为Long数组<br>
      *
      * @param split 分隔符
-     * @param str 被转换的值
+     * @param str   被转换的值
      * @return 结果
      */
-    public static Long[] toLongArray(String split, String str)
+    public static Long[] toLongArray(String split, String str) {
-    {
+        if (StringUtils.isEmpty(str)) {
-        if (StringUtils.isEmpty(str))
+            return new Long[]{};
-        {
-            return new Long[] {};
         }
         String[] arr = str.split(split);
         final Long[] longs = new Long[arr.length];
-        for (int i = 0; i < arr.length; i++)
+        for (int i = 0; i < arr.length; i++) {
-        {
             final Long v = toLong(arr[i], null);
             longs[i] = v;
         }
@@ -361,8 +310,7 @@ public class Convert
      * @param str 被转换的值
      * @return 结果
      */
-    public static String[] toStrArray(String str)
+    public static String[] toStrArray(String str) {
-    {
         return toStrArray(",", str);
     }
 
@@ -373,8 +321,7 @@ public class Convert
      * @param split 被转换的值
      * @return 结果
      */
-    public static String[] toStrArray(String split, String str)
+    public static String[] toStrArray(String split, String str) {
-    {
         return str.split(split);
     }
 
@@ -383,36 +330,28 @@ public class Convert
      * 如果给定的值为空，或者转换失败，返回默认值<br>
      * 转换失败不会报错
      *
-     * @param value 被转换的值
+     * @param value        被转换的值
      * @param defaultValue 转换错误时的默认值
      * @return 结果
      */
-    public static Long toLong(Object value, Long defaultValue)
+    public static Long toLong(Object value, Long defaultValue) {
-    {
+        if (value == null) {
-        if (value == null)
-        {
             return defaultValue;
         }
-        if (value instanceof Long)
+        if (value instanceof Long) {
-        {
             return (Long) value;
         }
-        if (value instanceof Number)
+        if (value instanceof Number) {
-        {
             return ((Number) value).longValue();
         }
         final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr))
+        if (StringUtils.isEmpty(valueStr)) {
-        {
             return defaultValue;
         }
-        try
+        try {
-        {
             // 支持科学计数法
             return new BigDecimal(valueStr.trim()).longValue();
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             return defaultValue;
         }
     }
@@ -425,8 +364,7 @@ public class Convert
      * @param value 被转换的值
      * @return 结果
      */
-    public static Long toLong(Object value)
+    public static Long toLong(Object value) {
-    {
         return toLong(value, null);
     }
 
@@ -435,36 +373,28 @@ public class Convert
      * 如果给定的值为空，或者转换失败，返回默认值<br>
      * 转换失败不会报错
      *
-     * @param value 被转换的值
+     * @param value        被转换的值
      * @param defaultValue 转换错误时的默认值
      * @return 结果
      */
-    public static Double toDouble(Object value, Double defaultValue)
+    public static Double toDouble(Object value, Double defaultValue) {
-    {
+        if (value == null) {
-        if (value == null)
-        {
             return defaultValue;
         }
-        if (value instanceof Double)
+        if (value instanceof Double) {
-        {
             return (Double) value;
         }
-        if (value instanceof Number)
+        if (value instanceof Number) {
-        {
             return ((Number) value).doubleValue();
         }
         final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr))
+        if (StringUtils.isEmpty(valueStr)) {
-        {
             return defaultValue;
         }
-        try
+        try {
-        {
             // 支持科学计数法
             return new BigDecimal(valueStr.trim()).doubleValue();
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             return defaultValue;
         }
     }
@@ -477,8 +407,7 @@ public class Convert
      * @param value 被转换的值
      * @return 结果
      */
-    public static Double toDouble(Object value)
+    public static Double toDouble(Object value) {
-    {
         return toDouble(value, null);
     }
 
@@ -487,35 +416,27 @@ public class Convert
      * 如果给定的值为空，或者转换失败，返回默认值<br>
      * 转换失败不会报错
      *
-     * @param value 被转换的值
+     * @param value        被转换的值
      * @param defaultValue 转换错误时的默认值
      * @return 结果
      */
-    public static Float toFloat(Object value, Float defaultValue)
+    public static Float toFloat(Object value, Float defaultValue) {
-    {
+        if (value == null) {
-        if (value == null)
-        {
             return defaultValue;
         }
-        if (value instanceof Float)
+        if (value instanceof Float) {
-        {
             return (Float) value;
         }
-        if (value instanceof Number)
+        if (value instanceof Number) {
-        {
             return ((Number) value).floatValue();
         }
         final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr))
+        if (StringUtils.isEmpty(valueStr)) {
-        {
             return defaultValue;
         }
-        try
+        try {
-        {
             return Float.parseFloat(valueStr.trim());
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             return defaultValue;
         }
     }
@@ -528,8 +449,7 @@ public class Convert
      * @param value 被转换的值
      * @return 结果
      */
-    public static Float toFloat(Object value)
+    public static Float toFloat(Object value) {
-    {
         return toFloat(value, null);
     }
 
@@ -538,28 +458,23 @@ public class Convert
      * String支持的值为：true、false、yes、ok、no，1,0 如果给定的值为空，或者转换失败，返回默认值<br>
      * 转换失败不会报错
      *
-     * @param value 被转换的值
+     * @param value        被转换的值
      * @param defaultValue 转换错误时的默认值
      * @return 结果
      */
-    public static Boolean toBool(Object value, Boolean defaultValue)
+    public static Boolean toBool(Object value, Boolean defaultValue) {
-    {
+        if (value == null) {
-        if (value == null)
-        {
             return defaultValue;
         }
-        if (value instanceof Boolean)
+        if (value instanceof Boolean) {
-        {
             return (Boolean) value;
         }
         String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr))
+        if (StringUtils.isEmpty(valueStr)) {
-        {
             return defaultValue;
         }
         valueStr = valueStr.trim().toLowerCase();
-        switch (valueStr)
+        switch (valueStr) {
-        {
             case "true":
                 return true;
             case "false":
@@ -587,8 +502,7 @@ public class Convert
      * @param value 被转换的值
      * @return 结果
      */
-    public static Boolean toBool(Object value)
+    public static Boolean toBool(Object value) {
-    {
         return toBool(value, null);
     }
 
@@ -596,34 +510,27 @@ public class Convert
      * 转换为Enum对象<br>
      * 如果给定的值为空，或者转换失败，返回默认值<br>
      *
-     * @param clazz Enum的Class
+     * @param clazz        Enum的Class
-     * @param value 值
+     * @param value        值
      * @param defaultValue 默认值
      * @return Enum
      */
-    public static <E extends Enum<E>> E toEnum(Class<E> clazz, Object value, E defaultValue)
+    public static <E extends Enum<E>> E toEnum(Class<E> clazz, Object value, E defaultValue) {
-    {
+        if (value == null) {
-        if (value == null)
-        {
             return defaultValue;
         }
-        if (clazz.isAssignableFrom(value.getClass()))
+        if (clazz.isAssignableFrom(value.getClass())) {
-        {
             @SuppressWarnings("unchecked")
             E myE = (E) value;
             return myE;
         }
         final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr))
+        if (StringUtils.isEmpty(valueStr)) {
-        {
             return defaultValue;
         }
-        try
+        try {
-        {
             return Enum.valueOf(clazz, valueStr);
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             return defaultValue;
         }
     }
@@ -636,8 +543,7 @@ public class Convert
      * @param value 值
      * @return Enum
      */
-    public static <E extends Enum<E>> E toEnum(Class<E> clazz, Object value)
+    public static <E extends Enum<E>> E toEnum(Class<E> clazz, Object value) {
-    {
         return toEnum(clazz, value, null);
     }
 
@@ -646,35 +552,27 @@ public class Convert
      * 如果给定的值为空，或者转换失败，返回默认值<br>
      * 转换失败不会报错
      *
-     * @param value 被转换的值
+     * @param value        被转换的值
      * @param defaultValue 转换错误时的默认值
      * @return 结果
      */
-    public static BigInteger toBigInteger(Object value, BigInteger defaultValue)
+    public static BigInteger toBigInteger(Object value, BigInteger defaultValue) {
-    {
+        if (value == null) {
-        if (value == null)
-        {
             return defaultValue;
         }
-        if (value instanceof BigInteger)
+        if (value instanceof BigInteger) {
-        {
             return (BigInteger) value;
         }
-        if (value instanceof Long)
+        if (value instanceof Long) {
-        {
             return BigInteger.valueOf((Long) value);
         }
         final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr))
+        if (StringUtils.isEmpty(valueStr)) {
-        {
             return defaultValue;
         }
-        try
+        try {
-        {
             return new BigInteger(valueStr);
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             return defaultValue;
         }
     }
@@ -687,8 +585,7 @@ public class Convert
      * @param value 被转换的值
      * @return 结果
      */
-    public static BigInteger toBigInteger(Object value)
+    public static BigInteger toBigInteger(Object value) {
-    {
         return toBigInteger(value, null);
     }
 
@@ -697,43 +594,33 @@ public class Convert
      * 如果给定的值为空，或者转换失败，返回默认值<br>
      * 转换失败不会报错
      *
-     * @param value 被转换的值
+     * @param value        被转换的值
      * @param defaultValue 转换错误时的默认值
      * @return 结果
      */
-    public static BigDecimal toBigDecimal(Object value, BigDecimal defaultValue)
+    public static BigDecimal toBigDecimal(Object value, BigDecimal defaultValue) {
-    {
+        if (value == null) {
-        if (value == null)
-        {
             return defaultValue;
         }
-        if (value instanceof BigDecimal)
+        if (value instanceof BigDecimal) {
-        {
             return (BigDecimal) value;
         }
-        if (value instanceof Long)
+        if (value instanceof Long) {
-        {
             return new BigDecimal((Long) value);
         }
-        if (value instanceof Double)
+        if (value instanceof Double) {
-        {
             return new BigDecimal((Double) value);
         }
-        if (value instanceof Integer)
+        if (value instanceof Integer) {
-        {
             return new BigDecimal((Integer) value);
         }
         final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr))
+        if (StringUtils.isEmpty(valueStr)) {
-        {
             return defaultValue;
         }
-        try
+        try {
-        {
             return new BigDecimal(valueStr);
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             return defaultValue;
         }
     }
@@ -746,8 +633,7 @@ public class Convert
      * @param value 被转换的值
      * @return 结果
      */
-    public static BigDecimal toBigDecimal(Object value)
+    public static BigDecimal toBigDecimal(Object value) {
-    {
         return toBigDecimal(value, null);
     }
 
@@ -758,8 +644,7 @@ public class Convert
      * @param obj 对象
      * @return 字符串
      */
-    public static String utf8Str(Object obj)
+    public static String utf8Str(Object obj) {
-    {
         return str(obj, CharsetKit.CHARSET_UTF_8);
     }
 
@@ -767,12 +652,11 @@ public class Convert
      * 将对象转为字符串<br>
      * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
      *
-     * @param obj 对象
+     * @param obj         对象
      * @param charsetName 字符集
      * @return 字符串
      */
-    public static String str(Object obj, String charsetName)
+    public static String str(Object obj, String charsetName) {
-    {
         return str(obj, Charset.forName(charsetName));
     }
 
@@ -780,27 +664,20 @@ public class Convert
      * 将对象转为字符串<br>
      * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
      *
-     * @param obj 对象
+     * @param obj     对象
      * @param charset 字符集
      * @return 字符串
      */
-    public static String str(Object obj, Charset charset)
+    public static String str(Object obj, Charset charset) {
-    {
+        if (null == obj) {
-        if (null == obj)
-        {
             return null;
         }
 
-        if (obj instanceof String)
+        if (obj instanceof String) {
-        {
             return (String) obj;
-        }
+        } else if (obj instanceof byte[] || obj instanceof Byte[]) {
-        else if (obj instanceof byte[] || obj instanceof Byte[])
-        {
             return str((Byte[]) obj, charset);
-        }
+        } else if (obj instanceof ByteBuffer) {
-        else if (obj instanceof ByteBuffer)
-        {
             return str((ByteBuffer) obj, charset);
         }
         return obj.toString();
@@ -809,31 +686,27 @@ public class Convert
     /**
      * 将byte数组转为字符串
      *
-     * @param bytes byte数组
+     * @param bytes   byte数组
      * @param charset 字符集
      * @return 字符串
      */
-    public static String str(byte[] bytes, String charset)
+    public static String str(byte[] bytes, String charset) {
-    {
         return str(bytes, StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset));
     }
 
     /**
      * 解码字节码
      *
-     * @param data 字符串
+     * @param data    字符串
      * @param charset 字符集，如果此字段为空，则解码的结果取决于平台
      * @return 解码后的字符串
      */
-    public static String str(byte[] data, Charset charset)
+    public static String str(byte[] data, Charset charset) {
-    {
+        if (data == null) {
-        if (data == null)
-        {
             return null;
         }
 
-        if (null == charset)
+        if (null == charset) {
-        {
             return new String(data);
         }
         return new String(data, charset);
@@ -842,14 +715,12 @@ public class Convert
     /**
      * 将编码的byteBuffer数据转换为字符串
      *
-     * @param data 数据
+     * @param data    数据
      * @param charset 字符集，如果为空使用当前系统字符集
      * @return 字符串
      */
-    public static String str(ByteBuffer data, String charset)
+    public static String str(ByteBuffer data, String charset) {
-    {
+        if (data == null) {
-        if (data == null)
-        {
             return null;
         }
 
@@ -859,55 +730,47 @@ public class Convert
     /**
      * 将编码的byteBuffer数据转换为字符串
      *
-     * @param data 数据
+     * @param data    数据
      * @param charset 字符集，如果为空使用当前系统字符集
      * @return 字符串
      */
-    public static String str(ByteBuffer data, Charset charset)
+    public static String str(ByteBuffer data, Charset charset) {
-    {
+        if (null == charset) {
-        if (null == charset)
-        {
             charset = Charset.defaultCharset();
         }
         return charset.decode(data).toString();
     }
 
     // ----------------------------------------------------------------------- 全角半角转换
+
     /**
      * 半角转全角
      *
      * @param input String.
      * @return 全角字符串.
      */
-    public static String toSBC(String input)
+    public static String toSBC(String input) {
-    {
         return toSBC(input, null);
     }
 
     /**
      * 半角转全角
      *
-     * @param input String
+     * @param input         String
      * @param notConvertSet 不替换的字符集合
      * @return 全角字符串.
      */
-    public static String toSBC(String input, Set<Character> notConvertSet)
+    public static String toSBC(String input, Set<Character> notConvertSet) {
-    {
         char c[] = input.toCharArray();
-        for (int i = 0; i < c.length; i++)
+        for (int i = 0; i < c.length; i++) {
-        {
+            if (null != notConvertSet && notConvertSet.contains(c[i])) {
-            if (null != notConvertSet && notConvertSet.contains(c[i]))
-            {
                 // 跳过不替换的字符
                 continue;
             }
 
-            if (c[i] == ' ')
+            if (c[i] == ' ') {
-            {
                 c[i] = '\u3000';
-            }
+            } else if (c[i] < '\177') {
-            else if (c[i] < '\177')
-            {
                 c[i] = (char) (c[i] + 65248);
 
             }
@@ -921,35 +784,28 @@ public class Convert
      * @param input String.
      * @return 半角字符串
      */
-    public static String toDBC(String input)
+    public static String toDBC(String input) {
-    {
         return toDBC(input, null);
     }
 
     /**
      * 替换全角为半角
      *
-     * @param text 文本
+     * @param text          文本
      * @param notConvertSet 不替换的字符集合
      * @return 替换后的字符
      */
-    public static String toDBC(String text, Set<Character> notConvertSet)
+    public static String toDBC(String text, Set<Character> notConvertSet) {
-    {
         char c[] = text.toCharArray();
-        for (int i = 0; i < c.length; i++)
+        for (int i = 0; i < c.length; i++) {
-        {
+            if (null != notConvertSet && notConvertSet.contains(c[i])) {
-            if (null != notConvertSet && notConvertSet.contains(c[i]))
-            {
                 // 跳过不替换的字符
                 continue;
             }
 
-            if (c[i] == '\u3000')
+            if (c[i] == '\u3000') {
-            {
                 c[i] = ' ';
-            }
+            } else if (c[i] > '\uFF00' && c[i] < '\uFF5F') {
-            else if (c[i] > '\uFF00' && c[i] < '\uFF5F')
-            {
                 c[i] = (char) (c[i] - 65248);
             }
         }
@@ -964,31 +820,26 @@ public class Convert
      * @param n 数字
      * @return 中文大写数字
      */
-    public static String digitUppercase(double n)
+    public static String digitUppercase(double n) {
-    {
+        String[] fraction = {"角", "分"};
-        String[] fraction = { "角", "分" };
+        String[] digit = {"零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖"};
-        String[] digit = { "零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖" };
+        String[][] unit = {{"元", "万", "亿"}, {"", "拾", "佰", "仟"}};
-        String[][] unit = { { "元", "万", "亿" }, { "", "拾", "佰", "仟" } };
 
         String head = n < 0 ? "负" : "";
         n = Math.abs(n);
 
         String s = "";
-        for (int i = 0; i < fraction.length; i++)
+        for (int i = 0; i < fraction.length; i++) {
-        {
             s += (digit[(int) (Math.floor(n * 10 * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", "");
         }
-        if (s.length() < 1)
+        if (s.length() < 1) {
-        {
             s = "整";
         }
         int integerPart = (int) Math.floor(n);
 
-        for (int i = 0; i < unit[0].length && integerPart > 0; i++)
+        for (int i = 0; i < unit[0].length && integerPart > 0; i++) {
-        {
             String p = "";
-            for (int j = 0; j < unit[1].length && n > 0; j++)
+            for (int j = 0; j < unit[1].length && n > 0; j++) {
-            {
                 p = digit[integerPart % 10] + unit[1][j] + p;
                 integerPart = integerPart / 10;
             }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java

@@ -7,8 +7,7 @@ import com.ruoyi.common.utils.StringUtils;
  *
  * @author ruoyi
  */
-public class StrFormatter
+public class StrFormatter {
-{
     public static final String EMPTY_JSON = "{}";
     public static final char C_BACKSLASH = '\\';
     public static final char C_DELIM_START = '{';
@@ -24,13 +23,11 @@ public class StrFormatter
      * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
      *
      * @param strPattern 字符串模板
-     * @param argArray 参数列表
+     * @param argArray   参数列表
      * @return 结果
      */
-    public static String format(final String strPattern, final Object... argArray)
+    public static String format(final String strPattern, final Object... argArray) {
-    {
+        if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray)) {
-        if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray))
-        {
             return strPattern;
         }
         final int strPatternLength = strPattern.length();
@@ -40,43 +37,30 @@ public class StrFormatter
 
         int handledPosition = 0;
         int delimIndex;// 占位符所在位置
-        for (int argIndex = 0; argIndex < argArray.length; argIndex++)
+        for (int argIndex = 0; argIndex < argArray.length; argIndex++) {
-        {
             delimIndex = strPattern.indexOf(EMPTY_JSON, handledPosition);
-            if (delimIndex == -1)
+            if (delimIndex == -1) {
-            {
+                if (handledPosition == 0) {
-                if (handledPosition == 0)
-                {
                     return strPattern;
-                }
+                } else { // 字符串模板剩余部分不再包含占位符，加入剩余部分后返回结果
-                else
-                { // 字符串模板剩余部分不再包含占位符，加入剩余部分后返回结果
                     sbuf.append(strPattern, handledPosition, strPatternLength);
                     return sbuf.toString();
                 }
-            }
+            } else {
-            else
+                if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH) {
-            {
+                    if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH) {
-                if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH)
-                {
-                    if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH)
-                    {
                         // 转义符之前还有一个转义符，占位符依旧有效
                         sbuf.append(strPattern, handledPosition, delimIndex - 1);
                         sbuf.append(Convert.utf8Str(argArray[argIndex]));
                         handledPosition = delimIndex + 2;
-                    }
+                    } else {
-                    else
-                    {
                         // 占位符被转义
                         argIndex--;
                         sbuf.append(strPattern, handledPosition, delimIndex - 1);
                         sbuf.append(C_DELIM_START);
                         handledPosition = delimIndex + 1;
                     }
-                }
+                } else {
-                else
-                {
                     // 正常占位符
                     sbuf.append(strPattern, handledPosition, delimIndex);
                     sbuf.append(Convert.utf8Str(argArray[argIndex]));

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java

@@ -4,10 +4,8 @@ package com.ruoyi.common.enums;
  * 操作状态
  *
  * @author ruoyi
- *
  */
-public enum BusinessStatus
+public enum BusinessStatus {
-{
     /**
      * 成功
      */

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java

@@ -5,8 +5,7 @@ package com.ruoyi.common.enums;
  *
  * @author ruoyi
  */
-public enum BusinessType
+public enum BusinessType {
-{
     /**
      * 其它
      */

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java

@@ -5,8 +5,7 @@ package com.ruoyi.common.enums;
  *
  * @author ruoyi
  */
-public enum DataSourceType
+public enum DataSourceType {
-{
     /**
      * 主库
      */

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java

@@ -2,6 +2,7 @@ package com.ruoyi.common.enums;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import org.springframework.lang.Nullable;
 
 /**
@@ -9,28 +10,23 @@ import org.springframework.lang.Nullable;
  *
  * @author ruoyi
  */
-public enum HttpMethod
+public enum HttpMethod {
-{
     GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS, TRACE;
 
     private static final Map<String, HttpMethod> mappings = new HashMap<>(16);
 
-    static
+    static {
-    {
+        for (HttpMethod httpMethod : values()) {
-        for (HttpMethod httpMethod : values())
-        {
             mappings.put(httpMethod.name(), httpMethod);
         }
     }
 
     @Nullable
-    public static HttpMethod resolve(@Nullable String method)
+    public static HttpMethod resolve(@Nullable String method) {
-    {
         return (method != null ? mappings.get(method) : null);
     }
 
-    public boolean matches(String method)
+    public boolean matches(String method) {
-    {
         return (this == resolve(method));
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java

@@ -5,8 +5,7 @@ package com.ruoyi.common.enums;
  *
  * @author ruoyi
  */
-public enum OperatorType
+public enum OperatorType {
-{
     /**
      * 其它
      */

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java

@@ -5,26 +5,22 @@ package com.ruoyi.common.enums;
  *
  * @author ruoyi
  */
-public enum UserStatus
+public enum UserStatus {
-{
     OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除");
 
     private final String code;
     private final String info;
 
-    UserStatus(String code, String info)
+    UserStatus(String code, String info) {
-    {
         this.code = code;
         this.info = info;
     }
 
-    public String getCode()
+    public String getCode() {
-    {
         return code;
     }
 
-    public String getInfo()
+    public String getInfo() {
-    {
         return info;
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/exception/BaseException.java

@@ -8,8 +8,7 @@ import com.ruoyi.common.utils.StringUtils;
  *
  * @author ruoyi
  */
-public class BaseException extends RuntimeException
+public class BaseException extends RuntimeException {
-{
     private static final long serialVersionUID = 1L;
 
     /**
@@ -32,66 +31,54 @@ public class BaseException extends RuntimeException
      */
     private String defaultMessage;
 
-    public BaseException(String module, String code, Object[] args, String defaultMessage)
+    public BaseException(String module, String code, Object[] args, String defaultMessage) {
-    {
         this.module = module;
         this.code = code;
         this.args = args;
         this.defaultMessage = defaultMessage;
     }
 
-    public BaseException(String module, String code, Object[] args)
+    public BaseException(String module, String code, Object[] args) {
-    {
         this(module, code, args, null);
     }
 
-    public BaseException(String module, String defaultMessage)
+    public BaseException(String module, String defaultMessage) {
-    {
         this(module, null, null, defaultMessage);
     }
 
-    public BaseException(String code, Object[] args)
+    public BaseException(String code, Object[] args) {
-    {
         this(null, code, args, null);
     }
 
-    public BaseException(String defaultMessage)
+    public BaseException(String defaultMessage) {
-    {
         this(null, null, null, defaultMessage);
     }
 
     @Override
-    public String getMessage()
+    public String getMessage() {
-    {
         String message = null;
-        if (!StringUtils.isEmpty(code))
+        if (!StringUtils.isEmpty(code)) {
-        {
             message = MessageUtils.message(code, args);
         }
-        if (message == null)
+        if (message == null) {
-        {
             message = defaultMessage;
         }
         return message;
     }
 
-    public String getModule()
+    public String getModule() {
-    {
         return module;
     }
 
-    public String getCode()
+    public String getCode() {
-    {
         return code;
     }
 
-    public Object[] getArgs()
+    public Object[] getArgs() {
-    {
         return args;
     }
 
-    public String getDefaultMessage()
+    public String getDefaultMessage() {
-    {
         return defaultMessage;
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java

@@ -5,39 +5,33 @@ package com.ruoyi.common.exception;
  *
  * @author ruoyi
  */
-public class CustomException extends RuntimeException
+public class CustomException extends RuntimeException {
-{
     private static final long serialVersionUID = 1L;
 
     private Integer code;
 
     private String message;
 
-    public CustomException(String message)
+    public CustomException(String message) {
-    {
         this.message = message;
     }
 
-    public CustomException(String message, Integer code)
+    public CustomException(String message, Integer code) {
-    {
         this.message = message;
         this.code = code;
     }
 
-    public CustomException(String message, Throwable e)
+    public CustomException(String message, Throwable e) {
-    {
         super(message, e);
         this.message = message;
     }
 
     @Override
-    public String getMessage()
+    public String getMessage() {
-    {
         return message;
     }
 
-    public Integer getCode()
+    public Integer getCode() {
-    {
         return code;
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java

@@ -5,11 +5,9 @@ package com.ruoyi.common.exception;
  *
  * @author ruoyi
  */
-public class DemoModeException extends RuntimeException
+public class DemoModeException extends RuntimeException {
-{
     private static final long serialVersionUID = 1L;
 
-    public DemoModeException()
+    public DemoModeException() {
-    {
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java

@@ -5,22 +5,18 @@ package com.ruoyi.common.exception;
  *
  * @author ruoyi
  */
-public class UtilException extends RuntimeException
+public class UtilException extends RuntimeException {
-{
     private static final long serialVersionUID = 8247610319171014183L;
 
-    public UtilException(Throwable e)
+    public UtilException(Throwable e) {
-    {
         super(e.getMessage(), e);
     }
 
-    public UtilException(String message)
+    public UtilException(String message) {
-    {
         super(message);
     }
 
-    public UtilException(String message, Throwable throwable)
+    public UtilException(String message, Throwable throwable) {
-    {
         super(message, throwable);
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java

@@ -7,12 +7,10 @@ import com.ruoyi.common.exception.BaseException;
  *
  * @author ruoyi
  */
-public class FileException extends BaseException
+public class FileException extends BaseException {
-{
     private static final long serialVersionUID = 1L;
 
-    public FileException(String code, Object[] args)
+    public FileException(String code, Object[] args) {
-    {
         super("file", code, args, null);
     }
 

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java

@@ -5,12 +5,10 @@ package com.ruoyi.common.exception.file;
  *
  * @author ruoyi
  */
-public class FileNameLengthLimitExceededException extends FileException
+public class FileNameLengthLimitExceededException extends FileException {
-{
     private static final long serialVersionUID = 1L;
 
-    public FileNameLengthLimitExceededException(int defaultFileNameLength)
+    public FileNameLengthLimitExceededException(int defaultFileNameLength) {
-    {
+        super("upload.filename.exceed.length", new Object[]{defaultFileNameLength});
-        super("upload.filename.exceed.length", new Object[] { defaultFileNameLength });
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java

@@ -5,12 +5,10 @@ package com.ruoyi.common.exception.file;
  *
  * @author ruoyi
  */
-public class FileSizeLimitExceededException extends FileException
+public class FileSizeLimitExceededException extends FileException {
-{
     private static final long serialVersionUID = 1L;
 
-    public FileSizeLimitExceededException(long defaultMaxSize)
+    public FileSizeLimitExceededException(long defaultMaxSize) {
-    {
+        super("upload.exceed.maxSize", new Object[]{defaultMaxSize});
-        super("upload.exceed.maxSize", new Object[] { defaultMaxSize });
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java

@@ -1,6 +1,7 @@
 package com.ruoyi.common.exception.file;
 
 import java.util.Arrays;
+
 import org.apache.commons.fileupload.FileUploadException;
 
 /**
@@ -8,63 +9,52 @@ import org.apache.commons.fileupload.FileUploadException;
  *
  * @author ruoyi
  */
-public class InvalidExtensionException extends FileUploadException
+public class InvalidExtensionException extends FileUploadException {
-{
     private static final long serialVersionUID = 1L;
 
     private String[] allowedExtension;
     private String extension;
     private String filename;
 
-    public InvalidExtensionException(String[] allowedExtension, String extension, String filename)
+    public InvalidExtensionException(String[] allowedExtension, String extension, String filename) {
-    {
         super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]");
         this.allowedExtension = allowedExtension;
         this.extension = extension;
         this.filename = filename;
     }
 
-    public String[] getAllowedExtension()
+    public String[] getAllowedExtension() {
-    {
         return allowedExtension;
     }
 
-    public String getExtension()
+    public String getExtension() {
-    {
         return extension;
     }
 
-    public String getFilename()
+    public String getFilename() {
-    {
         return filename;
     }
 
-    public static class InvalidImageExtensionException extends InvalidExtensionException
+    public static class InvalidImageExtensionException extends InvalidExtensionException {
-    {
         private static final long serialVersionUID = 1L;
 
-        public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename)
+        public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename) {
-        {
             super(allowedExtension, extension, filename);
         }
     }
 
-    public static class InvalidFlashExtensionException extends InvalidExtensionException
+    public static class InvalidFlashExtensionException extends InvalidExtensionException {
-    {
         private static final long serialVersionUID = 1L;
 
-        public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename)
+        public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename) {
-        {
             super(allowedExtension, extension, filename);
         }
     }
 
-    public static class InvalidMediaExtensionException extends InvalidExtensionException
+    public static class InvalidMediaExtensionException extends InvalidExtensionException {
-    {
         private static final long serialVersionUID = 1L;
 
-        public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename)
+        public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename) {
-        {
             super(allowedExtension, extension, filename);
         }
     }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java

@@ -5,30 +5,25 @@ package com.ruoyi.common.exception.job;
  *
  * @author ruoyi
  */
-public class TaskException extends Exception
+public class TaskException extends Exception {
-{
     private static final long serialVersionUID = 1L;
 
     private Code code;
 
-    public TaskException(String msg, Code code)
+    public TaskException(String msg, Code code) {
-    {
         this(msg, code, null);
     }
 
-    public TaskException(String msg, Code code, Exception nestedEx)
+    public TaskException(String msg, Code code, Exception nestedEx) {
-    {
         super(msg, nestedEx);
         this.code = code;
     }
 
-    public Code getCode()
+    public Code getCode() {
-    {
         return code;
     }
 
-    public enum Code
+    public enum Code {
-    {
         TASK_EXISTS, NO_TASK_EXISTS, TASK_ALREADY_STARTED, UNKNOWN, CONFIG_ERROR, TASK_NODE_NOT_AVAILABLE
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java

@@ -5,12 +5,10 @@ package com.ruoyi.common.exception.user;
  *
  * @author ruoyi
  */
-public class CaptchaException extends UserException
+public class CaptchaException extends UserException {
-{
     private static final long serialVersionUID = 1L;
 
-    public CaptchaException()
+    public CaptchaException() {
-    {
         super("user.jcaptcha.error", null);
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java

@@ -5,12 +5,10 @@ package com.ruoyi.common.exception.user;
  *
  * @author ruoyi
  */
-public class CaptchaExpireException extends UserException
+public class CaptchaExpireException extends UserException {
-{
     private static final long serialVersionUID = 1L;
 
-    public CaptchaExpireException()
+    public CaptchaExpireException() {
-    {
         super("user.jcaptcha.expire", null);
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java

@@ -7,12 +7,10 @@ import com.ruoyi.common.exception.BaseException;
  *
  * @author ruoyi
  */
-public class UserException extends BaseException
+public class UserException extends BaseException {
-{
     private static final long serialVersionUID = 1L;
 
-    public UserException(String code, Object[] args)
+    public UserException(String code, Object[] args) {
-    {
         super("user", code, args, null);
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java

@@ -5,12 +5,10 @@ package com.ruoyi.common.exception.user;
  *
  * @author ruoyi
  */
-public class UserPasswordNotMatchException extends UserException
+public class UserPasswordNotMatchException extends UserException {
-{
     private static final long serialVersionUID = 1L;
 
-    public UserPasswordNotMatchException()
+    public UserPasswordNotMatchException() {
-    {
         super("user.password.not.match", null);
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java

@@ -8,6 +8,7 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.http.MediaType;
 import com.ruoyi.common.utils.StringUtils;
 
@@ -16,37 +17,29 @@ import com.ruoyi.common.utils.StringUtils;
  *
  * @author ruoyi
  */
-public class RepeatableFilter implements Filter
+public class RepeatableFilter implements Filter {
-{
     @Override
-    public void init(FilterConfig filterConfig) throws ServletException
+    public void init(FilterConfig filterConfig) throws ServletException {
-    {
 
     }
 
     @Override
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-            throws IOException, ServletException
+            throws IOException, ServletException {
-    {
         ServletRequest requestWrapper = null;
         if (request instanceof HttpServletRequest
-                && StringUtils.equalsAnyIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE))
+                && StringUtils.equalsAnyIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE)) {
-        {
             requestWrapper = new RepeatedlyRequestWrapper((HttpServletRequest) request, response);
         }
-        if (null == requestWrapper)
+        if (null == requestWrapper) {
-        {
             chain.doFilter(request, response);
-        }
+        } else {
-        else
-        {
             chain.doFilter(requestWrapper, response);
         }
     }
 
     @Override
-    public void destroy()
+    public void destroy() {
-    {
 
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java

@@ -9,6 +9,7 @@ import javax.servlet.ServletInputStream;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
+
 import com.ruoyi.common.utils.http.HttpHelper;
 
 /**
@@ -16,12 +17,10 @@ import com.ruoyi.common.utils.http.HttpHelper;
  *
  * @author ruoyi
  */
-public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper
+public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper {
-{
     private final byte[] body;
 
-    public RepeatedlyRequestWrapper(HttpServletRequest request, ServletResponse response) throws IOException
+    public RepeatedlyRequestWrapper(HttpServletRequest request, ServletResponse response) throws IOException {
-    {
         super(request);
         request.setCharacterEncoding("UTF-8");
         response.setCharacterEncoding("UTF-8");
@@ -30,41 +29,34 @@ public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper
     }
 
     @Override
-    public BufferedReader getReader() throws IOException
+    public BufferedReader getReader() throws IOException {
-    {
         return new BufferedReader(new InputStreamReader(getInputStream()));
     }
 
     @Override
-    public ServletInputStream getInputStream() throws IOException
+    public ServletInputStream getInputStream() throws IOException {
-    {
 
         final ByteArrayInputStream bais = new ByteArrayInputStream(body);
 
-        return new ServletInputStream()
+        return new ServletInputStream() {
-        {
 
             @Override
-            public int read() throws IOException
+            public int read() throws IOException {
-            {
                 return bais.read();
             }
 
             @Override
-            public boolean isFinished()
+            public boolean isFinished() {
-            {
                 return false;
             }
 
             @Override
-            public boolean isReady()
+            public boolean isReady() {
-            {
                 return false;
             }
 
             @Override
-            public void setReadListener(ReadListener readListener)
+            public void setReadListener(ReadListener readListener) {
-            {
 
             }
         };

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java

@@ -13,6 +13,7 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import com.ruoyi.common.utils.StringUtils;
 
 /**
@@ -20,8 +21,7 @@ import com.ruoyi.common.utils.StringUtils;
  *
  * @author ruoyi
  */
-public class XssFilter implements Filter
+public class XssFilter implements Filter {
-{
     /**
      * 排除链接
      */
@@ -33,32 +33,26 @@ public class XssFilter implements Filter
     public boolean enabled = false;
 
     @Override
-    public void init(FilterConfig filterConfig) throws ServletException
+    public void init(FilterConfig filterConfig) throws ServletException {
-    {
         String tempExcludes = filterConfig.getInitParameter("excludes");
         String tempEnabled = filterConfig.getInitParameter("enabled");
-        if (StringUtils.isNotEmpty(tempExcludes))
+        if (StringUtils.isNotEmpty(tempExcludes)) {
-        {
             String[] url = tempExcludes.split(",");
-            for (int i = 0; url != null && i < url.length; i++)
+            for (int i = 0; url != null && i < url.length; i++) {
-            {
                 excludes.add(url[i]);
             }
         }
-        if (StringUtils.isNotEmpty(tempEnabled))
+        if (StringUtils.isNotEmpty(tempEnabled)) {
-        {
             enabled = Boolean.valueOf(tempEnabled);
         }
     }
 
     @Override
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-            throws IOException, ServletException
+            throws IOException, ServletException {
-    {
         HttpServletRequest req = (HttpServletRequest) request;
         HttpServletResponse resp = (HttpServletResponse) response;
-        if (handleExcludeURL(req, resp))
+        if (handleExcludeURL(req, resp)) {
-        {
             chain.doFilter(request, response);
             return;
         }
@@ -66,23 +60,18 @@ public class XssFilter implements Filter
         chain.doFilter(xssRequest, response);
     }
 
-    private boolean handleExcludeURL(HttpServletRequest request, HttpServletResponse response)
+    private boolean handleExcludeURL(HttpServletRequest request, HttpServletResponse response) {
-    {
+        if (!enabled) {
-        if (!enabled)
-        {
             return true;
         }
-        if (excludes == null || excludes.isEmpty())
+        if (excludes == null || excludes.isEmpty()) {
-        {
             return false;
         }
         String url = request.getServletPath();
-        for (String pattern : excludes)
+        for (String pattern : excludes) {
-        {
             Pattern p = Pattern.compile("^" + pattern);
             Matcher m = p.matcher(url);
-            if (m.find())
+            if (m.find()) {
-            {
                 return true;
             }
         }
@@ -90,8 +79,7 @@ public class XssFilter implements Filter
     }
 
     @Override
-    public void destroy()
+    public void destroy() {
-    {
 
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java

@@ -6,6 +6,7 @@ import javax.servlet.ReadListener;
 import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
+
 import org.apache.commons.io.IOUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -17,26 +18,21 @@ import com.ruoyi.common.utils.html.EscapeUtil;
  *
  * @author ruoyi
  */
-public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
+public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
-{
     /**
      * @param request
      */
-    public XssHttpServletRequestWrapper(HttpServletRequest request)
+    public XssHttpServletRequestWrapper(HttpServletRequest request) {
-    {
         super(request);
     }
 
     @Override
-    public String[] getParameterValues(String name)
+    public String[] getParameterValues(String name) {
-    {
         String[] values = super.getParameterValues(name);
-        if (values != null)
+        if (values != null) {
-        {
             int length = values.length;
             String[] escapseValues = new String[length];
-            for (int i = 0; i < length; i++)
+            for (int i = 0; i < length; i++) {
-            {
                 // 防xss攻击和过滤前后空格
                 escapseValues[i] = EscapeUtil.clean(values[i]).trim();
             }
@@ -46,46 +42,38 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
     }
 
     @Override
-    public ServletInputStream getInputStream() throws IOException
+    public ServletInputStream getInputStream() throws IOException {
-    {
         // 非json类型，直接返回
-        if (!isJsonRequest())
+        if (!isJsonRequest()) {
-        {
             return super.getInputStream();
         }
 
         // 为空，直接返回
         String json = IOUtils.toString(super.getInputStream(), "utf-8");
-        if (StringUtils.isEmpty(json))
+        if (StringUtils.isEmpty(json)) {
-        {
             return super.getInputStream();
         }
 
         // xss过滤
         json = EscapeUtil.clean(json).trim();
         final ByteArrayInputStream bis = new ByteArrayInputStream(json.getBytes("utf-8"));
-        return new ServletInputStream()
+        return new ServletInputStream() {
-        {
             @Override
-            public boolean isFinished()
+            public boolean isFinished() {
-            {
                 return true;
             }
 
             @Override
-            public boolean isReady()
+            public boolean isReady() {
-            {
                 return true;
             }
 
             @Override
-            public void setReadListener(ReadListener readListener)
+            public void setReadListener(ReadListener readListener) {
-            {
             }
 
             @Override
-            public int read() throws IOException
+            public int read() throws IOException {
-            {
                 return bis.read();
             }
         };
@@ -96,8 +84,7 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
      *
      * @param request
      */
-    public boolean isJsonRequest()
+    public boolean isJsonRequest() {
-    {
         String header = super.getHeader(HttpHeaders.CONTENT_TYPE);
         return MediaType.APPLICATION_JSON_VALUE.equalsIgnoreCase(header);
     }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java

@@ -8,25 +8,27 @@ import java.math.RoundingMode;
  *
  * @author ruoyi
  */
-public class Arith
+public class Arith {
-{
 
-    /** 默认除法运算精度 */
+    /**
+     * 默认除法运算精度
+     */
     private static final int DEF_DIV_SCALE = 10;
 
-    /** 这个类不能实例化 */
+    /**
-    private Arith()
+     * 这个类不能实例化
-    {
+     */
+    private Arith() {
     }
 
     /**
      * 提供精确的加法运算。
+     *
      * @param v1 被加数
      * @param v2 加数
      * @return 两个参数的和
      */
-    public static double add(double v1, double v2)
+    public static double add(double v1, double v2) {
-    {
         BigDecimal b1 = new BigDecimal(Double.toString(v1));
         BigDecimal b2 = new BigDecimal(Double.toString(v2));
         return b1.add(b2).doubleValue();
@@ -34,12 +36,12 @@ public class Arith
 
     /**
      * 提供精确的减法运算。
+     *
      * @param v1 被减数
      * @param v2 减数
      * @return 两个参数的差
      */
-    public static double sub(double v1, double v2)
+    public static double sub(double v1, double v2) {
-    {
         BigDecimal b1 = new BigDecimal(Double.toString(v1));
         BigDecimal b2 = new BigDecimal(Double.toString(v2));
         return b1.subtract(b2).doubleValue();
@@ -47,12 +49,12 @@ public class Arith
 
     /**
      * 提供精确的乘法运算。
+     *
      * @param v1 被乘数
      * @param v2 乘数
      * @return 两个参数的积
      */
-    public static double mul(double v1, double v2)
+    public static double mul(double v1, double v2) {
-    {
         BigDecimal b1 = new BigDecimal(Double.toString(v1));
         BigDecimal b2 = new BigDecimal(Double.toString(v2));
         return b1.multiply(b2).doubleValue();
@@ -61,34 +63,32 @@ public class Arith
     /**
      * 提供（相对）精确的除法运算，当发生除不尽的情况时，精确到
      * 小数点以后10位，以后的数字四舍五入。
+     *
      * @param v1 被除数
      * @param v2 除数
      * @return 两个参数的商
      */
-    public static double div(double v1, double v2)
+    public static double div(double v1, double v2) {
-    {
         return div(v1, v2, DEF_DIV_SCALE);
     }
 
     /**
      * 提供（相对）精确的除法运算。当发生除不尽的情况时，由scale参数指
      * 定精度，以后的数字四舍五入。
-     * @param v1 被除数
+     *
-     * @param v2 除数
+     * @param v1    被除数
+     * @param v2    除数
      * @param scale 表示表示需要精确到小数点以后几位。
      * @return 两个参数的商
      */
-    public static double div(double v1, double v2, int scale)
+    public static double div(double v1, double v2, int scale) {
-    {
+        if (scale < 0) {
-        if (scale < 0)
-        {
             throw new IllegalArgumentException(
                     "The scale must be a positive integer or zero");
         }
         BigDecimal b1 = new BigDecimal(Double.toString(v1));
         BigDecimal b2 = new BigDecimal(Double.toString(v2));
-        if (b1.compareTo(BigDecimal.ZERO) == 0)
+        if (b1.compareTo(BigDecimal.ZERO) == 0) {
-        {
             return BigDecimal.ZERO.doubleValue();
         }
         return b1.divide(b2, scale, RoundingMode.HALF_UP).doubleValue();
@@ -96,14 +96,13 @@ public class Arith
 
     /**
      * 提供精确的小数位四舍五入处理。
-     * @param v 需要四舍五入的数字
+     *
+     * @param v     需要四舍五入的数字
      * @param scale 小数点后保留几位
      * @return 四舍五入后的结果
      */
-    public static double round(double v, int scale)
+    public static double round(double v, int scale) {
-    {
+        if (scale < 0) {
-        if (scale < 0)
-        {
             throw new IllegalArgumentException(
                     "The scale must be a positive integer or zero");
         }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java

@@ -4,6 +4,7 @@ import java.lang.management.ManagementFactory;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+
 import org.apache.commons.lang3.time.DateFormatUtils;
 
 /**
@@ -11,8 +12,7 @@ import org.apache.commons.lang3.time.DateFormatUtils;
  *
  * @author ruoyi
  */
-public class DateUtils extends org.apache.commons.lang3.time.DateUtils
+public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
-{
     public static String YYYY = "yyyy";
 
     public static String YYYY_MM = "yyyy-MM";
@@ -33,8 +33,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
      *
      * @return Date() 当前日期
      */
-    public static Date getNowDate()
+    public static Date getNowDate() {
-    {
         return new Date();
     }
 
@@ -43,44 +42,34 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
      *
      * @return String
      */
-    public static String getDate()
+    public static String getDate() {
-    {
         return dateTimeNow(YYYY_MM_DD);
     }
 
-    public static final String getTime()
+    public static final String getTime() {
-    {
         return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
     }
 
-    public static final String dateTimeNow()
+    public static final String dateTimeNow() {
-    {
         return dateTimeNow(YYYYMMDDHHMMSS);
     }
 
-    public static final String dateTimeNow(final String format)
+    public static final String dateTimeNow(final String format) {
-    {
         return parseDateToStr(format, new Date());
     }
 
-    public static final String dateTime(final Date date)
+    public static final String dateTime(final Date date) {
-    {
         return parseDateToStr(YYYY_MM_DD, date);
     }
 
-    public static final String parseDateToStr(final String format, final Date date)
+    public static final String parseDateToStr(final String format, final Date date) {
-    {
         return new SimpleDateFormat(format).format(date);
     }
 
-    public static final Date dateTime(final String format, final String ts)
+    public static final Date dateTime(final String format, final String ts) {
-    {
+        try {
-        try
-        {
             return new SimpleDateFormat(format).parse(ts);
-        }
+        } catch (ParseException e) {
-        catch (ParseException e)
-        {
             throw new RuntimeException(e);
         }
     }
@@ -88,8 +77,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期路径 即年/月/日 如2018/08/08
      */
-    public static final String datePath()
+    public static final String datePath() {
-    {
         Date now = new Date();
         return DateFormatUtils.format(now, "yyyy/MM/dd");
     }
@@ -97,8 +85,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期路径 即年/月/日 如20180808
      */
-    public static final String dateTime()
+    public static final String dateTime() {
-    {
         Date now = new Date();
         return DateFormatUtils.format(now, "yyyyMMdd");
     }
@@ -106,18 +93,13 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期型字符串转化为日期 格式
      */
-    public static Date parseDate(Object str)
+    public static Date parseDate(Object str) {
-    {
+        if (str == null) {
-        if (str == null)
-        {
             return null;
         }
-        try
+        try {
-        {
             return parseDate(str.toString(), parsePatterns);
-        }
+        } catch (ParseException e) {
-        catch (ParseException e)
-        {
             return null;
         }
     }
@@ -125,8 +107,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 获取服务器启动时间
      */
-    public static Date getServerStartDate()
+    public static Date getServerStartDate() {
-    {
         long time = ManagementFactory.getRuntimeMXBean().getStartTime();
         return new Date(time);
     }
@@ -134,8 +115,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 计算两个时间差
      */
-    public static String getDatePoor(Date endDate, Date nowDate)
+    public static String getDatePoor(Date endDate, Date nowDate) {
-    {
         long nd = 1000 * 24 * 60 * 60;
         long nh = 1000 * 60 * 60;
         long nm = 1000 * 60;

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java

@@ -2,6 +2,7 @@ package com.ruoyi.common.utils;
 
 import java.util.Collection;
 import java.util.List;
+
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.redis.RedisCache;
@@ -12,8 +13,7 @@ import com.ruoyi.common.utils.spring.SpringUtils;
  *
  * @author ruoyi
  */
-public class DictUtils
+public class DictUtils {
-{
     /**
      * 分隔符
      */
@@ -22,11 +22,10 @@ public class DictUtils
     /**
      * 设置字典缓存
      *
-     * @param key 参数键
+     * @param key       参数键
      * @param dictDatas 字典数据列表
      */
-    public static void setDictCache(String key, List<SysDictData> dictDatas)
+    public static void setDictCache(String key, List<SysDictData> dictDatas) {
-    {
         SpringUtils.getBean(RedisCache.class).setCacheObject(getCacheKey(key), dictDatas);
     }
 
@@ -36,11 +35,9 @@ public class DictUtils
      * @param key 参数键
      * @return dictDatas 字典数据列表
      */
-    public static List<SysDictData> getDictCache(String key)
+    public static List<SysDictData> getDictCache(String key) {
-    {
         Object cacheObj = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key));
-        if (StringUtils.isNotNull(cacheObj))
+        if (StringUtils.isNotNull(cacheObj)) {
-        {
             List<SysDictData> dictDatas = StringUtils.cast(cacheObj);
             return dictDatas;
         }
@@ -50,60 +47,49 @@ public class DictUtils
     /**
      * 根据字典类型和字典值获取字典标签
      *
-     * @param dictType 字典类型
+     * @param dictType  字典类型
      * @param dictValue 字典值
      * @return 字典标签
      */
-    public static String getDictLabel(String dictType, String dictValue)
+    public static String getDictLabel(String dictType, String dictValue) {
-    {
         return getDictLabel(dictType, dictValue, SEPARATOR);
     }
 
     /**
      * 根据字典类型和字典标签获取字典值
      *
-     * @param dictType 字典类型
+     * @param dictType  字典类型
      * @param dictLabel 字典标签
      * @return 字典值
      */
-    public static String getDictValue(String dictType, String dictLabel)
+    public static String getDictValue(String dictType, String dictLabel) {
-    {
         return getDictValue(dictType, dictLabel, SEPARATOR);
     }
 
     /**
      * 根据字典类型和字典值获取字典标签
      *
-     * @param dictType 字典类型
+     * @param dictType  字典类型
      * @param dictValue 字典值
      * @param separator 分隔符
      * @return 字典标签
      */
-    public static String getDictLabel(String dictType, String dictValue, String separator)
+    public static String getDictLabel(String dictType, String dictValue, String separator) {
-    {
         StringBuilder propertyString = new StringBuilder();
         List<SysDictData> datas = getDictCache(dictType);
 
-        if (StringUtils.containsAny(separator, dictValue) && StringUtils.isNotEmpty(datas))
+        if (StringUtils.containsAny(separator, dictValue) && StringUtils.isNotEmpty(datas)) {
-        {
+            for (SysDictData dict : datas) {
-            for (SysDictData dict : datas)
+                for (String value : dictValue.split(separator)) {
-            {
+                    if (value.equals(dict.getDictValue())) {
-                for (String value : dictValue.split(separator))
-                {
-                    if (value.equals(dict.getDictValue()))
-                    {
                         propertyString.append(dict.getDictLabel() + separator);
                         break;
                     }
                 }
             }
-        }
+        } else {
-        else
+            for (SysDictData dict : datas) {
-        {
+                if (dictValue.equals(dict.getDictValue())) {
-            for (SysDictData dict : datas)
-            {
-                if (dictValue.equals(dict.getDictValue()))
-                {
                     return dict.getDictLabel();
                 }
             }
@@ -114,36 +100,27 @@ public class DictUtils
     /**
      * 根据字典类型和字典标签获取字典值
      *
-     * @param dictType 字典类型
+     * @param dictType  字典类型
      * @param dictLabel 字典标签
      * @param separator 分隔符
      * @return 字典值
      */
-    public static String getDictValue(String dictType, String dictLabel, String separator)
+    public static String getDictValue(String dictType, String dictLabel, String separator) {
-    {
         StringBuilder propertyString = new StringBuilder();
         List<SysDictData> datas = getDictCache(dictType);
 
-        if (StringUtils.containsAny(separator, dictLabel) && StringUtils.isNotEmpty(datas))
+        if (StringUtils.containsAny(separator, dictLabel) && StringUtils.isNotEmpty(datas)) {
-        {
+            for (SysDictData dict : datas) {
-            for (SysDictData dict : datas)
+                for (String label : dictLabel.split(separator)) {
-            {
+                    if (label.equals(dict.getDictLabel())) {
-                for (String label : dictLabel.split(separator))
-                {
-                    if (label.equals(dict.getDictLabel()))
-                    {
                         propertyString.append(dict.getDictValue() + separator);
                         break;
                     }
                 }
             }
-        }
+        } else {
-        else
+            for (SysDictData dict : datas) {
-        {
+                if (dictLabel.equals(dict.getDictLabel())) {
-            for (SysDictData dict : datas)
-            {
-                if (dictLabel.equals(dict.getDictLabel()))
-                {
                     return dict.getDictValue();
                 }
             }
@@ -154,8 +131,7 @@ public class DictUtils
     /**
      * 清空字典缓存
      */
-    public static void clearDictCache()
+    public static void clearDictCache() {
-    {
         Collection<String> keys = SpringUtils.getBean(RedisCache.class).keys(Constants.SYS_DICT_KEY + "*");
         SpringUtils.getBean(RedisCache.class).deleteObject(keys);
     }
@@ -166,8 +142,7 @@ public class DictUtils
      * @param configKey 参数键
      * @return 缓存键key
      */
-    public static String getCacheKey(String configKey)
+    public static String getCacheKey(String configKey) {
-    {
         return Constants.SYS_DICT_KEY + configKey;
     }
 }

spring-boot/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java

@@ -2,6 +2,7 @@ package com.ruoyi.common.utils;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
+
 import org.apache.commons.lang3.exception.ExceptionUtils;
 
 /**
@@ -9,30 +10,25 @@ import org.apache.commons.lang3.exception.ExceptionUtils;
  *
  * @author ruoyi
  */
-public class ExceptionUtil
+public class ExceptionUtil {
-{
     /**
      * 获取exception的详细错误信息。
      */
-    public static String getExceptionMessage(Throwable e)
+    public static String getExceptionMessage(Throwable e) {
-    {
         StringWriter sw = new StringWriter();
         e.printStackTrace(new PrintWriter(sw, true));
         String str = sw.toString();
         return str;
     }
 
-    public static String getRootErrorMseeage(Exception e)
+    public static String getRootErrorMseeage(Exception e) {
-    {
         Throwable root = ExceptionUtils.getRootCause(e);
         root = (root == null ? e : root);
-        if (root == null)
+        if (root == null) {
-        {
             return "";
         }
         String msg = root.getMessage();
-        if (msg == null)
+        if (msg == null) {
-        {
             return "null";
         }
         return StringUtils.defaultString(msg);