Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-08-02 c966d9bada8e189f0beb4867fce81ae73f3fcebd

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue


 Conflicts:

	pom.xml

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

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

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

	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java

	ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml

	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java

	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

	ruoyi-ui/babel.config.js

	ruoyi-ui/package.json

	ruoyi-ui/src/api/tool/gen.js

	ruoyi-ui/src/assets/styles/ruoyi.scss

	ruoyi-ui/src/components/HeaderSearch/index.vue

	ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue

	ruoyi-ui/src/main.js

	ruoyi-ui/src/utils/ruoyi.js

	ruoyi-ui/src/views/login.vue

	ruoyi-ui/src/views/monitor/job/index.vue

	ruoyi-ui/src/views/monitor/logininfor/index.vue

	ruoyi-ui/src/views/monitor/online/index.vue

	ruoyi-ui/src/views/monitor/operlog/index.vue

	ruoyi-ui/src/views/system/config/index.vue

	ruoyi-ui/src/views/system/dept/index.vue

	ruoyi-ui/src/views/system/dict/data.vue

	ruoyi-ui/src/views/system/dict/index.vue

	ruoyi-ui/src/views/system/menu/index.vue

	ruoyi-ui/src/views/system/notice/index.vue

	ruoyi-ui/src/views/system/post/index.vue

	ruoyi-ui/src/views/system/role/index.vue

	ruoyi-ui/src/views/system/user/index.vue

	ruoyi-ui/src/views/tool/gen/genInfoForm.vue

	ruoyi-ui/src/views/tool/gen/index.vue

	ruoyi-ui/vue.config.js

	sql/ry_20200724.sql

 pom.xml

@@ -21,6 +21,7 @@
        <druid.version>1.1.14</druid.version>

        <bitwalker.version>1.19</bitwalker.version>

        <swagger.version>2.9.2</swagger.version>

        <kaptcha.version>2.3.2</kaptcha.version>

        <pagehelper.boot.version>1.2.5</pagehelper.boot.version>

        <fastjson.version>1.2.70</fastjson.version>

        <oshi.version>3.9.1</oshi.version>

@@ -146,6 +147,13 @@
                <version>${jwt.version}</version>

            </dependency>



            <!--验证码 -->

            <dependency>

                <groupId>com.github.penggle</groupId>

                <artifactId>kaptcha</artifactId>

                <version>${kaptcha.version}</version>

            </dependency>



            <dependency>

                <groupId>com.baomidou</groupId>

                <artifactId>mybatis-plus-boot-starter</artifactId>

@@ -161,7 +169,7 @@
                <artifactId>hutool-all</artifactId>

                <version>${hutool.version}</version>

            </dependency>

            


            <!-- å®šæ—¶ä»»åŠ¡-->

            <dependency>

                <groupId>com.ruoyi</groupId>


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

@@ -1,16 +1,20 @@
package com.ruoyi.web.controller.common;

import java.io.ByteArrayOutputStream;
import java.awt.image.BufferedImage;
import java.io.IOException;
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;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import com.google.code.kaptcha.Producer;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.VerifyCodeUtils;
import com.ruoyi.common.utils.sign.Base64;
import com.ruoyi.common.utils.uuid.IdUtils;

@@ -22,8 +26,18 @@
@RestController
public class CaptchaController
{
    @Resource(name = "captchaProducer")
    private Producer captchaProducer;

    @Resource(name = "captchaProducerMath")
    private Producer captchaProducerMath;

    @Autowired
    private RedisCache redisCache;
    
    // éªŒè¯ç ç±»åž‹
    @Value("${ruoyi.captchaType}")
    private String captchaType;

    /**
     * ç”ŸæˆéªŒè¯ç 
@@ -31,32 +45,42 @@
    @GetMapping("/captchaImage")
    public AjaxResult getCode(HttpServletResponse response) throws IOException
    {
        // ç”Ÿæˆéšæœºå­—串
        String verifyCode = VerifyCodeUtils.generateVerifyCode(4);
        // å”¯ä¸€æ ‡è¯†
        // ä¿å­˜éªŒè¯ç ä¿¡æ¯
        String uuid = IdUtils.simpleUUID();
        String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;

        redisCache.setCacheObject(verifyKey, verifyCode, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
        // ç”Ÿæˆå›¾ç‰‡
        int w = 111, h = 36;
        ByteArrayOutputStream stream = new ByteArrayOutputStream();
        VerifyCodeUtils.outputImage(w, h, stream, verifyCode);
        String capStr = null, code = null;
        BufferedImage image = null;

        // ç”ŸæˆéªŒè¯ç 
        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))
        {
            capStr = code = captchaProducer.createText();
            image = captchaProducer.createImage(capStr);
        }

        redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
        // è½¬æ¢æµä¿¡æ¯å†™å‡º
        FastByteArrayOutputStream os = new FastByteArrayOutputStream();
        try
        {
            AjaxResult ajax = AjaxResult.success();
            ajax.put("uuid", uuid);
            ajax.put("img", Base64.encode(stream.toByteArray()));
            return ajax;
            ImageIO.write(image, "jpg", os);
        }
        catch (Exception e)
        catch (IOException e)
        {
            e.printStackTrace();
            return AjaxResult.error(e.getMessage());
        }
        finally
        {
            stream.close();
        }

        AjaxResult ajax = AjaxResult.success();
        ajax.put("uuid", uuid);
        ajax.put("img", Base64.encode(os.toByteArray()));
        return ajax;
    }
}

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

@@ -12,6 +12,8 @@
  profile: D:/ruoyi/uploadPath
  # èŽ·å–ip地址开关
  addressEnabled: false
  # éªŒè¯ç ç±»åž‹ math æ•°ç»„计算 char å­—符验证
  captchaType: math

# å¼€å‘环境配置
server:

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

@@ -40,6 +40,11 @@
    public String readConverterExp() default "";



    /**

     * åˆ†éš”符，读取字符串组内容

     */

    public String separator() default ",";



    /**

     * å¯¼å‡ºç±»åž‹ï¼ˆ0数字 1字符串）

     */

    public ColumnType cellType() default ColumnType.STRING;


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

@@ -13,7 +13,7 @@

/**
 * spring redis å·¥å…·ç±»
 * 
 *
 * @author ruoyi
 **/
@SuppressWarnings(value = { "unchecked", "rawtypes" })
@@ -109,7 +109,7 @@
     * ç¼“å­˜List数据
     *
     * @param key ç¼“存的键值
     * @param values å¾…缓存的List数据
     * @param dataList å¾…缓存的List数据
     * @return ç¼“存的对象
     */
    public <T> long setCacheList(final String key, final List<T> dataList)
@@ -216,7 +216,7 @@

    /**
     * èŽ·å¾—缓存的基本对象列表
     * 
     *
     * @param pattern å­—符串前缀
     * @return å¯¹è±¡åˆ—表
     */

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

@@ -15,6 +15,11 @@
public class DictUtils

{

    /**

     * åˆ†éš”符

     */

    public static final String SEPARATOR = ",";



    /**

     * è®¾ç½®å­—典缓存

     * 

     * @param key å‚æ•°é”®

@@ -36,8 +41,8 @@
        Object cacheObj = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key));

        if (StringUtils.isNotNull(cacheObj))

        {

            List<SysDictData> DictDatas = StringUtils.cast(cacheObj);

            return DictDatas;

            List<SysDictData> dictDatas = StringUtils.cast(cacheObj);

            return dictDatas;

        }

        return null;

    }

@@ -51,21 +56,7 @@
     */

    public static String getDictLabel(String dictType, String dictValue)

    {

        if (StringUtils.isNotEmpty(dictType) && StringUtils.isNotEmpty(dictValue))

        {

            List<SysDictData> datas = getDictCache(dictType);

            if (StringUtils.isNotEmpty(datas))

            {

                for (SysDictData dict : datas)

                {

                    if (dictValue.equals(dict.getDictValue()))

                    {

                        return dict.getDictLabel();

                    }

                }

            }

        }

        return dictValue;

        return getDictLabel(dictType, dictValue, SEPARATOR);

    }



    /**

@@ -77,21 +68,87 @@
     */

    public static String getDictValue(String dictType, String dictLabel)

    {

        if (StringUtils.isNotEmpty(dictType) && StringUtils.isNotEmpty(dictLabel))

        return getDictValue(dictType, dictLabel, SEPARATOR);

    }



    /**

     * æ ¹æ®å­—典类型和字典值获取字典标签

     * 
     * @param dictType å­—典类型

     * @param dictValue å­—典值

     * @param separator åˆ†éš”符

     * @return å­—典标签

     */

    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))

        {

            List<SysDictData> datas = getDictCache(dictType);

            if (StringUtils.isNotEmpty(datas))

            for (SysDictData dict : datas)

            {

                for (SysDictData dict : datas)

                for (String value : dictValue.split(separator))

                {

                    if (dictLabel.equals(dict.getDictLabel()))

                    if (value.equals(dict.getDictValue()))

                    {

                        return dict.getDictValue();

                        propertyString.append(dict.getDictLabel() + separator);

                        break;

                    }

                }

            }

        }

        return dictLabel;

        else

        {

            for (SysDictData dict : datas)

            {

                if (dictValue.equals(dict.getDictValue()))

                {

                    return dict.getDictLabel();

                }

            }

        }

        return StringUtils.stripEnd(propertyString.toString(), separator);

    }



    /**

     * æ ¹æ®å­—典类型和字典标签获取字典值

     * 
     * @param dictType å­—典类型

     * @param dictLabel å­—典标签

     * @param separator åˆ†éš”符

     * @return å­—典值

     */

    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))

        {

            for (SysDictData dict : datas)

            {

                for (String label : dictLabel.split(separator))

                {

                    if (label.equals(dict.getDictLabel()))

                    {

                        propertyString.append(dict.getDictValue() + separator);

                        break;

                    }

                }

            }

        }

        else

        {

            for (SysDictData dict : datas)

            {

                if (dictLabel.equals(dict.getDictLabel()))

                {

                    return dict.getDictValue();

                }

            }

        }

        return StringUtils.stripEnd(propertyString.toString(), separator);

    }



    /**


 ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java

@@ -15,7 +15,7 @@

/**
 * æ–‡ä»¶ä¸Šä¼ å·¥å…·ç±»
 * 
 *
 * @author ruoyi
 */
public class FileUploadUtils
@@ -89,7 +89,7 @@
     *
     * @param baseDir ç›¸å¯¹åº”用的基目录
     * @param file ä¸Šä¼ çš„文件
     * @param extension ä¸Šä¼ æ–‡ä»¶ç±»åž‹
     * @param allowedExtension ä¸Šä¼ æ–‡ä»¶ç±»åž‹
     * @return è¿”回上传成功的文件名
     * @throws FileSizeLimitExceededException å¦‚果超出最大大小
     * @throws FileNameLengthLimitExceededException æ–‡ä»¶åå¤ªé•¿
