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

疯狂的狮子li

2021-12-13 29c46a15f9cb4fa3ea0f417cca0ac76ff35bd135

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


 Conflicts:

	README.md

	pom.xml

	ruoyi-admin/pom.xml

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

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

	ruoyi-common/pom.xml

	ruoyi-framework/pom.xml

	ruoyi-generator/pom.xml

	ruoyi-job/pom.xml

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

	ruoyi-system/pom.xml

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

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

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

	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

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

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

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

	ruoyi-ui/package.json

	ruoyi-ui/src/directive/index.js

	ruoyi-ui/src/plugins/download.js

	ruoyi-ui/src/views/index.vue

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

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

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

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

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

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -158,7 +158,7 @@
                router.setPath("/inner");
                List<RouterVo> childrenList = new ArrayList<RouterVo>();
                RouterVo children = new RouterVo();
                String routerPath = StringUtils.replaceEach(menu.getPath(), new String[]{Constants.HTTP, Constants.HTTPS}, new String[]{"", ""});
                String routerPath = innerLinkReplaceEach(menu.getPath());
                children.setPath(routerPath);
                children.setComponent(UserConstants.INNER_LINK);
                children.setName(StringUtils.capitalize(routerPath));
@@ -302,7 +302,7 @@
        String routerPath = menu.getPath();
        // å†…链打开外网方式
        if (menu.getParentId().intValue() != 0 && isInnerLink(menu)) {
            routerPath = StringUtils.replaceEach(routerPath, new String[]{Constants.HTTP, Constants.HTTPS}, new String[]{"", ""});
            routerPath = innerLinkReplaceEach(routerPath);
        }
        // éžå¤–链并且是一级目录（类型为目录）
        if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType())
@@ -420,4 +420,15 @@
    private boolean hasChild(List<SysMenu> list, SysMenu t) {
        return getChildList(list, t).size() > 0;
    }

    /**
     * å†…链域名特殊字符替换
     *
     * @return
     */
    public String innerLinkReplaceEach(String path)
    {
        return StringUtils.replaceEach(path, new String[] { Constants.HTTP, Constants.HTTPS },
                new String[] { "", "" });
    }
}

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

@@ -52,7 +52,7 @@
    <select id="selectDeptListByRoleId" resultType="Long">
        select d.dept_id
        from sys_dept d
        left join sys_role_dept rd on d.dept_id = rd.dept_id
            left join sys_role_dept rd on d.dept_id = rd.dept_id
        where rd.role_id = #{roleId}
            <if test="deptCheckStrictly">
                and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})

 ruoyi-ui/package.json

