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

疯狂的狮子li

2020-07-17 a53a3b3119659d6ec28b458dcefd46f4ec49d55c

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


 Conflicts:

	ruoyi-ui/package.json

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

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

	ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java

	ruoyi/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java

	ruoyi/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java

	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java

	ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java

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

 ruoyi-ui/package.json

@@ -65,9 +65,6 @@
    "vuex": "3.1.0"
  },
  "devDependencies": {
    "@babel/core": "7.0.0",
    "@babel/register": "7.0.0",
    "@babel/parser": "^7.7.4",
    "@vue/cli-plugin-babel": "3.5.3",
    "@vue/cli-plugin-eslint": "^3.9.1",
    "@vue/cli-plugin-unit-jest": "3.5.3",

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

@@ -314,8 +314,10 @@
    handleAdd(row) {
      this.reset();
      this.getTreeselect();
      if (row != null) {
      if (row != null && row.menuId) {
        this.form.parentId = row.menuId;
      } else {
        this.form.parentId = 0;
      }
      this.open = true;
      this.title = "添加菜单";

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

@@ -9,8 +9,8 @@
import com.ruoyi.common.exception.file.FileSizeLimitExceededException;
import com.ruoyi.common.exception.file.InvalidExtensionException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.IdUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.security.Md5Utils;
import com.ruoyi.framework.config.RuoYiConfig;

/**
@@ -34,8 +34,6 @@
     * é»˜è®¤ä¸Šä¼ çš„地址
     */
    private static String defaultBaseDir = RuoYiConfig.getProfile();

    private static int counter = 0;

    public static void setDefaultBaseDir(String defaultBaseDir)
    {
@@ -82,7 +80,6 @@
        }
        catch (Exception e)
        {
            e.printStackTrace();
            throw new IOException(e.getMessage(), e);
        }
    }
@@ -126,7 +123,7 @@
    {
        String fileName = file.getOriginalFilename();
        String extension = getExtension(file);
        fileName = DateUtils.datePath() + "/" + encodingFilename(fileName) + "." + extension;
        fileName = DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + extension;
        return fileName;
    }

@@ -152,16 +149,6 @@
        String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
        String pathFileName = Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
        return pathFileName;
    }

    /**
     * ç¼–码文件名
     */
    private static final String encodingFilename(String fileName)
    {
        fileName = fileName.replace("_", " ");
        fileName = Md5Utils.hash(fileName + System.nanoTime() + counter++);
        return fileName;
    }

    /**

 ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java

@@ -204,7 +204,7 @@
            String ret = "";
            while ((ret = br.readLine()) != null)
            {
                if (ret != null && !ret.trim().equals(""))
                if (ret != null && !"".equals(ret.trim()))
                {
                    result.append(new String(ret.getBytes("ISO-8859-1"), "utf-8"));
                }

 ruoyi/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java

ÎļþÃû´Ó ruoyi/src/main/java/com/ruoyi/common/utils/security/Md5Utils.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.common.utils.security;
package com.ruoyi.common.utils.sign;

import java.security.MessageDigest;
import org.slf4j.Logger;

 ruoyi/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java

@@ -40,7 +40,7 @@
     * 
     * @param username ç”¨æˆ·å
     * @param password å¯†ç 
     * @param captcha éªŒè¯ç 
     * @param code éªŒè¯ç 
     * @param uuid å”¯ä¸€æ ‡è¯†
     * @return ç»“æžœ
     */

 ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java

@@ -13,6 +13,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.exception.job.TaskException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.job.CronUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -77,6 +79,11 @@
    @PostMapping
    public AjaxResult add(@RequestBody SysJob sysJob) throws SchedulerException, TaskException
    {
        if (!CronUtils.isValid(sysJob.getCronExpression()))
        {
            return AjaxResult.error("cron表达式不正确");
        }
        sysJob.setCreateBy(SecurityUtils.getUsername());
        return toAjax(jobService.insertJob(sysJob));
    }

@@ -88,6 +95,11 @@
    @PutMapping
    public AjaxResult edit(@RequestBody SysJob sysJob) throws SchedulerException, TaskException
    {
        if (!CronUtils.isValid(sysJob.getCronExpression()))
        {
            return AjaxResult.error("cron表达式不正确");
        }
        sysJob.setUpdateBy(SecurityUtils.getUsername());
        return toAjax(jobService.updateJob(sysJob));
    }


 ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java

@@ -42,7 +42,7 @@
    /**
     * ç™»å½•æ–¹æ³•
     * 
     * @param loginBody ç™»é™†ä¿¡æ¯
     * @param loginBody ç™»å½•ä¿¡æ¯
     * @return ç»“æžœ
     */
    @PostMapping("/login")

 ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java

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

@@ -454,5 +454,4 @@
        }
        return successMsg.toString();
    }

}