@@ -216,7 +216,7 @@

    /**
     * èŽ·å–文件名的后缀
     * 
     *
     * @param file è¡¨å•æ–‡ä»¶
     * @return åŽç¼€å
     */
@@ -229,4 +229,4 @@
        }
        return extension;
    }
}
}

 ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java

@@ -14,7 +14,7 @@
 * 
 * @author ruoyi
 */
public class FileUtils
public class FileUtils extends org.apache.commons.io.FileUtils
{
    public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+";


 ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java

@@ -144,7 +144,10 @@

    public static void main(String[] args)
    {
        String html = "alert('11111');";
        String html = "<script>alert(1);</script>";
        // String html = "<scr<script>ipt>alert(\"XSS\")</scr<script>ipt>";
        // String html = "<123";
        // String html = "123>";
        System.out.println(EscapeUtil.clean(html));
        System.out.println(EscapeUtil.escape(html));
        System.out.println(EscapeUtil.unescape(html));

 ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java

@@ -131,7 +131,7 @@
        vAllowedEntities = new String[] { "amp", "gt", "lt", "quot" };

        stripComment = true;

        encodeQuotes = true;

        alwaysMakeTags = true;

        alwaysMakeTags = false;

    }



    /**

@@ -208,7 +208,7 @@


        s = processRemoveBlanks(s);



        s = validateEntities(s);

        // s = validateEntities(s);



        return s;

    }

@@ -245,6 +245,7 @@
            // try and form html

            //

            s = regexReplace(P_END_ARROW, "", s);

            // ä¸è¿½åŠ ç»“束标签

            s = regexReplace(P_BODY_TO_END, "<$1>", s);

            s = regexReplace(P_XML_CONTENT, "$1<$2", s);




 ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -8,7 +8,6 @@
import java.lang.reflect.Field;

import java.lang.reflect.Method;

import java.math.BigDecimal;

import java.text.DecimalFormat;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Comparator;

@@ -200,7 +199,10 @@
                    // è®¾ç½®ç±»çš„私有字段属性可访问.

                    field.setAccessible(true);

                    Integer column = cellMap.get(attr.name());

                    fieldsMap.put(column, field);

                    if (column != null)

                    {

                        fieldsMap.put(column, field);

                    }

                }

            }

            for (int i = 1; i < rows; i++)

@@ -271,11 +273,11 @@
                        }

                        else if (StringUtils.isNotEmpty(attr.readConverterExp()))

                        {

                            val = reverseByExp(Convert.toStr(val), attr.readConverterExp());

                            val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator());

                        }

                        else if (StringUtils.isNotEmpty(attr.dictType()))

                        {

                            val = reverseDictByExp(attr.dictType(), Convert.toStr(val));

                            val = reverseDictByExp(Convert.toStr(val), attr.dictType(), attr.separator());

                        }

                        ReflectUtils.invokeSetter(entity, propertyName, val);

                    }

@@ -534,6 +536,7 @@
                Object value = getTargetValue(vo, field, attr);

                String dateFormat = attr.dateFormat();

                String readConverterExp = attr.readConverterExp();

                String separator = attr.separator();

                String dictType = attr.dictType();

                if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))

                {

@@ -541,11 +544,11 @@
                }

                else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))

                {

                    cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp));

                    cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator));

                }

                else if (StringUtils.isNotEmpty(dictType))

                {

                    cell.setCellValue(convertDictByExp(dictType, Convert.toStr(value)));

                    cell.setCellValue(convertDictByExp(Convert.toStr(value), dictType, separator));

                }

                else

                {

@@ -623,28 +626,36 @@
     * 

     * @param propertyValue å‚数值

     * @param converterExp ç¿»è¯‘注解

     * @param separator åˆ†éš”符

     * @return è§£æžåŽå€¼

     * @throws Exception

     */

    public static String convertByExp(String propertyValue, String converterExp) throws Exception

    public static String convertByExp(String propertyValue, String converterExp, String separator)

    {

        try

        StringBuilder propertyString = new StringBuilder();

        String[] convertSource = converterExp.split(",");

        for (String item : convertSource)

        {

            String[] convertSource = converterExp.split(",");

            for (String item : convertSource)

            String[] itemArray = item.split("=");

            if (StringUtils.containsAny(separator, propertyValue))

            {

                String[] itemArray = item.split("=");

                for (String value : propertyValue.split(separator))

                {

                    if (itemArray[0].equals(value))

                    {

                        propertyString.append(itemArray[1] + separator);

                        break;

                    }

                }

            }

            else

            {

                if (itemArray[0].equals(propertyValue))

                {

                    return itemArray[1];

                }

            }

        }

        catch (Exception e)

        {

            throw e;

        }

        return propertyValue;

        return StringUtils.stripEnd(propertyString.toString(), separator);

    }



    /**

@@ -652,52 +663,62 @@
     * 

     * @param propertyValue å‚数值

     * @param converterExp ç¿»è¯‘注解

     * @param separator åˆ†éš”符

     * @return è§£æžåŽå€¼

     * @throws Exception

     */

    public static String reverseByExp(String propertyValue, String converterExp) throws Exception

    public static String reverseByExp(String propertyValue, String converterExp, String separator)

    {

        try

        StringBuilder propertyString = new StringBuilder();

        String[] convertSource = converterExp.split(",");

        for (String item : convertSource)

        {

            String[] convertSource = converterExp.split(",");

            for (String item : convertSource)

            String[] itemArray = item.split("=");

            if (StringUtils.containsAny(separator, propertyValue))

            {

                String[] itemArray = item.split("=");

                for (String value : propertyValue.split(separator))

                {

                    if (itemArray[1].equals(value))

                    {

                        propertyString.append(itemArray[0] + separator);

                        break;

                    }

                }

            }

            else

            {

                if (itemArray[1].equals(propertyValue))

                {

                    return itemArray[0];

                }

            }

        }

        catch (Exception e)

        {

            throw e;

        }

        return propertyValue;

        return StringUtils.stripEnd(propertyString.toString(), separator);

    }



    /**

     * è§£æžå­—典值

     * 

     * @param dictType å­—典类型

     * @param dictValue å­—典值

     * @param dictType å­—典类型

     * @param separator åˆ†éš”符

     * @return å­—典标签

     */

    public static String convertDictByExp(String dictType, String dictValue) throws Exception

    public static String convertDictByExp(String dictValue, String dictType, String separator)

    {

        return DictUtils.getDictLabel(dictType, dictValue);

        return DictUtils.getDictLabel(dictType, dictValue, separator);

    }



    /**

     * åå‘解析值字典值

     * 

     * @param dictLabel å­—典标签

     * @param dictType å­—典类型

     * @param dictValue å­—典标签

     * @param separator åˆ†éš”符

     * @return å­—典值

     */

    public static String reverseDictByExp(String dictType, String dictLabel) throws Exception

    public static String reverseDictByExp(String dictLabel, String dictType, String separator)

    {

        return DictUtils.getDictValue(dictType, dictLabel);

        return DictUtils.getDictValue(dictType, dictLabel, separator);

    }



    /**

@@ -875,14 +896,7 @@
                    }

                    else

                    {

                        if ((Double) val % 1 > 0)

                        {

                            val = new DecimalFormat("0.00").format(val);

                        }

                        else

                        {

                            val = new DecimalFormat("0").format(val);

                        }

                        val = new BigDecimal(val.toString()); // æµ®ç‚¹æ ¼å¼å¤„理

                    }

                }

                else if (cell.getCellTypeEnum() == CellType.STRING)


 ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java

@@ -1,5 +1,6 @@
package com.ruoyi.common.utils.sql;

import com.ruoyi.common.exception.BaseException;
import com.ruoyi.common.utils.StringUtils;

/**
@@ -10,9 +11,9 @@
public class SqlUtil
{
    /**
     * ä»…支持字母、数字、下划线、空格、逗号（支持多个字段排序）
     * ä»…支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序）
     */
    public static String SQL_PATTERN = "[a-zA-Z0-9_\\ \\,]+";
    public static String SQL_PATTERN = "[a-zA-Z0-9_\\ \\,\\.]+";

    /**
     * æ£€æŸ¥å­—符，防止注入绕过
@@ -21,7 +22,7 @@
    {
        if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value))
        {
            return StringUtils.EMPTY;
            throw new BaseException("参数不符合规范，不能进行查询");
        }
        return value;
    }

 ruoyi-framework/pom.xml

@@ -47,6 +47,18 @@
            <artifactId>druid-spring-boot-starter</artifactId>

        </dependency>



        <!-- éªŒè¯ç  -->

        <dependency>

            <groupId>com.github.penggle</groupId>

            <artifactId>kaptcha</artifactId>

            <exclusions>

                <exclusion>

                    <artifactId>javax.servlet-api</artifactId>

                    <groupId>javax.servlet</groupId>

                </exclusion>

            </exclusions>

        </dependency>



        <!-- èŽ·å–系统信息 -->

        <dependency>

            <groupId>com.github.oshi</groupId>


 ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java

@@ -20,7 +20,7 @@

/**
 * æ•°æ®è¿‡æ»¤å¤„理
 * 
 *
 * @author ruoyi
 */
@Aspect
@@ -93,10 +93,10 @@