@@ -38,7 +38,7 @@
  "dependencies": {
    "@riophae/vue-treeselect": "0.4.0",
    "axios": "0.24.0",
    "clipboard": "2.0.6",
    "clipboard": "2.0.8",
    "core-js": "3.19.1",
    "echarts": "4.9.0",
    "element-ui": "2.15.6",

 ruoyi-ui/src/components/Crontab/day.vue

@@ -2,7 +2,7 @@
    <el-form size="small">
        <el-form-item>
            <el-radio v-model='radioValue' :label="1">
                æ—¥ï¼Œå…è®¸çš„通配符[, - * / L M]
                æ—¥ï¼Œå…è®¸çš„通配符[, - * ? / L W]
            </el-radio>
        </el-form-item>

@@ -15,23 +15,23 @@
        <el-form-item>
            <el-radio v-model='radioValue' :label="3">
                å‘¨æœŸä»Ž
                <el-input-number v-model='cycle01' :min="0" :max="31" /> -
                <el-input-number v-model='cycle02' :min="0" :max="31" /> æ—¥
                <el-input-number v-model='cycle01' :min="1" :max="30" /> -
                <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : 2" :max="31" /> æ—¥
            </el-radio>
        </el-form-item>

        <el-form-item>
            <el-radio v-model='radioValue' :label="4">
                ä»Ž
                <el-input-number v-model='average01' :min="0" :max="31" /> å·å¼€å§‹ï¼Œæ¯
                <el-input-number v-model='average02' :min="0" :max="31" /> æ—¥æ‰§è¡Œä¸€æ¬¡
                <el-input-number v-model='average01' :min="1" :max="30" /> å·å¼€å§‹ï¼Œæ¯
                <el-input-number v-model='average02' :min="1" :max="31 - average01 || 1" /> æ—¥æ‰§è¡Œä¸€æ¬¡
            </el-radio>
        </el-form-item>

        <el-form-item>
            <el-radio v-model='radioValue' :label="5">
                æ¯æœˆ
                <el-input-number v-model='workday' :min="0" :max="31" /> å·æœ€è¿‘的那个工作日
                <el-input-number v-model='workday' :min="1" :max="31" /> å·æœ€è¿‘的那个工作日
            </el-radio>
        </el-form-item>

@@ -72,31 +72,22 @@
        // å•é€‰æŒ‰é’®å€¼å˜åŒ–æ—¶
        radioChange() {
            ('day rachange');
            if (this.radioValue === 1) {
                this.$emit('update', 'day', '*', 'day');
                this.$emit('update', 'week', '?', 'day');
                this.$emit('update', 'month', '*', 'day');
            } else {
                if (this.cron.hour === '*') {
                    this.$emit('update', 'hour', '0', 'day');
                }
                if (this.cron.min === '*') {
                    this.$emit('update', 'min', '0', 'day');
                }
                if (this.cron.second === '*') {
                    this.$emit('update', 'second', '0', 'day');
                }
            if (this.radioValue !== 2 && this.cron.week !== '?') {
                this.$emit('update', 'week', '?', 'day')
            }

            switch (this.radioValue) {
                case 1:
                    this.$emit('update', 'day', '*');
                    break;
                case 2:
                    this.$emit('update', 'day', '?');
                    break;
                case 3:
                    this.$emit('update', 'day', this.cycle01 + '-' + this.cycle02);
                    this.$emit('update', 'day', this.cycleTotal);
                    break;
                case 4:
                    this.$emit('update', 'day', this.average01 + '/' + this.average02);
                    this.$emit('update', 'day', this.averageTotal);
                    break;
                case 5:
                    this.$emit('update', 'day', this.workday + 'W');
@@ -125,7 +116,7 @@
        // æœ€è¿‘工作日值变化时
        workdayChange() {
            if (this.radioValue == '5') {
                this.$emit('update', 'day', this.workday + 'W');
                this.$emit('update', 'day', this.workdayCheck + 'W');
            }
        },
        // checkbox值变化时
@@ -133,19 +124,10 @@
            if (this.radioValue == '7') {
                this.$emit('update', 'day', this.checkboxString);
            }
        },
        // çˆ¶ç»„件传递的week发生变化触发
        weekChange() {
            //判断week值与day不能同时为“?”
            if (this.cron.week == '?' && this.radioValue == '2') {
                this.radioValue = '1';
            } else if (this.cron.week !== '?' && this.radioValue != '2') {
                this.radioValue = '2';
            }
        },
        }
    },
    watch: {
        "radioValue": "radioChange",
        'radioValue': 'radioChange',
        'cycleTotal': 'cycleChange',
        'averageTotal': 'averageChange',
        'workdayCheck': 'workdayChange',
@@ -154,20 +136,20 @@
    computed: {
        // è®¡ç®—两个周期值
        cycleTotal: function () {
            this.cycle01 = this.checkNum(this.cycle01, 1, 31)
            this.cycle02 = this.checkNum(this.cycle02, 1, 31)
            return this.cycle01 + '-' + this.cycle02;
            const cycle01 = this.checkNum(this.cycle01, 1, 30)
            const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : 2, 31, 31)
            return cycle01 + '-' + cycle02;
        },
        // è®¡ç®—平均用到的值
        averageTotal: function () {
            this.average01 = this.checkNum(this.average01, 1, 31)
            this.average02 = this.checkNum(this.average02, 1, 31)
            return this.average01 + '/' + this.average02;
            const average01 = this.checkNum(this.average01, 1, 30)
            const average02 = this.checkNum(this.average02, 1, 31 - average01 || 0)
            return average01 + '/' + average02;
        },
        // è®¡ç®—工作日格式
        workdayCheck: function () {
            this.workday = this.checkNum(this.workday, 1, 31)
            return this.workday;
            const workday = this.checkNum(this.workday, 1, 31)
            return workday;
        },
        // è®¡ç®—勾选的checkbox值合集
        checkboxString: function () {

 ruoyi-ui/src/components/Crontab/hour.vue

@@ -9,16 +9,16 @@
        <el-form-item>

            <el-radio v-model='radioValue' :label="2">

                å‘¨æœŸä»Ž

                <el-input-number v-model='cycle01' :min="0" :max="60" /> -

                <el-input-number v-model='cycle02' :min="0" :max="60" /> å°æ—¶

                <el-input-number v-model='cycle01' :min="0" :max="22" /> -

                <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : 1" :max="23" /> å°æ—¶

            </el-radio>

        </el-form-item>



        <el-form-item>

            <el-radio v-model='radioValue' :label="3">

                ä»Ž

                <el-input-number v-model='average01' :min="0" :max="60" /> å°æ—¶å¼€å§‹ï¼Œæ¯

                <el-input-number v-model='average02' :min="0" :max="60" /> å°æ—¶æ‰§è¡Œä¸€æ¬¡

                <el-input-number v-model='average01' :min="0" :max="22" /> å°æ—¶å¼€å§‹ï¼Œæ¯

                <el-input-number v-model='average02' :min="1" :max="23 - average01 || 0" /> å°æ—¶æ‰§è¡Œä¸€æ¬¡

            </el-radio>

        </el-form-item>



@@ -51,23 +51,15 @@
    methods: {

        // å•é€‰æŒ‰é’®å€¼å˜åŒ–æ—¶

        radioChange() {

            if (this.radioValue === 1) {

                this.$emit('update', 'hour', '*', 'hour');

                this.$emit('update', 'day', '*', 'hour');

            } else {

                if (this.cron.min === '*') {

                    this.$emit('update', 'min', '0', 'hour');

                }

                if (this.cron.second === '*') {

                    this.$emit('update', 'second', '0', 'hour');

                }

            }

            switch (this.radioValue) {

                case 1:

            this.$emit('update', 'hour', '*')

            break;

                case 2:

                    this.$emit('update', 'hour', this.cycle01 + '-' + this.cycle02);

                    this.$emit('update', 'hour', this.cycleTotal);

                    break;

                case 3:

                    this.$emit('update', 'hour', this.average01 + '/' + this.average02);

                    this.$emit('update', 'hour', this.averageTotal);

                    break;

                case 4:

                    this.$emit('update', 'hour', this.checkboxString);

@@ -94,7 +86,7 @@
        }

    },

    watch: {

        "radioValue": "radioChange",

        'radioValue': 'radioChange',

        'cycleTotal': 'cycleChange',

        'averageTotal': 'averageChange',

        'checkboxString': 'checkboxChange'

@@ -102,15 +94,15 @@
    computed: {

        // è®¡ç®—两个周期值

        cycleTotal: function () {

            this.cycle01 = this.checkNum(this.cycle01, 0, 23)

            this.cycle02 = this.checkNum(this.cycle02, 0, 23)

            return this.cycle01 + '-' + this.cycle02;

            const cycle01 = this.checkNum(this.cycle01, 0, 22)

            const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : 1, 23)

            return cycle01 + '-' + cycle02;

        },

        // è®¡ç®—平均用到的值

        averageTotal: function () {

            this.average01 = this.checkNum(this.average01, 0, 23)

            this.average02 = this.checkNum(this.average02, 1, 23)

            return this.average01 + '/' + this.average02;

            const average01 = this.checkNum(this.average01, 0, 22)

            const average02 = this.checkNum(this.average02, 1, 23 - average01 || 0)

            return average01 + '/' + average02;

        },

        // è®¡ç®—勾选的checkbox值合集

        checkboxString: function () {


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

@@ -2,7 +2,12 @@
  <div>
    <el-tabs type="border-card">
      <el-tab-pane label="秒" v-if="shouldHide('second')">
        <CrontabSecond @update="updateCrontabValue" :check="checkNumber" ref="cronsecond" />
        <CrontabSecond
          @update="updateCrontabValue"
          :check="checkNumber"
          :cron="crontabValueObj"
          ref="cronsecond"
        />
      </el-tab-pane>

      <el-tab-pane label="分钟" v-if="shouldHide('min')">

 ruoyi-ui/src/components/Crontab/min.vue

@@ -9,16 +9,16 @@
        <el-form-item>

            <el-radio v-model='radioValue' :label="2">

                å‘¨æœŸä»Ž

                <el-input-number v-model='cycle01' :min="0" :max="60" /> -

                <el-input-number v-model='cycle02' :min="0" :max="60" /> åˆ†é’Ÿ

                <el-input-number v-model='cycle01' :min="0" :max="58" /> -

                <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : 1" :max="59" /> åˆ†é’Ÿ

            </el-radio>

        </el-form-item>



        <el-form-item>

            <el-radio v-model='radioValue' :label="3">

                ä»Ž

                <el-input-number v-model='average01' :min="0" :max="60" /> åˆ†é’Ÿå¼€å§‹ï¼Œæ¯

                <el-input-number v-model='average02' :min="0" :max="60" /> åˆ†é’Ÿæ‰§è¡Œä¸€æ¬¡

                <el-input-number v-model='average01' :min="0" :max="58" /> åˆ†é’Ÿå¼€å§‹ï¼Œæ¯

                <el-input-number v-model='average02' :min="1" :max="59 - average01 || 0" /> åˆ†é’Ÿæ‰§è¡Œä¸€æ¬¡

            </el-radio>

        </el-form-item>



@@ -52,19 +52,15 @@
    methods: {

        // å•é€‰æŒ‰é’®å€¼å˜åŒ–æ—¶

        radioChange() {

            if (this.radioValue !== 1 && this.cron.second === '*') {

                this.$emit('update', 'second', '0', 'min');

            }

            switch (this.radioValue) {

                case 1:

                    this.$emit('update', 'min', '*', 'min');

                    this.$emit('update', 'hour', '*', 'min');

                    break;

                case 2:

                    this.$emit('update', 'min', this.cycle01 + '-' + this.cycle02, 'min');

                    this.$emit('update', 'min', this.cycleTotal, 'min');

                    break;

                case 3:

                    this.$emit('update', 'min', this.average01 + '/' + this.average02, 'min');

                    this.$emit('update', 'min', this.averageTotal, 'min');

                    break;

                case 4:

                    this.$emit('update', 'min', this.checkboxString, 'min');

@@ -92,7 +88,7 @@


    },

    watch: {

        "radioValue": "radioChange",

        'radioValue': 'radioChange',

        'cycleTotal': 'cycleChange',

        'averageTotal': 'averageChange',

        'checkboxString': 'checkboxChange',

@@ -100,15 +96,15 @@
    computed: {

        // è®¡ç®—两个周期值

        cycleTotal: function () {

            this.cycle01 = this.checkNum(this.cycle01, 0, 59)

            this.cycle02 = this.checkNum(this.cycle02, 0, 59)

            return this.cycle01 + '-' + this.cycle02;

            const cycle01 = this.checkNum(this.cycle01, 0, 58)

            const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : 1, 59)

            return cycle01 + '-' + cycle02;

        },

        // è®¡ç®—平均用到的值

        averageTotal: function () {

            this.average01 = this.checkNum(this.average01, 0, 59)

            this.average02 = this.checkNum(this.average02, 1, 59)

            return this.average01 + '/' + this.average02;

            const average01 = this.checkNum(this.average01, 0, 58)

            const average02 = this.checkNum(this.average02, 1, 59 - average01 || 0)

            return average01 + '/' + average02;

        },

        // è®¡ç®—勾选的checkbox值合集

        checkboxString: function () {


 ruoyi-ui/src/components/Crontab/month.vue

@@ -9,16 +9,16 @@
        <el-form-item>
            <el-radio v-model='radioValue' :label="2">
                å‘¨æœŸä»Ž
                <el-input-number v-model='cycle01' :min="1" :max="12" /> -
                <el-input-number v-model='cycle02' :min="1" :max="12" /> æœˆ
                <el-input-number v-model='cycle01' :min="1" :max="11" /> -
                <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : 2" :max="12" /> æœˆ
            </el-radio>
        </el-form-item>

        <el-form-item>
            <el-radio v-model='radioValue' :label="3">
                ä»Ž
                <el-input-number v-model='average01' :min="1" :max="12" /> æœˆå¼€å§‹ï¼Œæ¯
                <el-input-number v-model='average02' :min="1" :max="12" /> æœˆæœˆæ‰§è¡Œä¸€æ¬¡
                <el-input-number v-model='average01' :min="1" :max="11" /> æœˆå¼€å§‹ï¼Œæ¯
                <el-input-number v-model='average02' :min="1" :max="12 - average01 || 0" /> æœˆæœˆæ‰§è¡Œä¸€æ¬¡
            </el-radio>
        </el-form-item>

@@ -51,29 +51,15 @@
    methods: {
        // å•é€‰æŒ‰é’®å€¼å˜åŒ–æ—¶
        radioChange() {
            if (this.radioValue === 1) {
                this.$emit('update', 'month', '*');
                this.$emit('update', 'year', '*');
            } else {
                if (this.cron.day === '*') {
                    this.$emit('update', 'day', '0', 'month');
                }
                if (this.cron.hour === '*') {
                    this.$emit('update', 'hour', '0', 'month');
                }
                if (this.cron.min === '*') {
                    this.$emit('update', 'min', '0', 'month');
                }
                if (this.cron.second === '*') {
                    this.$emit('update', 'second', '0', 'month');
                }
            }
            switch (this.radioValue) {
                case 1:
                    this.$emit('update', 'month', '*');
                    break;
                case 2:
                    this.$emit('update', 'month', this.cycle01 + '-' + this.cycle02);
                    this.$emit('update', 'month', this.cycleTotal);
                    break;
                case 3:
                    this.$emit('update', 'month', this.average01 + '/' + this.average02);
                    this.$emit('update', 'month', this.averageTotal);
                    break;
                case 4:
                    this.$emit('update', 'month', this.checkboxString);
@@ -100,7 +86,7 @@
        }
    },
    watch: {
        "radioValue": "radioChange",
        'radioValue': 'radioChange',
        'cycleTotal': 'cycleChange',
        'averageTotal': 'averageChange',
        'checkboxString': 'checkboxChange'
@@ -108,15 +94,15 @@
    computed: {
        // è®¡ç®—两个周期值
        cycleTotal: function () {
            this.cycle01 = this.checkNum(this.cycle01, 1, 12)
            this.cycle02 = this.checkNum(this.cycle02, 1, 12)
            return this.cycle01 + '-' + this.cycle02;
            const cycle01 = this.checkNum(this.cycle01, 1, 11)
            const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : 2, 12)
            return cycle01 + '-' + cycle02;
        },
        // è®¡ç®—平均用到的值
        averageTotal: function () {
            this.average01 = this.checkNum(this.average01, 1, 12)
            this.average02 = this.checkNum(this.average02, 1, 12)
            return this.average01 + '/' + this.average02;
            const average01 = this.checkNum(this.average01, 1, 11)
            const average02 = this.checkNum(this.average02, 1, 12 - average01 || 0)
            return average01 + '/' + average02;
        },
        // è®¡ç®—勾选的checkbox值合集
        checkboxString: function () {

 ruoyi-ui/src/components/Crontab/result.vue

@@ -179,7 +179,7 @@
                            // èŽ·å–达到条件的日期是星期X
                            let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week');
                            // å½“星期日时
                            if (thisWeek == 0) {
                            if (thisWeek == 1) {
                                // å…ˆæ‰¾ä¸‹ä¸€ä¸ªæ—¥ï¼Œå¹¶åˆ¤æ–­æ˜¯å¦ä¸ºæœˆåº•
                                DD++;
                                thisDD = DD < 10 ? '0' + DD : DD;
@@ -187,7 +187,7 @@
                                if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
                                    DD -= 3;
                                }
                            } else if (thisWeek == 6) {
                            } else if (thisWeek == 7) {
                                // å½“星期6时只需判断不是1号就可进行操作
                                if (this.dayRuleSup !== 1) {
                                    DD--;
@@ -200,7 +200,7 @@
                            // èŽ·å–当前日期是属于星期几
                            let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week');
                            // æ ¡éªŒå½“前星期是否在星期池（dayRuleSup）中
                            if (Array.indexOf(this.dayRuleSup, thisWeek) < 0) {
                            if (this.dayRuleSup.indexOf(thisWeek) < 0) {
                                // å¦‚果到达最大值时
                                if (Di == DDate.length - 1) {
                                    resetDay();
@@ -385,7 +385,7 @@
                } else if (rule.indexOf('#') >= 0) {
                    this.dayRule = 'assWeek';
                    let matchRule = rule.match(/[0-9]{1}/g);
                    this.dayRuleSup = [Number(matchRule[0]), Number(matchRule[1])];
                    this.dayRuleSup = [Number(matchRule[1]), Number(matchRule[0])];
                    this.dateArr[3] = [1];
                    if (this.dayRuleSup[1] == 7) {
                        this.dayRuleSup[1] = 0;
@@ -400,14 +400,6 @@
                } else if (rule !== '*' && rule !== '?') {
                    this.dayRule = 'weekDay';
                    this.dayRuleSup = this.getAssignArr(rule)
                }
                // å¦‚æžœweekDay时将7调整为0【week值0即是星期日】
                if (this.dayRule == 'weekDay') {
                    for (let i = 0; i < this.dayRuleSup.length; i++) {
                        if (this.dayRuleSup[i] == 7) {
                            this.dayRuleSup[i] = 0;
                        }
                    }
                }
            }
        },
@@ -543,14 +535,15 @@
            if (type == undefined) {
                return Y + '-' + (M < 10 ? '0' + M : M) + '-' + (D < 10 ? '0' + D : D) + ' ' + (h < 10 ? '0' + h : h) + ':' + (m < 10 ? '0' + m : m) + ':' + (s < 10 ? '0' + s : s);
            } else if (type == 'week') {
                return week;
                // åœ¨quartz中 1为星期日
                return week + 1;
            }
        },
        // æ£€æŸ¥æ—¥æœŸæ˜¯å¦å­˜åœ¨
        checkDate(value) {
            let time = new Date(value);
            let format = this.formatDate(time)
            return value == format ? true : false;
            return value === format;
        }
    },
    watch: {

 ruoyi-ui/src/components/Crontab/second.vue

@@ -9,16 +9,16 @@
        <el-form-item>
            <el-radio v-model='radioValue' :label="2">
                å‘¨æœŸä»Ž
                <el-input-number v-model='cycle01' :min="0" :max="60" /> -
                <el-input-number v-model='cycle02' :min="0" :max="60" /> ç§’
                <el-input-number v-model='cycle01' :min="0" :max="58" /> -
                <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : 1" :max="59" /> ç§’
            </el-radio>
        </el-form-item>

        <el-form-item>
            <el-radio v-model='radioValue' :label="3">
                ä»Ž
                <el-input-number v-model='average01' :min="0" :max="60" /> ç§’开始，每
                <el-input-number v-model='average02' :min="0" :max="60" /> ç§’执行一次
                <el-input-number v-model='average01' :min="0" :max="58" /> ç§’开始，每
                <el-input-number v-model='average02' :min="1" :max="59 - average01 || 0" /> ç§’执行一次
            </el-radio>
        </el-form-item>

@@ -54,13 +54,12 @@
            switch (this.radioValue) {
                case 1:
                    this.$emit('update', 'second', '*', 'second');
                    this.$emit('update', 'min', '*', 'second');
                    break;
                case 2:
                    this.$emit('update', 'second', this.cycle01 + '-' + this.cycle02);
                    this.$emit('update', 'second', this.cycleTotal);
                    break;
                case 3:
                    this.$emit('update', 'second', this.average01 + '/' + this.average02);
                    this.$emit('update', 'second', this.averageTotal);
                    break;
                case 4:
                    this.$emit('update', 'second', this.checkboxString);
@@ -84,25 +83,10 @@
            if (this.radioValue == '4') {
                this.$emit('update', 'second', this.checkboxString);
            }
        },
        othChange() {
            // åè§£æž
            let ins = this.cron.second
            ('反解析 second', ins);
            if (ins === '*') {
                this.radioValue = 1;
            } else if (ins.indexOf('-') > -1) {
                this.radioValue = 2
            } else if (ins.indexOf('/') > -1) {
                this.radioValue = 3
            } else {
                this.radioValue = 4
                this.checkboxList = ins.split(',')
            }
        }
    },
    watch: {
        "radioValue": "radioChange",
        'radioValue': 'radioChange',
        'cycleTotal': 'cycleChange',
        'averageTotal': 'averageChange',
        'checkboxString': 'checkboxChange',
@@ -113,15 +97,15 @@
    computed: {
        // è®¡ç®—两个周期值
        cycleTotal: function () {
            this.cycle01 = this.checkNum(this.cycle01, 0, 59)
            this.cycle02 = this.checkNum(this.cycle02, 0, 59)
            return this.cycle01 + '-' + this.cycle02;
            const cycle01 = this.checkNum(this.cycle01, 0, 58)
            const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : 1, 59)
            return cycle01 + '-' + cycle02;
        },
        // è®¡ç®—平均用到的值
        averageTotal: function () {
            this.average01 = this.checkNum(this.average01, 0, 59)
            this.average02 = this.checkNum(this.average02, 1, 59)
            return this.average01 + '/' + this.average02;
            const average01 = this.checkNum(this.average01, 0, 58)
            const average02 = this.checkNum(this.average02, 1, 59 - average01 || 0)
            return average01 + '/' + average02;
        },
        // è®¡ç®—勾选的checkbox值合集
        checkboxString: function () {

 ruoyi-ui/src/components/Crontab/week.vue

@@ -2,7 +2,7 @@
    <el-form size='small'>
        <el-form-item>
            <el-radio v-model='radioValue' :label="1">
                å‘¨ï¼Œå…è®¸çš„通配符[, - * / L #]
                å‘¨ï¼Œå…è®¸çš„通配符[, - * ? / L #]
            </el-radio>
        </el-form-item>

@@ -15,8 +15,25 @@
        <el-form-item>
            <el-radio v-model='radioValue' :label="3">
                å‘¨æœŸä»Žæ˜ŸæœŸ
                <el-input-number v-model='cycle01' :min="1" :max="7" /> -
                <el-input-number v-model='cycle02' :min="1" :max="7" />
                <el-select clearable v-model="cycle01">
                    <el-option
                        v-for="(item,index) of weekList"
                        :key="index"
                        :label="item.value"
                        :value="item.key"
                        :disabled="item.key === 1"
                    >{{item.value}}</el-option>
                </el-select>
                -
                <el-select clearable v-model="cycle02">
                    <el-option
                        v-for="(item,index) of weekList"
                        :key="index"
                        :label="item.value"
                        :value="item.key"
                        :disabled="item.key < cycle01 && item.key !== 1"
                    >{{item.value}}</el-option>
                </el-select>
            </el-radio>
        </el-form-item>

@@ -24,14 +41,18 @@
            <el-radio v-model='radioValue' :label="4">
                ç¬¬
                <el-input-number v-model='average01' :min="1" :max="4" /> å‘¨çš„星期
                <el-input-number v-model='average02' :min="1" :max="7" />
                <el-select clearable v-model="average02">
                    <el-option v-for="(item,index) of weekList" :key="index" :label="item.value" :value="item.key">{{item.value}}</el-option>
                </el-select>
            </el-radio>
        </el-form-item>

        <el-form-item>
            <el-radio v-model='radioValue' :label="5">
                æœ¬æœˆæœ€åŽä¸€ä¸ªæ˜ŸæœŸ
                <el-input-number v-model='weekday' :min="1" :max="7" />
                <el-select clearable v-model="weekday">
                    <el-option v-for="(item,index) of weekList" :key="index" :label="item.value" :value="item.key">{{item.value}}</el-option>
                </el-select>
            </el-radio>
        </el-form-item>

@@ -39,7 +60,7 @@
            <el-radio v-model='radioValue' :label="6">
                æŒ‡å®š
                <el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
                    <el-option v-for="(item,index) of weekList" :key="index" :value="index+1">{{item}}</el-option>
                    <el-option v-for="(item,index) of weekList" :key="index" :label="item.value" :value="item.key">{{item.value}}</el-option>
                </el-select>
            </el-radio>
        </el-form-item>
@@ -52,13 +73,42 @@
    data() {
        return {
            radioValue: 2,
            weekday: 1,
            cycle01: 1,
            cycle02: 2,
            weekday: 2,
            cycle01: 2,
            cycle02: 3,
            average01: 1,
            average02: 1,
            average02: 2,
            checkboxList: [],
            weekList: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
            weekList: [
                {
                    key: 2,
                    value: '星期一'
                },
                {
                    key: 3,
                    value: '星期二'
                },
                {
                    key: 4,
                    value: '星期三'
                },
                {
                    key: 5,
                    value: '星期四'
                },
                {
                    key: 6,
                    value: '星期五'
                },
                {
                    key: 7,
                    value: '星期六'
                },
                {
                    key: 1,
                    value: '星期日'
                }
            ],
            checkNum: this.$options.propsData.check
        }
    },
@@ -67,45 +117,30 @@
    methods: {
        // å•é€‰æŒ‰é’®å€¼å˜åŒ–æ—¶
        radioChange() {
            if (this.radioValue === 1) {
                this.$emit('update', 'week', '*');
                this.$emit('update', 'year', '*');
            } else {
                if (this.cron.month === '*') {
                    this.$emit('update', 'month', '0', 'week');
                }
                if (this.cron.day === '*') {
                    this.$emit('update', 'day', '0', 'week');
                }
                if (this.cron.hour === '*') {
                    this.$emit('update', 'hour', '0', 'week');
                }
                if (this.cron.min === '*') {
                    this.$emit('update', 'min', '0', 'week');
                }
                if (this.cron.second === '*') {
                    this.$emit('update', 'second', '0', 'week');
                }
            if (this.radioValue !== 2 && this.cron.day !== '?') {
                this.$emit('update', 'day', '?', 'week');
            }
            switch (this.radioValue) {
                case 1:
                    this.$emit('update', 'week', '*');
                    break;
                case 2:
                    this.$emit('update', 'week', '?');
                    break;
                case 3:
                    this.$emit('update', 'week', this.cycle01 + '-' + this.cycle02);
                    this.$emit('update', 'week', this.cycleTotal);
                    break;
                case 4:
                    this.$emit('update', 'week', this.average01 + '#' + this.average02);
                    this.$emit('update', 'week', this.averageTotal);
                    break;
                case 5:
                    this.$emit('update', 'week', this.weekday + 'L');
                    this.$emit('update', 'week', this.weekdayCheck + 'L');
                    break;
                case 6:
                    this.$emit('update', 'week', this.checkboxString);
                    break;
            }
        },
        // æ ¹æ®äº’斥事件，更改radio的值

        // å‘¨æœŸä¸¤ä¸ªå€¼å˜åŒ–æ—¶
        cycleChange() {
@@ -133,7 +168,7 @@
        },
    },
    watch: {
        "radioValue": "radioChange",
        'radioValue': 'radioChange',
        'cycleTotal': 'cycleChange',
        'averageTotal': 'averageChange',
        'weekdayCheck': 'weekdayChange',
@@ -150,7 +185,7 @@
        averageTotal: function () {
            this.average01 = this.checkNum(this.average01, 1, 4)
            this.average02 = this.checkNum(this.average02, 1, 7)
            return this.average01 + '#' + this.average02;
            return this.average02 + '#' + this.average01;
        },
        // æœ€è¿‘的工作日（格式）
        weekdayCheck: function () {

 ruoyi-ui/src/components/Crontab/year.vue

@@ -15,16 +15,16 @@
        <el-form-item>
            <el-radio :label="3" v-model='radioValue'>
                å‘¨æœŸä»Ž
                <el-input-number v-model='cycle01' :min='fullYear' /> -
                <el-input-number v-model='cycle02' :min='fullYear' />
                <el-input-number v-model='cycle01' :min='fullYear' :max="2098" /> -
                <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : fullYear + 1" :max="2099" />
            </el-radio>
        </el-form-item>

        <el-form-item>
            <el-radio :label="4" v-model='radioValue'>
                ä»Ž
                <el-input-number v-model='average01' :min='fullYear' /> å¹´å¼€å§‹ï¼Œæ¯
                <el-input-number v-model='average02' :min='fullYear' /> å¹´æ‰§è¡Œä¸€æ¬¡
                <el-input-number v-model='average01' :min='fullYear' :max="2098"/> å¹´å¼€å§‹ï¼Œæ¯
                <el-input-number v-model='average02' :min="1" :max="2099 - average01 || fullYear" /> å¹´æ‰§è¡Œä¸€æ¬¡
            </el-radio>

        </el-form-item>
@@ -59,21 +59,6 @@
    methods: {
        // å•é€‰æŒ‰é’®å€¼å˜åŒ–æ—¶
        radioChange() {
            if (this.cron.month === '*') {
                this.$emit('update', 'month', '0', 'year');
            }
            if (this.cron.day === '*') {
                this.$emit('update', 'day', '0', 'year');
            }
            if (this.cron.hour === '*') {
                this.$emit('update', 'hour', '0', 'year');
            }
            if (this.cron.min === '*') {
                this.$emit('update', 'min', '0', 'year');
            }
            if (this.cron.second === '*') {
                this.$emit('update', 'second', '0', 'year');
            }
            switch (this.radioValue) {
                case 1:
                    this.$emit('update', 'year', '');
@@ -82,10 +67,10 @@
                    this.$emit('update', 'year', '*');
                    break;
                case 3:
                    this.$emit('update', 'year', this.cycle01 + '-' + this.cycle02);
                    this.$emit('update', 'year', this.cycleTotal);
                    break;
                case 4:
                    this.$emit('update', 'year', this.average01 + '/' + this.average02);
                    this.$emit('update', 'year', this.averageTotal);
                    break;
                case 5:
                    this.$emit('update', 'year', this.checkboxString);
@@ -112,7 +97,7 @@
        }
    },
    watch: {
        "radioValue": "radioChange",
        'radioValue': 'radioChange',
        'cycleTotal': 'cycleChange',
        'averageTotal': 'averageChange',
        'checkboxString': 'checkboxChange'
@@ -120,15 +105,15 @@
    computed: {
        // è®¡ç®—两个周期值
        cycleTotal: function () {
            this.cycle01 = this.checkNum(this.cycle01, this.fullYear, this.fullYear + 100)
            this.cycle02 = this.checkNum(this.cycle02, this.fullYear + 1, this.fullYear + 101)
            return this.cycle01 + '-' + this.cycle02;
            const cycle01 = this.checkNum(this.cycle01, this.fullYear, 2098)
            const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : this.fullYear + 1, 2099)
            return cycle01 + '-' + cycle02;
        },
        // è®¡ç®—平均用到的值
        averageTotal: function () {
            this.average01 = this.checkNum(this.average01, this.fullYear, this.fullYear + 100)
            this.average02 = this.checkNum(this.average02, 1, 10)
            return this.average01 + '/' + this.average02;
            const average01 = this.checkNum(this.average01, this.fullYear, 2098)
            const average02 = this.checkNum(this.average02, 1, 2099 - average01 || this.fullYear)
            return average01 + '/' + average02;
        },
        // è®¡ç®—勾选的checkbox值合集
        checkboxString: function () {
@@ -139,6 +124,8 @@
    mounted: function () {
        // ä»…获取当前年份
        this.fullYear = Number(new Date().getFullYear());
        this.cycle01 = this.fullYear
        this.average01 = this.fullYear
    }
}
</script>

 ruoyi-ui/src/directive/index.js

@@ -3,10 +3,12 @@
import dialogDrag from './dialog/drag'
import dialogDragWidth from './dialog/dragWidth'
import dialogDragHeight from './dialog/dragHeight'
import clipboard from './module/clipboard'

const install = function(Vue) {
  Vue.directive('hasRole', hasRole)
  Vue.directive('hasPermi', hasPermi)
  Vue.directive('clipboard', clipboard)
  Vue.directive('dialogDrag', dialogDrag)
  Vue.directive('dialogDragWidth', dialogDragWidth)
  Vue.directive('dialogDragHeight', dialogDragHeight)

 ruoyi-ui/src/directive/module/clipboard.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,54 @@
/**
* v-clipboard æ–‡å­—复制剪贴
* Copyright (c) 2021 ruoyi
*/

import Clipboard from 'clipboard'
export default {
  bind(el, binding, vnode) {
    switch (binding.arg) {
      case 'success':
        el._vClipBoard_success = binding.value;
        break;
      case 'error':
        el._vClipBoard_error = binding.value;
        break;
      default: {
        const clipboard = new Clipboard(el, {
          text: () => binding.value,
          action: () => binding.arg === 'cut' ? 'cut' : 'copy'
        });
        clipboard.on('success', e => {
          const callback = el._vClipBoard_success;
          callback && callback(e);
        });
        clipboard.on('error', e => {
          const callback = el._vClipBoard_error;
          callback && callback(e);
        });
        el._vClipBoard = clipboard;
      }
    }
  },
  update(el, binding) {
    if (binding.arg === 'success') {
      el._vClipBoard_success = binding.value;
    } else if (binding.arg === 'error') {
      el._vClipBoard_error = binding.value;
    } else {
      el._vClipBoard.text = function () { return binding.value; };
      el._vClipBoard.action = () => binding.arg === 'cut' ? 'cut' : 'copy';
    }
  },
  unbind(el, binding) {
    if (!el._vClipboard) return
    if (binding.arg === 'success') {
      delete el._vClipBoard_success;
    } else if (binding.arg === 'error') {
      delete el._vClipBoard_error;
    } else {
      el._vClipBoard.destroy();
      delete el._vClipBoard;
    }
  }
}

 ruoyi-ui/src/plugins/download.js

@@ -2,6 +2,7 @@
import { Message } from 'element-ui'
import { saveAs } from 'file-saver'
import { getToken } from '@/utils/auth'
import errorCode from '@/utils/errorCode'
import { blobValidate } from "@/utils/ruoyi";

const baseURL = process.env.VUE_APP_BASE_API
@@ -20,7 +21,7 @@
        const blob = new Blob([res.data], { type: 'application/octet-stream' })
        this.saveAs(blob, decodeURI(res.headers['download-filename']))
      } else {
        Message.error('无效的会话，或者会话已过期，请重新登录。');
        this.printErrMsg(res.data);
      }
    })
  },
@@ -37,12 +38,18 @@
        const blob = new Blob([res.data], { type: 'application/zip' })
        this.saveAs(blob, name)
      } else {
        Message.error('无效的会话，或者会话已过期，请重新登录。');
        this.printErrMsg(res.data);
      }
    })
  },
  saveAs(text, name, opts) {
    saveAs(text, name, opts);
  },
  async printErrMsg(data) {
    const resText = await data.text();
    const rspObj = JSON.parse(resText);
    const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
    Message.error(errMsg);
  }
}


 ruoyi-ui/src/plugins/modal.js

@@ -59,6 +59,14 @@
      type: "warning",

    })

  },

  // æäº¤å†…容

  prompt(content) {

    return MessageBox.prompt(content, "系统提示", {

      confirmButtonText: '确定',

      cancelButtonText: '取消',

      type: "warning",

    })

  },

  // æ‰“开遮罩层

  loading(content) {

    loadingInstance = Loading.service({


 ruoyi-ui/src/utils/request.js

@@ -110,7 +110,10 @@
      const blob = new Blob([data])
      saveAs(blob, filename)
    } else {
      Message.error('无效的会话，或者会话已过期，请重新登录。');
      const resText = await data.text();
      const rspObj = JSON.parse(resText);
      const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
      Message.error(errMsg);
    }
    downloadLoadingInstance.close();
  }).catch((r) => {

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

@@ -111,7 +111,7 @@
    },
    /** å¼ºé€€æŒ‰é’®æ“ä½œ */
    handleForceLogout(row) {
      this.$modal.confirm('是否确认强退名称为"' + row.userName + '"的数据项？').then(function() {
      this.$modal.confirm('是否确认强退名称为"' + row.userName + '"的用户？').then(function() {
        return forceLogout(row.tokenId);
      }).then(() => {
        this.getList();

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

@@ -9,7 +9,7 @@
          </el-form-item>
        </el-col>
        <el-col :span="8" :offset="2">
          <el-form-item label="登录账号" prop="phonenumber">
          <el-form-item label="登录账号" prop="userName">
            <el-input  v-model="form.userName" disabled />
          </el-form-item>
        </el-col>

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

@@ -596,7 +596,7 @@
        cancelButtonText: "取消",
        closeOnClickModal: false,
        inputPattern: /^.{5,20}$/,
        inputErrorMessage: "用户密码长度必须介于 5 å’Œ 20 ä¹‹é—´",
        inputErrorMessage: "用户密码长度必须介于 5 å’Œ 20 ä¹‹é—´"
      }).then(({ value }) => {
          resetUserPwd(row.userId, value).then(response => {
            this.$modal.msgSuccess("修改成功，新密码是：" + value);

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

@@ -11,7 +11,6 @@
          <el-input placeholder="请输入" v-model="info.tableComment" />
        </el-form-item>
      </el-col>

      <el-col :span="12">
        <el-form-item label="实体类名称" prop="className">
          <el-input placeholder="请输入" v-model="info.className" />
@@ -30,9 +29,9 @@
    </el-row>
  </el-form>
</template>

<script>
export default {
  name: "BasicInfoForm",
  props: {
    info: {
      type: Object,

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

@@ -124,6 +124,7 @@
    </el-form>
  </el-card>
</template>

<script>
import { getGenTable, updateGenTable } from "@/api/tool/gen";
import { optionselect as getDictOptionselect } from "@/api/system/dict/type";

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

@@ -11,7 +11,6 @@
          </el-select>
        </el-form-item>
      </el-col>

      <el-col :span="12">
        <el-form-item prop="packageName">
          <span slot="label">
@@ -213,12 +212,12 @@
    </el-row>
  </el-form>
</template>

<script>
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";

export default {
  name: "BasicInfoForm",
  components: { Treeselect },
  props: {
    info: {

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

@@ -169,7 +169,8 @@
          :name="key.substring(key.lastIndexOf('/')+1,key.indexOf('.vm'))"
          :key="key"
        >
        <pre><code class="hljs" v-html="highlightedCode(value, key)"></code></pre>
          <el-link :underline="false" icon="el-icon-document-copy" v-clipboard:copy="value" v-clipboard:success="clipboardSuccess" style="float:right">复制</el-link>
          <pre><code class="hljs" v-html="highlightedCode(value, key)"></code></pre>
        </el-tab-pane>
      </el-tabs>
    </el-dialog>
@@ -306,6 +307,10 @@
      const result = hljs.highlight(language, code || "", true);
      return result.value || '&nbsp;';
    },
    /** å¤åˆ¶ä»£ç æˆåŠŸ */
    clipboardSuccess(){
      this.$modal.msgSuccess("复制成功");
    },
    // å¤šé€‰æ¡†é€‰ä¸­æ•°æ®
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.tableId);