    /**
     * æ•°æ®èŒƒå›´è¿‡æ»¤
     * 
     *
     * @param joinPoint åˆ‡ç‚¹
     * @param user ç”¨æˆ·
     * @param alias åˆ«å
     * @param userAlias åˆ«å
     */
    public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias)
    {

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,83 @@
package com.ruoyi.framework.config;

import java.util.Properties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import com.google.code.kaptcha.impl.DefaultKaptcha;
import com.google.code.kaptcha.util.Config;
import static com.google.code.kaptcha.Constants.*;

/**
 * éªŒè¯ç é…ç½®
 * 
 * @author ruoyi
 */
@Configuration
public class CaptchaConfig
{
    @Bean(name = "captchaProducer")
    public DefaultKaptcha getKaptchaBean()
    {
        DefaultKaptcha defaultKaptcha = new DefaultKaptcha();
        Properties properties = new Properties();
        // æ˜¯å¦æœ‰è¾¹æ¡† é»˜è®¤ä¸ºtrue æˆ‘们可以自己设置yes，no
        properties.setProperty(KAPTCHA_BORDER, "yes");
        // éªŒè¯ç æ–‡æœ¬å­—符颜色 é»˜è®¤ä¸ºColor.BLACK
        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_COLOR, "black");
        // éªŒè¯ç å›¾ç‰‡å®½åº¦ é»˜è®¤ä¸º200
        properties.setProperty(KAPTCHA_IMAGE_WIDTH, "160");
        // éªŒè¯ç å›¾ç‰‡é«˜åº¦ é»˜è®¤ä¸º50
        properties.setProperty(KAPTCHA_IMAGE_HEIGHT, "60");
        // éªŒè¯ç æ–‡æœ¬å­—符大小 é»˜è®¤ä¸º40
        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_SIZE, "38");
        // KAPTCHA_SESSION_KEY
        properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCode");
        // éªŒè¯ç æ–‡æœ¬å­—符长度 é»˜è®¤ä¸º5
        properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "4");
        // éªŒè¯ç æ–‡æœ¬å­—体样式 é»˜è®¤ä¸ºnew Font("Arial", 1, fontSize), new Font("Courier", 1, fontSize)
        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier");
        // å›¾ç‰‡æ ·å¼ æ°´çº¹com.google.code.kaptcha.impl.WaterRipple é±¼çœ¼com.google.code.kaptcha.impl.FishEyeGimpy é˜´å½±com.google.code.kaptcha.impl.ShadowGimpy
        properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.ShadowGimpy");
        Config config = new Config(properties);
        defaultKaptcha.setConfig(config);
        return defaultKaptcha;
    }

    @Bean(name = "captchaProducerMath")
    public DefaultKaptcha getKaptchaBeanMath()
    {
        DefaultKaptcha defaultKaptcha = new DefaultKaptcha();
        Properties properties = new Properties();
        // æ˜¯å¦æœ‰è¾¹æ¡† é»˜è®¤ä¸ºtrue æˆ‘们可以自己设置yes，no
        properties.setProperty(KAPTCHA_BORDER, "yes");
        // è¾¹æ¡†é¢œè‰² é»˜è®¤ä¸ºColor.BLACK
        properties.setProperty(KAPTCHA_BORDER_COLOR, "105,179,90");
        // éªŒè¯ç æ–‡æœ¬å­—符颜色 é»˜è®¤ä¸ºColor.BLACK
        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_COLOR, "blue");
        // éªŒè¯ç å›¾ç‰‡å®½åº¦ é»˜è®¤ä¸º200
        properties.setProperty(KAPTCHA_IMAGE_WIDTH, "160");
        // éªŒè¯ç å›¾ç‰‡é«˜åº¦ é»˜è®¤ä¸º50
        properties.setProperty(KAPTCHA_IMAGE_HEIGHT, "60");
        // éªŒè¯ç æ–‡æœ¬å­—符大小 é»˜è®¤ä¸º40
        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_SIZE, "35");
        // KAPTCHA_SESSION_KEY
        properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCodeMath");
        // éªŒè¯ç æ–‡æœ¬ç”Ÿæˆå™¨
        properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.ruoyi.framework.config.KaptchaTextCreator");
        // éªŒè¯ç æ–‡æœ¬å­—符间距 é»˜è®¤ä¸º2
        properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_SPACE, "3");
        // éªŒè¯ç æ–‡æœ¬å­—符长度 é»˜è®¤ä¸º5
        properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "6");
        // éªŒè¯ç æ–‡æœ¬å­—体样式 é»˜è®¤ä¸ºnew Font("Arial", 1, fontSize), new Font("Courier", 1, fontSize)
        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier");
        // éªŒè¯ç å™ªç‚¹é¢œè‰² é»˜è®¤ä¸ºColor.BLACK
        properties.setProperty(KAPTCHA_NOISE_COLOR, "white");
        // å¹²æ‰°å®žçŽ°ç±»
        properties.setProperty(KAPTCHA_NOISE_IMPL, "com.google.code.kaptcha.impl.NoNoise");
        // å›¾ç‰‡æ ·å¼ æ°´çº¹com.google.code.kaptcha.impl.WaterRipple é±¼çœ¼com.google.code.kaptcha.impl.FishEyeGimpy é˜´å½±com.google.code.kaptcha.impl.ShadowGimpy
        properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.ShadowGimpy");
        Config config = new Config(properties);
        defaultKaptcha.setConfig(config);
        return defaultKaptcha;
    }
}

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,75 @@
package com.ruoyi.framework.config;

import java.util.Random;
import com.google.code.kaptcha.text.impl.DefaultTextCreator;

/**
 * éªŒè¯ç æ–‡æœ¬ç”Ÿæˆå™¨
 * 
 * @author ruoyi
 */
public class KaptchaTextCreator extends DefaultTextCreator
{
    private static final String[] CNUMBERS = "0,1,2,3,4,5,6,7,8,9,10".split(",");

    @Override
    public String getText()
    {
        Integer result = 0;
        Random random = new Random();
        int x = random.nextInt(10);
        int y = random.nextInt(10);
        StringBuilder suChinese = new StringBuilder();
        int randomoperands = (int) Math.round(Math.random() * 2);
        if (randomoperands == 0)
        {
            result = x * y;
            suChinese.append(CNUMBERS[x]);
            suChinese.append("*");
            suChinese.append(CNUMBERS[y]);
        }
        else if (randomoperands == 1)
        {
            if (!(x == 0) && y % x == 0)
            {
                result = y / x;
                suChinese.append(CNUMBERS[y]);
                suChinese.append("/");
                suChinese.append(CNUMBERS[x]);
            }
            else
            {
                result = x + y;
                suChinese.append(CNUMBERS[x]);
                suChinese.append("+");
                suChinese.append(CNUMBERS[y]);
            }
        }
        else if (randomoperands == 2)
        {
            if (x >= y)
            {
                result = x - y;
                suChinese.append(CNUMBERS[x]);
                suChinese.append("-");
                suChinese.append(CNUMBERS[y]);
            }
            else
            {
                result = y - x;
                suChinese.append(CNUMBERS[y]);
                suChinese.append("-");
                suChinese.append(CNUMBERS[x]);
            }
        }
        else
        {
            result = x + y;
            suChinese.append(CNUMBERS[x]);
            suChinese.append("+");
            suChinese.append(CNUMBERS[y]);
        }
        suChinese.append("=?@" + result);
        return suChinese.toString();
    }
}

 ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java

@@ -13,7 +13,7 @@


/**

 * é˜²æ­¢é‡å¤æäº¤æ‹¦æˆªå™¨

 * 
 *

 * @author ruoyi

 */

@Component

@@ -46,8 +46,8 @@


    /**

     * éªŒè¯æ˜¯å¦é‡å¤æäº¤ç”±å­ç±»å®žçŽ°å…·ä½“的防重复提交的规则

     * 
     * @param httpServletRequest

     *

     * @param request

     * @return

     * @throws Exception

     */


 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java

@@ -22,7 +22,7 @@

/**
 * token验证处理
 * 
 *
 * @author ruoyi
 */
@Component
@@ -51,7 +51,7 @@

    /**
     * èŽ·å–用户身份信息
     * 
     *
     * @return ç”¨æˆ·ä¿¡æ¯
     */
    public LoginUser getLoginUser(HttpServletRequest request)
@@ -95,7 +95,7 @@

    /**
     * åˆ›å»ºä»¤ç‰Œ
     * 
     *
     * @param loginUser ç”¨æˆ·ä¿¡æ¯
     * @return ä»¤ç‰Œ
     */
@@ -113,8 +113,8 @@

    /**
     * éªŒè¯ä»¤ç‰Œæœ‰æ•ˆæœŸï¼Œç›¸å·®ä¸è¶³20分钟，自动刷新缓存
     * 
     * @param token ä»¤ç‰Œ
     *
     * @param loginUser
     * @return ä»¤ç‰Œ
     */
    public void verifyToken(LoginUser loginUser)
@@ -129,7 +129,7 @@

    /**
     * åˆ·æ–°ä»¤ç‰Œæœ‰æ•ˆæœŸ
     * 
     *
     * @param loginUser ç™»å½•ä¿¡æ¯
     */
    public void refreshToken(LoginUser loginUser)
@@ -140,10 +140,10 @@
        String userKey = getTokenKey(loginUser.getToken());
        redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
    }
    

    /**
     * è®¾ç½®ç”¨æˆ·ä»£ç†ä¿¡æ¯
     * 
     *
     * @param loginUser ç™»å½•ä¿¡æ¯
     */
    public void setUserAgent(LoginUser loginUser)
@@ -155,7 +155,7 @@
        loginUser.setBrowser(userAgent.getBrowser().getName());
        loginUser.setOs(userAgent.getOperatingSystem().getName());
    }
    

    /**
     * ä»Žæ•°æ®å£°æ˜Žç”Ÿæˆä»¤ç‰Œ
     *

 ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java

@@ -148,15 +148,27 @@
    }

    /**
     * ç”Ÿæˆä»£ç 
     * ç”Ÿæˆä»£ç ï¼ˆä¸‹è½½æ–¹å¼ï¼‰
     */
    @PreAuthorize("@ss.hasPermi('tool:gen:code')")
    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
    @GetMapping("/download/{tableName}")
    public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException
    {
        byte[] data = genTableService.downloadCode(tableName);
        genCode(response, data);
    }

    /**
     * ç”Ÿæˆä»£ç ï¼ˆè‡ªå®šä¹‰è·¯å¾„）
     */
    @PreAuthorize("@ss.hasPermi('tool:gen:code')")
    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
    @GetMapping("/genCode/{tableName}")
    public void genCode(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException
    public AjaxResult genCode(HttpServletResponse response, @PathVariable("tableName") String tableName)
    {
        byte[] data = genTableService.generatorCode(tableName);
        genCode(response, data);
        genTableService.generatorCode(tableName);
        return AjaxResult.success();
    }

    /**
@@ -168,7 +180,7 @@
    public void batchGenCode(HttpServletResponse response, String tables) throws IOException
    {
        String[] tableNames = Convert.toStrArray(tables);
        byte[] data = genTableService.generatorCode(tableNames);
        byte[] data = genTableService.downloadCode(tableNames);
        genCode(response, data);
    }

@@ -185,4 +197,4 @@
        response.setContentType("application/octet-stream; charset=UTF-8");
        IOUtils.write(data, response.getOutputStream());
    }
}
}

 ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java

@@ -55,6 +55,12 @@
    @NotBlank(message = "作者不能为空")
    private String functionAuthor;

    /** ç”Ÿæˆä»£ç æ–¹å¼ï¼ˆ0zip压缩包 1自定义路径） */
    private String genType;

    /** ç”Ÿæˆè·¯å¾„（不填默认项目路径） */
    private String genPath;

    /** ä¸»é”®ä¿¡æ¯ */
    private GenTableColumn pkColumn;

@@ -180,6 +186,26 @@
        this.functionAuthor = functionAuthor;
    }

    public String getGenType()
    {
        return genType;
    }

    public void setGenType(String genType)
    {
        this.genType = genType;
    }

    public String getGenPath()
    {
        return genPath;
    }

    public void setGenPath(String genPath)
    {
        this.genPath = genPath;
    }

    public GenTableColumn getPkColumn()
    {
        return pkColumn;

 ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java

@@ -1,6 +1,7 @@
package com.ruoyi.generator.service;

import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
import java.util.LinkedHashMap;
@@ -21,9 +22,11 @@
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.GenConstants;
import com.ruoyi.common.core.text.CharsetKit;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.generator.domain.GenTableColumn;
import com.ruoyi.generator.mapper.GenTableColumnMapper;
@@ -202,13 +205,13 @@
    }

    /**
     * ç”Ÿæˆä»£ç 
     * ç”Ÿæˆä»£ç ï¼ˆä¸‹è½½æ–¹å¼ï¼‰
     * 
     * @param tableName è¡¨åç§°
     * @return æ•°æ®
     */
    @Override
    public byte[] generatorCode(String tableName)
    public byte[] downloadCode(String tableName)
    {
        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
        ZipOutputStream zip = new ZipOutputStream(outputStream);
@@ -218,13 +221,55 @@
    }

    /**
     * æ‰¹é‡ç”Ÿæˆä»£ç 
     * ç”Ÿæˆä»£ç ï¼ˆè‡ªå®šä¹‰è·¯å¾„）
     * 
     * @param tableName è¡¨åç§°
     * @return æ•°æ®
     */
    @Override
    public void generatorCode(String tableName)
    {
        // æŸ¥è¯¢è¡¨ä¿¡æ¯
        GenTable table = genTableMapper.selectGenTableByName(tableName);
        // æŸ¥è¯¢åˆ—信息
        List<GenTableColumn> columns = table.getColumns();
        setPkColumn(table, columns);

        VelocityInitializer.initVelocity();

        VelocityContext context = VelocityUtils.prepareContext(table);

        // èŽ·å–模板列表
        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
        for (String template : templates)
        {
            if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm"))
            {
                // æ¸²æŸ“模板
                StringWriter sw = new StringWriter();
                Template tpl = Velocity.getTemplate(template, Constants.UTF8);
                tpl.merge(context, sw);
                try
                {
                    String path = getGenPath(table, template);
                    FileUtils.writeStringToFile(new File(path), sw.toString(), CharsetKit.UTF_8);
                }
                catch (IOException e)
                {
                    throw new CustomException("渲染模板失败，表名：" + table.getTableName());
                }
            }
        }
    }

    /**
     * æ‰¹é‡ç”Ÿæˆä»£ç ï¼ˆä¸‹è½½æ–¹å¼ï¼‰
     * 
     * @param tableNames è¡¨æ•°ç»„
     * @return æ•°æ®
     */
    @Override
    public byte[] generatorCode(String[] tableNames)
    public byte[] downloadCode(String[] tableNames)
    {
        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
        ZipOutputStream zip = new ZipOutputStream(outputStream);
@@ -347,4 +392,21 @@
            genTable.setParentMenuName(parentMenuName);
        }
    }

    /**
     * èŽ·å–代码生成地址
     * 
     * @param table ä¸šåŠ¡è¡¨ä¿¡æ¯
     * @param template æ¨¡æ¿æ–‡ä»¶è·¯å¾„
     * @return ç”Ÿæˆåœ°å€
     */
    public static String getGenPath(GenTable table, String template)
    {
        String genPath = table.getGenPath();
        if (StringUtils.equals(genPath, "/"))
        {
            return System.getProperty("user.dir") + File.separator + "src" + File.separator + VelocityUtils.getFileName(template, table);
        }
        return genPath + File.separator + VelocityUtils.getFileName(template, table);
    }
}

 ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java

@@ -75,20 +75,28 @@
    public Map<String, String> previewCode(Long tableId);

    /**
     * ç”Ÿæˆä»£ç 
     * ç”Ÿæˆä»£ç ï¼ˆä¸‹è½½æ–¹å¼ï¼‰
     * 
     * @param tableName è¡¨åç§°
     * @return æ•°æ®
     */
    public byte[] generatorCode(String tableName);
    public byte[] downloadCode(String tableName);

    /**
     * æ‰¹é‡ç”Ÿæˆä»£ç 
     * ç”Ÿæˆä»£ç ï¼ˆè‡ªå®šä¹‰è·¯å¾„）
     * 
     * @param tableName è¡¨åç§°
     * @return æ•°æ®
     */
    public void generatorCode(String tableName);

    /**
     * æ‰¹é‡ç”Ÿæˆä»£ç ï¼ˆä¸‹è½½æ–¹å¼ï¼‰
     * 
     * @param tableNames è¡¨æ•°ç»„
     * @return æ•°æ®
     */
    public byte[] generatorCode(String[] tableNames);
    public byte[] downloadCode(String[] tableNames);

    /**
     * ä¿®æ”¹ä¿å­˜å‚数校验

 ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java

@@ -11,20 +11,25 @@
import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.generator.domain.GenTableColumn;

/**
 * æ¨¡æ¿å¤„理工具类
 * 
 * @author ruoyi
 */
public class VelocityUtils
{
    /** é¡¹ç›®ç©ºé—´è·¯å¾„ */
    private static final String PROJECT_PATH = "main/java";

    /** mybatis空间路径 */
    private static final String MYBATIS_PATH = "main/resources/mybatis";
    private static final String MYBATIS_PATH = "main/resources/mapper";

    /** é»˜è®¤ä¸Šçº§èœå•ï¼Œç³»ç»Ÿå·¥å…· */
    private static final String DEFAULT_PARENT_MENU_ID = "3";

    /**
     * è®¾ç½®æ¨¡æ¿å˜é‡ä¿¡æ¯
     * 
     *
     * @return æ¨¡æ¿åˆ—表
     */
    public static VelocityContext prepareContext(GenTable genTable)
@@ -93,7 +98,7 @@

    /**
     * èŽ·å–模板信息
     * 
     *
     * @return æ¨¡æ¿åˆ—表
     */
    public static List<String> getTemplateList(String tplCategory)
@@ -183,7 +188,7 @@

    /**
     * èŽ·å–包前缀
     * 
     *
     * @param packageName åŒ…名称
     * @return åŒ…前缀名称
     */
@@ -196,8 +201,8 @@

    /**
     * æ ¹æ®åˆ—类型获取导入包
     * 
     * @param column åˆ—集合
     *
     * @param columns åˆ—集合
     * @return è¿”回需要导入的包列表
     */
    public static HashSet<String> getImportList(List<GenTableColumn> columns)
@@ -220,7 +225,7 @@

    /**
     * èŽ·å–权限前缀
     * 
     *
     * @param moduleName æ¨¡å—名称
     * @param businessName ä¸šåŠ¡åç§°
     * @return è¿”回权限前缀
@@ -228,13 +233,12 @@
    public static String getPermissionPrefix(String moduleName, String businessName)
    {
        return StringUtils.format("{}:{}", moduleName, businessName);

    }

    /**
     * èŽ·å–上级菜单ID字段
     * 
     * @param options ç”Ÿæˆå…¶ä»–选项
     *
     * @param paramsObj ç”Ÿæˆå…¶ä»–选项
     * @return ä¸Šçº§èœå•ID字段
     */
    public static String getParentMenuId(JSONObject paramsObj)
@@ -248,8 +252,8 @@

    /**
     * èŽ·å–树编码
     * 
     * @param options ç”Ÿæˆå…¶ä»–选项
     *
     * @param paramsObj ç”Ÿæˆå…¶ä»–选项
     * @return æ ‘编码
     */
    public static String getTreecode(JSONObject paramsObj)
@@ -263,8 +267,8 @@

    /**
     * èŽ·å–树父编码
     * 
     * @param options ç”Ÿæˆå…¶ä»–选项
     *
     * @param paramsObj ç”Ÿæˆå…¶ä»–选项
     * @return æ ‘父编码
     */
    public static String getTreeParentCode(JSONObject paramsObj)
@@ -278,8 +282,8 @@

    /**
     * èŽ·å–树名称
     * 
     * @param options ç”Ÿæˆå…¶ä»–选项
     *
     * @param paramsObj ç”Ÿæˆå…¶ä»–选项
     * @return æ ‘名称
     */
    public static String getTreeName(JSONObject paramsObj)
@@ -293,7 +297,7 @@

    /**
     * èŽ·å–需要在哪一列上面显示展开按钮
     * 
     *
     * @param genTable ä¸šåŠ¡è¡¨å¯¹è±¡
     * @return å±•å¼€æŒ‰é’®åˆ—序号
     */
@@ -317,4 +321,4 @@
        }
        return num;
    }
}
}

 ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -15,6 +15,8 @@
        <result property="businessName"   column="business_name"   />
        <result property="functionName"   column="function_name"   />
        <result property="functionAuthor" column="function_author" />
        <result property="genType"        column="gen_type"        />
        <result property="genPath"        column="gen_path"        />
        <result property="options"        column="options"         />
        <result property="createBy"       column="create_by"       />
        <result property="createTime"     column="create_time"     />
@@ -50,7 +52,7 @@
    </resultMap>
    
    <sql id="selectGenTableVo">
        select table_id, table_name, table_comment, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, options, create_by, create_time, update_by, update_time, remark from gen_table
        select table_id, table_name, table_comment, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
    </sql>
    
    <select id="selectGenTableList" parameterType="GenTable" resultMap="GenTableResult">
@@ -106,7 +108,7 @@
    </select>
    
    <select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
        SELECT t.table_id, t.table_name, t.table_comment, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.options, t.remark,
        SELECT t.table_id, t.table_name, t.table_comment, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
               c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
        FROM gen_table t
             LEFT JOIN gen_table_column c ON t.table_id = c.table_id
@@ -114,7 +116,7 @@
    </select>
    
    <select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
        SELECT t.table_id, t.table_name, t.table_comment, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.options, t.remark,
        SELECT t.table_id, t.table_name, t.table_comment, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
               c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
        FROM gen_table t
             LEFT JOIN gen_table_column c ON t.table_id = c.table_id
@@ -132,6 +134,8 @@
            <if test="businessName != null and businessName != ''">business_name,</if>
            <if test="functionName != null and functionName != ''">function_name,</if>
            <if test="functionAuthor != null and functionAuthor != ''">function_author,</if>
            <if test="genType != null and genType != ''">gen_type,</if>
            <if test="genPath != null and genPath != ''">gen_path,</if>
            <if test="remark != null and remark != ''">remark,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
            create_time
@@ -145,6 +149,8 @@
            <if test="businessName != null and businessName != ''">#{businessName},</if>
            <if test="functionName != null and functionName != ''">#{functionName},</if>
            <if test="functionAuthor != null and functionAuthor != ''">#{functionAuthor},</if>
            <if test="genType != null and genType != ''">#{genType},</if>
            <if test="genPath != null and genPath != ''">#{genPath},</if>
            <if test="remark != null and remark != ''">#{remark},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
            sysdate()
@@ -158,6 +164,8 @@
            <if test="tableComment != null and tableComment != ''">table_comment = #{tableComment},</if>
            <if test="className != null and className != ''">class_name = #{className},</if>
            <if test="functionAuthor != null and functionAuthor != ''">function_author = #{functionAuthor},</if>
            <if test="genType != null and genType != ''">gen_type = #{genType},</if>
            <if test="genPath != null and genPath != ''">gen_path = #{genPath},</if>
            <if test="tplCategory != null and tplCategory != ''">tpl_category = #{tplCategory},</if>
            <if test="packageName != null and packageName != ''">package_name = #{packageName},</if>
            <if test="moduleName != null and moduleName != ''">module_name = #{moduleName},</if>

 ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm

@@ -1,6 +1,6 @@
<template>

  <div class="app-container">

    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">

    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">

#foreach($column in $columns)

#if($column.query)

#set($dictType=$column.dictType)

@@ -51,23 +51,30 @@
#end

#end

      <el-form-item>

        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

      </el-form-item>

    </el-form>



    <el-row :gutter="10" class="mb8">

      <el-col :span="1.5">

        <el-button

          class="filter-item"

          type="primary"

          icon="el-icon-search"

          size="mini"

          @click="handleQuery"

        >搜索</el-button>

        <el-button

          class="filter-item"

          type="primary"

          icon="el-icon-plus"

          size="mini"

          @click="handleAdd"

          v-hasPermi="['${moduleName}:${businessName}:add']"

        >新增</el-button>

      </el-form-item>

    </el-form>

      </el-col>

      <div class="top-right-btn">

        <el-tooltip class="item" effect="dark" content="刷新" placement="top">

          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />

        </el-tooltip>

        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">

          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />

        </el-tooltip>

      </div>

    </el-row>



    <el-table

      v-loading="loading"

@@ -157,6 +164,23 @@
            <el-option label="请选择字典生成" value="" />

          </el-select>

        </el-form-item>

#elseif($column.htmlType == "checkbox" && "" != $dictType)

        <el-form-item label="${comment}">

          <el-checkbox-group v-model="form.${field}">

            <el-checkbox

              v-for="dict in ${field}Options"

              :key="dict.dictValue"

              :label="dict.dictValue">

              {{dict.dictLabel}}

            </el-checkbox>

          </el-checkbox-group>

        </el-form-item>

#elseif($column.htmlType == "checkbox" && $dictType)

        <el-form-item label="${comment}">

          <el-checkbox-group v-model="form.${field}">

            <el-checkbox>请选择字典生成</el-checkbox>

          </el-checkbox-group>

        </el-form-item>

#elseif($column.htmlType == "radio" && "" != $dictType)

        <el-form-item label="${comment}">

          <el-radio-group v-model="form.${field}">

@@ -212,6 +236,8 @@
    return {

      // é®ç½©å±‚

      loading: true,

      // æ˜¾ç¤ºæœç´¢æ¡ä»¶

      showSearch: true,

      // ${functionName}表格数据

      ${businessName}List: [],

      // ${functionName}树选项

@@ -236,7 +262,7 @@
      queryParams: {

#foreach ($column in $columns)

#if($column.query)

        $column.javaField: undefined#if($velocityCount != $columns.size()),#end

        $column.javaField: null#if($velocityCount != $columns.size()),#end



#end

#end

@@ -312,7 +338,7 @@
#end

    // $comment字典翻译

    ${column.javaField}Format(row, column) {

      return this.selectDictLabel(this.${column.javaField}Options, row.${column.javaField});

      return this.selectDictLabel#if($column.htmlType == "checkbox")s#end(this.${column.javaField}Options, row.${column.javaField});

    },

#end

#end

@@ -326,10 +352,13 @@
      this.form = {

#foreach ($column in $columns)

#if($column.htmlType == "radio")

        $column.javaField: "0"#if($velocityCount != $columns.size()),#end

        $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($velocityCount != $columns.size()),#end



#elseif($column.htmlType == "checkbox")

        $column.javaField: []#if($velocityCount != $columns.size()),#end



#else

        $column.javaField: undefined#if($velocityCount != $columns.size()),#end

        $column.javaField: null#if($velocityCount != $columns.size()),#end



#end

#end

@@ -356,20 +385,30 @@
    handleUpdate(row) {

      this.reset();

      this.getTreeselect();

      if (row != undefined) {

      if (row != null) {

        this.form.${treeParentCode} = row.${treeCode};

      }

      get${BusinessName}(row.${pkColumn.javaField}).then(response => {

        this.form = response.data;

#foreach ($column in $columns)

#if($column.htmlType == "checkbox")

        this.form.$column.javaField = this.form.${column.javaField}.split(",");

#end

#end

        this.open = true;

        this.title = "修改${functionName}";

      });

    },

    /** æäº¤æŒ‰é’® */

    submitForm: function() {

    submitForm() {

      this.#[[$]]#refs["form"].validate(valid => {

        if (valid) {

          if (this.form.${pkColumn.javaField} != undefined) {

#foreach ($column in $columns)

#if($column.htmlType == "checkbox")

          this.form.$column.javaField = this.form.${column.javaField}.join(",");

#end

#end

          if (this.form.${pkColumn.javaField} != null) {

            update${BusinessName}(this.form).then(response => {

              if (response.code === 200) {

                this.msgSuccess("修改成功");

@@ -404,4 +443,4 @@
    }

  }

};

</script>
</script>


 ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
#foreach($column in $columns)
#if($column.query)
#set($dictType=$column.dictType)
@@ -51,7 +51,7 @@
#end
#end
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
@@ -95,6 +95,14 @@
          v-hasPermi="['${moduleName}:${businessName}:export']"
        >导出</el-button>
      </el-col>
      <div class="top-right-btn">
        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
        </el-tooltip>
        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
        </el-tooltip>
      </div>
    </el-row>

    <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
@@ -185,6 +193,23 @@
            <el-option label="请选择字典生成" value="" />
          </el-select>
        </el-form-item>
#elseif($column.htmlType == "checkbox" && "" != $dictType)
        <el-form-item label="${comment}">
          <el-checkbox-group v-model="form.${field}">
            <el-checkbox
              v-for="dict in ${field}Options"
              :key="dict.dictValue"
              :label="dict.dictValue">
              {{dict.dictLabel}}
            </el-checkbox>
          </el-checkbox-group>
        </el-form-item>
#elseif($column.htmlType == "checkbox" && $dictType)
        <el-form-item label="${comment}">
          <el-checkbox-group v-model="form.${field}">
            <el-checkbox>请选择字典生成</el-checkbox>
          </el-checkbox-group>
        </el-form-item>
#elseif($column.htmlType == "radio" && "" != $dictType)
        <el-form-item label="${comment}">
          <el-radio-group v-model="form.${field}">
@@ -243,6 +268,8 @@
      single: true,
      // éžå¤šä¸ªç¦ç”¨
      multiple: true,
      // æ˜¾ç¤ºæœç´¢æ¡ä»¶
      showSearch: true,
      // æ€»æ¡æ•°
      total: 0,
      // ${functionName}表格数据
@@ -269,7 +296,7 @@
        pageSize: 10,
#foreach ($column in $columns)
#if($column.query)
        $column.javaField: undefined#if($velocityCount != $columns.size()),#end
        $column.javaField: null#if($velocityCount != $columns.size()),#end

#end
#end
@@ -326,7 +353,7 @@
#end
    // $comment字典翻译
    ${column.javaField}Format(row, column) {
      return this.selectDictLabel(this.${column.javaField}Options, row.${column.javaField});
      return this.selectDictLabel#if($column.htmlType == "checkbox")s#end(this.${column.javaField}Options, row.${column.javaField});
    },
#end
#end
@@ -340,10 +367,13 @@
      this.form = {
#foreach ($column in $columns)
#if($column.htmlType == "radio")
        $column.javaField: "0"#if($velocityCount != $columns.size()),#end
        $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($velocityCount != $columns.size()),#end

#elseif($column.htmlType == "checkbox")
        $column.javaField: []#if($velocityCount != $columns.size()),#end

#else
        $column.javaField: undefined#if($velocityCount != $columns.size()),#end
        $column.javaField: null#if($velocityCount != $columns.size()),#end

#end
#end
@@ -363,7 +393,7 @@
    // å¤šé€‰æ¡†é€‰ä¸­æ•°æ®
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.${pkColumn.javaField})
      this.single = selection.length!=1
      this.single = selection.length!==1
      this.multiple = !selection.length
    },
    /** æ–°å¢žæŒ‰é’®æ“ä½œ */
@@ -378,15 +408,25 @@
      const ${pkColumn.javaField} = row.${pkColumn.javaField} || this.ids
      get${BusinessName}(${pkColumn.javaField}).then(response => {
        this.form = response.data;
#foreach ($column in $columns)
#if($column.htmlType == "checkbox")
        this.form.$column.javaField = this.form.${column.javaField}.split(",");
#end
#end
        this.open = true;
        this.title = "修改${functionName}";
      });
    },
    /** æäº¤æŒ‰é’® */
    submitForm: function() {
    submitForm() {
      this.#[[$]]#refs["form"].validate(valid => {
        if (valid) {
          if (this.form.${pkColumn.javaField} != undefined) {
#foreach ($column in $columns)
#if($column.htmlType == "checkbox")
          this.form.$column.javaField = this.form.${column.javaField}.join(",");
#end
#end
          if (this.form.${pkColumn.javaField} != null) {
            update${BusinessName}(this.form).then(response => {
              if (response.code === 200) {
                this.msgSuccess("修改成功");
@@ -435,4 +475,4 @@
    }
  }
};
</script>
</script>

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java

@@ -66,7 +66,7 @@
     * æ‰§è¡ŒåŽ

     *

     * @param context å·¥ä½œæ‰§è¡Œä¸Šä¸‹æ–‡å¯¹è±¡

     * @param sysScheduleJob ç³»ç»Ÿè®¡åˆ’任务

     * @param sysJob ç³»ç»Ÿè®¡åˆ’任务

     */

    protected void after(JobExecutionContext context, SysJob sysJob, Exception e)

    {


 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java

@@ -6,14 +6,14 @@

/**
 * èœå•è¡¨ æ•°æ®å±‚
 * 
 *
 * @author ruoyi
 */
public interface SysMenuMapper
{
    /**
     * æŸ¥è¯¢ç³»ç»Ÿèœå•åˆ—表
     * 
     *
     * @param menu èœå•ä¿¡æ¯
     * @return èœå•åˆ—表
     */
@@ -21,14 +21,14 @@

    /**
     * æ ¹æ®ç”¨æˆ·æ‰€æœ‰æƒé™
     * 
     *
     * @return æƒé™åˆ—表
     */
    public List<String> selectMenuPerms();

    /**
     * æ ¹æ®ç”¨æˆ·æŸ¥è¯¢ç³»ç»Ÿèœå•åˆ—表
     * 
     *
     * @param menu èœå•ä¿¡æ¯
     * @return èœå•åˆ—表
     */
@@ -36,7 +36,7 @@

    /**
     * æ ¹æ®ç”¨æˆ·ID查询权限
     * 
     *
     * @param userId ç”¨æˆ·ID
     * @return æƒé™åˆ—表
     */
@@ -44,22 +44,22 @@

    /**
     * æ ¹æ®ç”¨æˆ·ID查询菜单
     * 
     *
     * @return èœå•åˆ—表
     */
    public List<SysMenu> selectMenuTreeAll();

    /**
     * æ ¹æ®ç”¨æˆ·ID查询菜单
     * 
     * @param username ç”¨æˆ·ID
     *
     * @param userId ç”¨æˆ·ID
     * @return èœå•åˆ—表
     */
    public List<SysMenu> selectMenuTreeByUserId(Long userId);

    /**
     * æ ¹æ®è§’色ID查询菜单树信息
     * 
     *
     * @param roleId è§’色ID
     * @return é€‰ä¸­èœå•åˆ—表
     */
@@ -67,7 +67,7 @@

    /**
     * æ ¹æ®èœå•ID查询信息
     * 
     *
     * @param menuId èœå•ID
     * @return èœå•ä¿¡æ¯
     */
@@ -75,7 +75,7 @@

    /**
     * æ˜¯å¦å­˜åœ¨èœå•å­èŠ‚点
     * 
     *
     * @param menuId èœå•ID
     * @return ç»“æžœ
     */
@@ -83,7 +83,7 @@

    /**
     * æ–°å¢žèœå•ä¿¡æ¯
     * 
     *
     * @param menu èœå•ä¿¡æ¯
     * @return ç»“æžœ
     */
@@ -91,7 +91,7 @@

    /**
     * ä¿®æ”¹èœå•ä¿¡æ¯
     * 
     *
     * @param menu èœå•ä¿¡æ¯
     * @return ç»“æžœ
     */
@@ -99,7 +99,7 @@

    /**
     * åˆ é™¤èœå•ç®¡ç†ä¿¡æ¯
     * 
     *
     * @param menuId èœå•ID
     * @return ç»“æžœ
     */
@@ -107,7 +107,7 @@

    /**
     * æ ¡éªŒèœå•åç§°æ˜¯å¦å”¯ä¸€
     * 
     *
     * @param menuName èœå•åç§°
     * @param parentId çˆ¶èœå•ID
     * @return ç»“æžœ

 ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -77,7 +77,7 @@
    
    <select id="checkDeptNameUnique" resultMap="SysDeptResult">
        <include refid="selectDeptVo"/>
        where dept_name=#{deptName} and parent_id = #{parentId}
        where dept_name=#{deptName} and parent_id = #{parentId} limit 1
    </select>
    
    <insert id="insertDept" parameterType="SysDept">

 ruoyi-ui/babel.config.js

@@ -1,5 +1,13 @@
module.exports = {
  presets: [
    '@vue/app'
  ]
    // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app
    '@vue/cli-plugin-babel/preset'
  ],
  'env': {
    'development': {
      // babel-plugin-dynamic-import-node plugin only does one thing by converting all import() to require().
      // This plugin can significantly increase the speed of hot updates, when you have a large number of pages.
      'plugins': ['dynamic-import-node']
    }
  }
}

 ruoyi-ui/package.json

@@ -5,7 +5,7 @@
  "author": "若依",
  "license": "MIT",
  "scripts": {
    "dev": "vue-cli-service serve --open",
    "dev": "vue-cli-service serve",
    "build:prod": "vue-cli-service build",
    "build:stage": "vue-cli-service build --mode staging",
    "preview": "node build/index.js --preview",
@@ -43,10 +43,11 @@
    "@riophae/vue-treeselect": "0.4.0",
    "axios": "0.18.1",
    "clipboard": "2.0.4",
    "core-js": "3.6.5",
    "echarts": "4.2.1",
    "element-ui": "2.13.2",
    "file-saver": "2.0.1",
    "js-beautify": "^1.10.2",
    "js-beautify": "1.10.2",
    "fuse.js": "3.4.4",
    "js-cookie": "2.2.0",
    "jsencrypt": "3.0.0-rc.1",
@@ -65,32 +66,31 @@
    "vuex": "3.1.0"
  },
  "devDependencies": {
    "@vue/cli-plugin-babel": "3.5.3",
    "@vue/cli-plugin-eslint": "^3.9.1",
    "@vue/cli-plugin-unit-jest": "3.5.3",
    "@vue/cli-service": "3.5.3",
    "@vue/cli-plugin-babel": "4.4.4",
    "@vue/cli-plugin-eslint": "4.4.4",
    "@vue/cli-plugin-unit-jest": "4.4.4",
    "@vue/cli-service": "4.4.4",
    "@vue/test-utils": "1.0.0-beta.29",
    "autoprefixer": "^9.5.1",
    "babel-core": "7.0.0-bridge.0",
    "babel-eslint": "10.0.1",
    "autoprefixer": "9.5.1",
    "babel-eslint": "10.1.0",
    "babel-jest": "23.6.0",
    "babel-plugin-dynamic-import-node": "2.3.3",
    "chalk": "2.4.2",
    "chokidar": "2.1.5",
    "connect": "3.6.6",
    "eslint": "5.15.3",
    "eslint-plugin-vue": "5.2.2",
    "eslint": "6.7.2",
    "eslint-plugin-vue": "6.2.2",
    "html-webpack-plugin": "3.2.0",
    "http-proxy-middleware": "^0.19.1",
    "husky": "1.3.1",
    "lint-staged": "8.1.5",
    "mockjs": "1.0.1-beta3",
    "node-sass": "^4.9.0",
    "plop": "2.3.0",
    "runjs": "^4.3.2",
    "sass-loader": "^7.1.0",
    "runjs": "4.3.2",
    "sass": "1.26.10",
    "sass-loader": "8.0.2",
    "script-ext-html-webpack-plugin": "2.1.3",
    "script-loader": "0.7.2",
    "serve-static": "^1.13.2",
    "serve-static": "1.13.2",
    "svg-sprite-loader": "4.1.3",
    "svgo": "1.2.0",
    "vue-template-compiler": "2.6.10"

 ruoyi-ui/src/api/tool/gen.js

@@ -42,6 +42,7 @@
    params: data
  })
}

// é¢„览生成代码
export function previewTable(tableId) {
  return request({
@@ -49,6 +50,7 @@
    method: 'get'
  })
}

// åˆ é™¤è¡¨æ•°æ®
export function delTable(tableId) {
  return request({
@@ -57,3 +59,11 @@
  })
}

// ç”Ÿæˆä»£ç ï¼ˆè‡ªå®šä¹‰è·¯å¾„）
export function genCode(tableName) {
  return request({
    url: '/tool/gen/genCode/' + tableName,
    method: 'get'
  })
}


 ruoyi-ui/src/assets/styles/ruoyi.scss

@@ -142,7 +142,28 @@
    padding-left: 15px;
    margin-bottom: 10px;
}
  

/* button color */
.el-button--cyan.is-active,
.el-button--cyan:active {
  background: #20B2AA;
  border-color: #20B2AA;
  color: #FFFFFF;
}

.el-button--cyan:focus,
.el-button--cyan:hover {
  background: #48D1CC;
  border-color: #48D1CC;
  color: #FFFFFF;
}

.el-button--cyan {
  background-color: #20B2AA;
  border-color: #20B2AA;
  color: #FFFFFF;
}

/* text color */
.text-navy {
    color: #1ab394;
@@ -198,4 +219,8 @@
    opacity: .8;
    color: #fff!important;
    background: #42b983!important;
}

.top-right-btn {
    float: right;
}

 ruoyi-ui/src/components/HeaderSearch/index.vue

@@ -167,7 +167,7 @@
    display: inline-block;
    vertical-align: middle;

    /deep/ .el-input__inner {
    ::v-deep .el-input__inner {
      border-radius: 0;
      border: 0;
      padding-left: 0;

 ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue

@@ -82,7 +82,7 @@
  position: relative;
  overflow: hidden;
  width: 100%;
  /deep/ {
  ::v-deep {
    .el-scrollbar__bar {
      bottom: 0px;
    }

 ruoyi-ui/src/main.js

@@ -18,7 +18,7 @@
import './permission' // permission control
import { getDicts } from "@/api/system/dict/data";
import { getConfigKey } from "@/api/system/config";
import { parseTime, resetForm, addDateRange, selectDictLabel, download, handleTree } from "@/utils/ruoyi";
import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/ruoyi";
import Pagination from "@/components/Pagination";

// å…¨å±€æ–¹æ³•æŒ‚è½½
@@ -28,6 +28,7 @@
Vue.prototype.resetForm = resetForm
Vue.prototype.addDateRange = addDateRange
Vue.prototype.selectDictLabel = selectDictLabel
Vue.prototype.selectDictLabels = selectDictLabels
Vue.prototype.download = download
Vue.prototype.handleTree = handleTree


 ruoyi-ui/src/utils/ruoyi.js

@@ -77,6 +77,21 @@
    return actions.join('');
}

// å›žæ˜¾æ•°æ®å­—典（字符串数组）
export function selectDictLabels(datas, value, separator) {
    var actions = [];
    var currentSeparator = undefined === separator ? "," : separator;
    var temp = value.split(currentSeparator);
    Object.keys(value.split(currentSeparator)).some((val) => {
        Object.keys(datas).some((key) => {
            if (datas[key].dictValue == ('' + temp[val])) {
                actions.push(datas[key].dictLabel + currentSeparator);
            }
        })
    })
    return actions.join('').substring(0, actions.join('').length - 1);
}

// é€šç”¨ä¸‹è½½æ–¹æ³•
export function download(fileName) {
    window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true;
@@ -98,10 +113,10 @@

// è½¬æ¢å­—符串，undefined,null等转化为""
export function praseStrEmpty(str) {
    if (!str || str == "undefined" || str == "null") {
        return "";
    }
    return str;
    if (!str || str == "undefined" || str == "null") {
        return "";
    }
    return str;
}

/**
@@ -120,15 +135,15 @@
    //对源数据深度克隆
    const cloneData = JSON.parse(JSON.stringify(data))
    //循环所有项
    const treeData =  cloneData.filter(father => {
      let branchArr = cloneData.filter(child => {
        //返回每一项的子级数组
        return father[id] === child[parentId]
      });
      branchArr.length > 0 ? father.children = branchArr : '';
      //返回第一层
      return father[parentId] === rootId;
    const treeData = cloneData.filter(father => {
        let branchArr = cloneData.filter(child => {
            //返回每一项的子级数组
            return father[id] === child[parentId]
        });
        branchArr.length > 0 ? father.children = branchArr : '';
        //返回第一层
        return father[parentId] === rootId;
    });
    return treeData != '' ? treeData : data;
  }
  
}


 ruoyi-ui/src/views/login.vue

@@ -29,7 +29,7 @@
          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
        </el-input>
        <div class="login-code">
          <img :src="codeUrl" @click="getCode" />
          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
        </div>
      </el-form-item>
      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
@@ -200,4 +200,7 @@
  font-size: 12px;
  letter-spacing: 1px;
}
.login-code-img {
  height: 38px;
}
</style>

 ruoyi-ui/src/views/monitor/job/index.vue

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="任务名称" prop="jobName">
        <el-input
          v-model="queryParams.jobName"
@@ -31,7 +31,7 @@
        </el-select>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
@@ -84,6 +84,14 @@
          v-hasPermi="['monitor:job:query']"
        >日志</el-button>
      </el-col>
      <div class="top-right-btn">
        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
        </el-tooltip>
        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
        </el-tooltip>
      </div>
    </el-row>

    <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange">
@@ -274,6 +282,8 @@
      single: true,
      // éžå¤šä¸ªç¦ç”¨
      multiple: true,
      // æ˜¾ç¤ºæœç´¢æ¡ä»¶
      showSearch: true,
      // æ€»æ¡æ•°
      total: 0,
      // å®šæ—¶ä»»åŠ¡è¡¨æ ¼æ•°æ®

 ruoyi-ui/src/views/monitor/job/log.vue

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="任务名称" prop="jobName">
        <el-input
          v-model="queryParams.jobName"
@@ -56,7 +56,7 @@
        ></el-date-picker>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
@@ -90,6 +90,14 @@
          v-hasPermi="['monitor:job:export']"
        >导出</el-button>
      </el-col>
      <div class="top-right-btn">
        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
        </el-tooltip>
        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
        </el-tooltip>
      </div>
    </el-row>

    <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange">
@@ -175,6 +183,8 @@
      ids: [],
      // éžå¤šä¸ªç¦ç”¨
      multiple: true,
      // æ˜¾ç¤ºæœç´¢æ¡ä»¶
      showSearch: true,
      // æ€»æ¡æ•°
      total: 0,
      // è°ƒåº¦æ—¥å¿—表格数据

 ruoyi-ui/src/views/monitor/logininfor/index.vue

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="登录地址" prop="ipaddr">
        <el-input
          v-model="queryParams.ipaddr"
@@ -50,7 +50,7 @@
        ></el-date-picker>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
@@ -84,6 +84,14 @@
          v-hasPermi="['system:logininfor:export']"
        >导出</el-button>
      </el-col>
      <div class="top-right-btn">
        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
        </el-tooltip>
        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
        </el-tooltip>
      </div>
    </el-row>

    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
@@ -126,6 +134,8 @@
      ids: [],
      // éžå¤šä¸ªç¦ç”¨
      multiple: true,
      // æ˜¾ç¤ºæœç´¢æ¡ä»¶
      showSearch: true,
      // æ€»æ¡æ•°
      total: 0,
      // è¡¨æ ¼æ•°æ®

 ruoyi-ui/src/views/monitor/online/index.vue

@@ -20,7 +20,7 @@
        />
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>

 ruoyi-ui/src/views/monitor/operlog/index.vue

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="系统模块" prop="title">
        <el-input
          v-model="queryParams.title"
@@ -66,7 +66,7 @@
        ></el-date-picker>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
@@ -100,6 +100,14 @@
          v-hasPermi="['system:config:export']"
        >导出</el-button>
      </el-col>
      <div class="top-right-btn">
        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
        </el-tooltip>
        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
        </el-tooltip>
      </div>
    </el-row>

    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
@@ -195,6 +203,8 @@
      ids: [],
      // éžå¤šä¸ªç¦ç”¨
      multiple: true,
      // æ˜¾ç¤ºæœç´¢æ¡ä»¶
      showSearch: true,
      // æ€»æ¡æ•°
      total: 0,
      // è¡¨æ ¼æ•°æ®

 ruoyi-ui/src/views/system/config/index.vue

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="参数名称" prop="configName">
        <el-input
          v-model="queryParams.configName"
@@ -44,7 +44,7 @@
        ></el-date-picker>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
@@ -97,6 +97,14 @@
          v-hasPermi="['system:config:remove']"
        >清理缓存</el-button>
      </el-col>
      <div class="top-right-btn">
        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
        </el-tooltip>
        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
        </el-tooltip>
      </div>
    </el-row>

    <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
@@ -188,6 +196,8 @@
      single: true,
      // éžå¤šä¸ªç¦ç”¨
      multiple: true,
      // æ˜¾ç¤ºæœç´¢æ¡ä»¶
      showSearch: true,
      // æ€»æ¡æ•°
      total: 0,
      // å‚数表格数据
@@ -356,4 +366,4 @@
    }
  }
};
</script>
</script>

 ruoyi-ui/src/views/system/dept/index.vue

@@ -1,7 +1,7 @@
<template>
  <div class="app-container">
    <el-form :inline="true">
      <el-form-item label="部门名称">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
      <el-form-item label="部门名称" prop="deptName">
        <el-input
          v-model="queryParams.deptName"
          placeholder="请输入部门名称"
@@ -10,7 +10,7 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="状态">
      <el-form-item label="状态" prop="status">
        <el-select v-model="queryParams.status" placeholder="部门状态" clearable size="small">
          <el-option
            v-for="dict in statusOptions"
@@ -21,23 +21,30 @@
        </el-select>
      </el-form-item>
      <el-form-item>
        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>

    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button
          class="filter-item"
          type="primary"
          icon="el-icon-search"
          size="mini"
          @click="handleQuery"
        >搜索</el-button>
        <el-button
          class="filter-item"
          type="primary"
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['system:dept:add']"
        >新增</el-button>
      </el-form-item>
    </el-form>
      </el-col>
      <div class="top-right-btn">
        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
        </el-tooltip>
        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
        </el-tooltip>
      </div>
    </el-row>

    <el-table
      v-loading="loading"
@@ -56,17 +63,17 @@
      </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
          <el-button 
            size="mini" 
            type="text" 
            icon="el-icon-edit" 
            @click="handleUpdate(scope.row)"
            v-hasPermi="['system:dept:edit']"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-plus"
          <el-button 
            size="mini" 
            type="text" 
            icon="el-icon-plus" 
            @click="handleAdd(scope.row)"
            v-hasPermi="['system:dept:add']"
          >新增</el-button>
@@ -149,6 +156,8 @@
    return {
      // é®ç½©å±‚
      loading: true,
      // æ˜¾ç¤ºæœç´¢æ¡ä»¶
      showSearch: true,
      // è¡¨æ ¼æ ‘数据
      deptList: [],
      // éƒ¨é—¨æ ‘选项
@@ -247,6 +256,11 @@
    handleQuery() {
      this.getList();
    },
    /** é‡ç½®æŒ‰é’®æ“ä½œ */
    resetQuery() {
      this.resetForm("queryForm");
      this.handleQuery();
    },
    /** æ–°å¢žæŒ‰é’®æ“ä½œ */
    handleAdd(row) {
      this.reset();
@@ -310,4 +324,4 @@
    }
  }
};
</script>
</script>

 ruoyi-ui/src/views/system/dict/data.vue

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true">
    <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
      <el-form-item label="字典名称" prop="dictType">
        <el-select v-model="queryParams.dictType" size="small">
          <el-option
@@ -31,7 +31,7 @@
        </el-select>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
@@ -75,6 +75,14 @@
          v-hasPermi="['system:dict:export']"
        >导出</el-button>
      </el-col>
      <div class="top-right-btn">
        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
        </el-tooltip>
        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
        </el-tooltip>
      </div>
    </el-row>

    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
@@ -170,6 +178,8 @@
      single: true,
      // éžå¤šä¸ªç¦ç”¨
      multiple: true,
      // æ˜¾ç¤ºæœç´¢æ¡ä»¶
      showSearch: true,
      // æ€»æ¡æ•°
      total: 0,
      // å­—典表格数据
@@ -348,4 +358,4 @@
    }
  }
};
</script>
</script>

 ruoyi-ui/src/views/system/dict/index.vue

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="字典名称" prop="dictName">
        <el-input
          v-model="queryParams.dictName"
@@ -50,7 +50,7 @@
        ></el-date-picker>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
@@ -103,6 +103,14 @@
          v-hasPermi="['system:dict:remove']"
        >清理缓存</el-button>
      </el-col>
      <div class="top-right-btn">
        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
        </el-tooltip>
        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
        </el-tooltip>
      </div>
    </el-row>

    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
@@ -196,6 +204,8 @@
      single: true,
      // éžå¤šä¸ªç¦ç”¨
      multiple: true,
      // æ˜¾ç¤ºæœç´¢æ¡ä»¶
      showSearch: true,
      // æ€»æ¡æ•°
      total: 0,
      // å­—典表格数据
@@ -360,4 +370,4 @@
    }
  }
};
</script>
</script>

 ruoyi-ui/src/views/system/menu/index.vue

@@ -1,7 +1,7 @@
<template>
  <div class="app-container">
    <el-form :inline="true">
      <el-form-item label="菜单名称">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
      <el-form-item label="菜单名称" prop="menuName">
        <el-input
          v-model="queryParams.menuName"
          placeholder="请输入菜单名称"
@@ -10,7 +10,7 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="状态">
      <el-form-item label="状态" prop="status">
        <el-select v-model="queryParams.status" placeholder="菜单状态" clearable size="small">
          <el-option
            v-for="dict in statusOptions"
@@ -21,10 +21,30 @@
        </el-select>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:menu:add']">新增</el-button>
        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>

    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button
          type="primary"
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['system:menu:add']"
        >新增</el-button>
      </el-col>
      <div class="top-right-btn">
        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
        </el-tooltip>
        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
        </el-tooltip>
      </div>
    </el-row>

    <el-table
      v-loading="loading"
@@ -197,6 +217,8 @@
    return {
      // é®ç½©å±‚
      loading: true,
      // æ˜¾ç¤ºæœç´¢æ¡ä»¶
      showSearch: true,
      // èœå•è¡¨æ ¼æ ‘数据
      menuList: [],
      // èœå•æ ‘选项
@@ -310,6 +332,11 @@
    handleQuery() {
      this.getList();
    },
    /** é‡ç½®æŒ‰é’®æ“ä½œ */
    resetQuery() {
      this.resetForm("queryForm");
      this.handleQuery();
    },
    /** æ–°å¢žæŒ‰é’®æ“ä½œ */
    handleAdd(row) {
      this.reset();

 ruoyi-ui/src/views/system/notice/index.vue

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="公告标题" prop="noticeTitle">
        <el-input
          v-model="queryParams.noticeTitle"
@@ -30,7 +30,7 @@
        </el-select>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
@@ -65,6 +65,14 @@
          v-hasPermi="['system:notice:remove']"
        >删除</el-button>
      </el-col>
      <div class="top-right-btn">
        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
        </el-tooltip>
        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
        </el-tooltip>
      </div>
    </el-row>

    <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
@@ -190,6 +198,8 @@
      single: true,
      // éžå¤šä¸ªç¦ç”¨
      multiple: true,
      // æ˜¾ç¤ºæœç´¢æ¡ä»¶
      showSearch: true,
      // æ€»æ¡æ•°
      total: 0,
      // å…¬å‘Šè¡¨æ ¼æ•°æ®
@@ -338,4 +348,4 @@
    }
  }
};
</script>
</script>

 ruoyi-ui/src/views/system/post/index.vue

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="岗位编码" prop="postCode">
        <el-input
          v-model="queryParams.postCode"
@@ -30,7 +30,7 @@
        </el-select>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
@@ -74,6 +74,14 @@
          v-hasPermi="['system:post:export']"
        >导出</el-button>
      </el-col>
      <div class="top-right-btn">
        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
        </el-tooltip>
        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
        </el-tooltip>
      </div>
    </el-row>

    <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
@@ -107,7 +115,7 @@
        </template>
      </el-table-column>
    </el-table>

    
    <pagination
      v-show="total>0"
      :total="total"
@@ -164,6 +172,8 @@
      single: true,
      // éžå¤šä¸ªç¦ç”¨
      multiple: true,
      // æ˜¾ç¤ºæœç´¢æ¡ä»¶
      showSearch: true,
      // æ€»æ¡æ•°
      total: 0,
      // å²—位表格数据
@@ -320,4 +330,4 @@
    }
  }
};
</script>
</script>

 ruoyi-ui/src/views/system/role/index.vue

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true">
    <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
      <el-form-item label="角色名称" prop="roleName">
        <el-input
          v-model="queryParams.roleName"
@@ -50,7 +50,7 @@
        ></el-date-picker>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
@@ -91,9 +91,17 @@
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          v-hasPermi="['system:post:export']"
          v-hasPermi="['system:role:export']"
        >导出</el-button>
      </el-col>
      <div class="top-right-btn">
        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
        </el-tooltip>
        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
        </el-tooltip>
      </div>
    </el-row>

    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
@@ -249,6 +257,8 @@
      single: true,
      // éžå¤šä¸ªç¦ç”¨
      multiple: true,
      // æ˜¾ç¤ºæœç´¢æ¡ä»¶
      showSearch: true,
      // æ€»æ¡æ•°
      total: 0,
      // è§’色表格数据

 ruoyi-ui/src/views/system/user/index.vue

@@ -27,7 +27,7 @@
      </el-col>
      <!--用户数据-->
      <el-col :span="20" :xs="24">
        <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
          <el-form-item label="用户名称" prop="userName">
            <el-input
              v-model="queryParams.userName"
@@ -77,7 +77,7 @@
            ></el-date-picker>
          </el-form-item>
          <el-form-item>
            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
            <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
          </el-form-item>
        </el-form>
@@ -130,6 +130,14 @@
              v-hasPermi="['system:user:export']"
            >导出</el-button>
          </el-col>
          <div class="top-right-btn">
            <el-tooltip class="item" effect="dark" content="刷新" placement="top">
              <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
            </el-tooltip>
            <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
              <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
            </el-tooltip>
          </div>
        </el-row>

        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
@@ -356,6 +364,8 @@
      single: true,
      // éžå¤šä¸ªç¦ç”¨
      multiple: true,
      // æ˜¾ç¤ºæœç´¢æ¡ä»¶
      showSearch: true,
      // æ€»æ¡æ•°
      total: 0,
      // ç”¨æˆ·è¡¨æ ¼æ•°æ®

 ruoyi-ui/src/views/tool/gen/genInfoForm.vue

@@ -6,7 +6,7 @@
          <span slot="label">生成模板</span>
          <el-select v-model="info.tplCategory">
            <el-option label="单表（增删改查）" value="crud" />
            <el-option label="树表（增删改查）" value="tree"/>
            <el-option label="树表（增删改查）" value="tree" />
          </el-select>
        </el-form-item>
      </el-col>
@@ -60,14 +60,56 @@
      </el-col>

      <el-col :span="12">
        <el-form-item prop="functionName">
        <el-form-item>
          <span slot="label">
            ä¸Šçº§èœå•
            <el-tooltip content="分配到指定菜单下，例如 ç³»ç»Ÿç®¡ç†" placement="top">
              <i class="el-icon-question"></i>
            </el-tooltip>
          </span>
          <treeselect :append-to-body="true" v-model="info.parentMenuId" :options="menus" :normalizer="normalizer" :show-count="true" placeholder="请选择系统菜单"/>
          <treeselect
            :append-to-body="true"
            v-model="info.parentMenuId"
            :options="menus"
            :normalizer="normalizer"
            :show-count="true"
            placeholder="请选择系统菜单"
          />
        </el-form-item>
      </el-col>

      <el-col :span="12">
        <el-form-item prop="genType">
          <span slot="label">
            ç”Ÿæˆä»£ç æ–¹å¼
            <el-tooltip content="默认为zip压缩包下载，也可以自定义生成路径" placement="top">
              <i class="el-icon-question"></i>
            </el-tooltip>
          </span>
          <el-radio v-model="info.genType" label="0">zip压缩包</el-radio>
          <el-radio v-model="info.genType" label="1">自定义路径</el-radio>
        </el-form-item>
      </el-col>

      <el-col :span="24" v-if="info.genType == '1'">
        <el-form-item prop="genPath">
          <span slot="label">
            è‡ªå®šä¹‰è·¯å¾„
            <el-tooltip content="填写磁盘绝对路径，若不填写，则生成到当前Web项目下" placement="top">
              <i class="el-icon-question"></i>
            </el-tooltip>
          </span>
          <el-input v-model="info.genPath">
            <el-dropdown slot="append">
              <el-button type="primary">
                æœ€è¿‘路径快速选择
                <i class="el-icon-arrow-down el-icon--right"></i>
              </el-button>
              <el-dropdown-menu slot="dropdown">
                <el-dropdown-item @click.native="info.genPath = '/'">恢复默认的生成基础路径</el-dropdown-item>
              </el-dropdown-menu>
            </el-dropdown>
          </el-input>
        </el-form-item>
      </el-col>
    </el-row>
@@ -165,7 +207,7 @@
        ],
        functionName: [
          { required: true, message: "请输入生成功能名", trigger: "blur" }
        ]
        ],
      }
    };
  },

 ruoyi-ui/src/views/tool/gen/index.vue

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="表名称" prop="tableName">
        <el-input
          v-model="queryParams.tableName"
@@ -32,7 +32,7 @@
        ></el-date-picker>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
@@ -76,6 +76,14 @@
          v-hasPermi="['tool:gen:remove']"
        >删除</el-button>
      </el-col>
      <div class="top-right-btn">
        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
        </el-tooltip>
        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
        </el-tooltip>
      </div>
    </el-row>

    <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
@@ -166,7 +174,7 @@
</template>

<script>
import { listTable, previewTable, delTable } from "@/api/tool/gen";
import { listTable, previewTable, delTable, genCode } from "@/api/tool/gen";
import importTable from "./importTable";
import { downLoadZip } from "@/utils/zipdownload";
export default {
@@ -186,6 +194,8 @@
      single: true,
      // éžå¤šä¸ªç¦ç”¨
      multiple: true,
      // æ˜¾ç¤ºæœç´¢æ¡ä»¶
      showSearch: true,
      // æ€»æ¡æ•°
      total: 0,
      // è¡¨æ•°æ®
@@ -241,7 +251,13 @@
        this.msgError("请选择要生成的数据");
        return;
      }
      downLoadZip("/tool/gen/batchGenCode?tables=" + tableNames, "ruoyi");
      if(row.genType === "1") {
        genCode(row.tableName).then(response => {
          this.msgSuccess("成功生成到自定义路径：" + row.genPath);
        });
      } else {
        downLoadZip("/tool/gen/batchGenCode?tables=" + tableNames, "ruoyi");
      }
    },
    /** æ‰“开导入表弹窗 */
    openImportTable() {

 ruoyi-ui/vue.config.js

@@ -30,6 +30,7 @@
  devServer: {
    host: '0.0.0.0',
    port: port,
    open: true,
    proxy: {
      // detail: https://cli.vuejs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
@@ -68,17 +69,6 @@
      .loader('svg-sprite-loader')
      .options({
        symbolId: 'icon-[name]'
      })
      .end()

    // set preserveWhitespace
    config.module
      .rule('vue')
      .use('vue-loader')
      .loader('vue-loader')
      .tap(options => {
        options.compilerOptions.preserveWhitespace = true
        return options
      })
      .end()


 sql/ry_20200724.sql

ÎļþÃû´Ó sql/ry_20200629.sql ÐÞ¸Ä
@@ -120,7 +120,7 @@
-- ----------------------------
-- åˆå§‹åŒ–-角色信息表数据
-- ----------------------------
insert into sys_role values('1', '系统管理员',  'admin',  1, 1, '0', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统管理员');
insert into sys_role values('1', '超级管理员',  'admin',  1, 1, '0', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '超级管理员');
insert into sys_role values('2', '普通角色',    'common', 2, 2, '0', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '普通角色');


@@ -635,6 +635,8 @@
  business_name     varchar(30)                                comment '生成业务名',
  function_name     varchar(50)                                comment '生成功能名',
  function_author   varchar(50)                                comment '生成功能作者',
  gen_type          char(1)         default '0'                comment '生成代码方式（0zip压缩包 1自定义路径）',
  gen_path          varchar(200)    default '/'                comment '生成路径（不填默认项目路径）',
  options           varchar(1000)                              comment '其它生成选项',
  create_by         varchar(64)     default ''                 comment '创建者',
  create_time         datetime                                   comment '创建时间',