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

Conflicts: pom.xml ruoyi-admin/pom.xml ruoyi-admin/src/main/resources/application.yml ruoyi-common/pom.xml ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java ruoyi-framework/pom.xml ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java ruoyi-generator/pom.xml ruoyi-generator/src/main/resources/vm/java/mapper.java.vm ruoyi-generator/src/main/resources/vm/vue/index.vue.vm ruoyi-quartz/pom.xml ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java ruoyi-system/pom.xml ruoyi-ui/package.json ruoyi-ui/public/index.html ruoyi-ui/src/views/index.vue ruoyi-ui/src/views/monitor/job/index.vue ruoyi-ui/src/views/monitor/logininfor/index.vue ruoyi-ui/src/views/monitor/operlog/index.vue ruoyi-ui/src/views/system/config/index.vue ruoyi-ui/src/views/system/dict/data.vue ruoyi-ui/src/views/system/dict/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
2021-05-25 10:00:36 +08:00 · 2021-05-25 10:00:36 +08:00 · 6c195af2a3
parent caa81d1f4d 5e64a93d11
commit 6c195af2a3
27 changed files with 560 additions and 439 deletions
--- a/pom.xml
+++ b/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+	<modelVersion>4.0.0</modelVersion>

    <groupId>com.ruoyi</groupId>
    <artifactId>ruoyi-vue-plus</artifactId>
@ -19,10 +19,10 @@
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <java.version>1.8</java.version>
        <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
-        <druid.version>1.2.4</druid.version>
+        <druid.version>1.2.6</druid.version>
        <knife4j.version>3.0.2</knife4j.version>
        <swagger-annotations.version>1.5.22</swagger-annotations.version>
-        <fastjson.version>1.2.75</fastjson.version>
+        <fastjson.version>1.2.76</fastjson.version>
        <poi.version>4.1.2</poi.version>
        <velocity.version>1.7</velocity.version>
        <jwt.version>0.9.1</jwt.version>
--- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
@ -100,6 +100,6 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
    public boolean isJsonRequest()
    {
        String header = super.getHeader(HttpHeaders.CONTENT_TYPE);
-        return MediaType.APPLICATION_JSON_VALUE.equalsIgnoreCase(header);
+        return StringUtils.startsWithIgnoreCase(header, MediaType.APPLICATION_JSON_VALUE);
    }
 }
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
@ -198,7 +198,7 @@ public class LogAspect
        {
            for (int i = 0; i < paramsArray.length; i++)
            {
-                if (!isFilterObject(paramsArray[i]))
+                if (StrUtil.isNotNull(paramsArray[i]) && !isFilterObject(paramsArray[i]))
                {
                    Object jsonObj = JSON.toJSON(paramsArray[i]);
                    params += jsonObj.toString() + " ";
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
@ -37,9 +37,14 @@ public class RedisConfig extends CachingConfigurerSupport
        mapper.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY);
        serializer.setObjectMapper(mapper);

-        template.setValueSerializer(serializer);
        // 使用StringRedisSerializer来序列化和反序列化redis的key值
        template.setKeySerializer(new StringRedisSerializer());
+        template.setValueSerializer(serializer);
+
+        // Hash的key也采用StringRedisSerializer的序列化方式
+        template.setHashKeySerializer(new StringRedisSerializer());
+        template.setHashValueSerializer(serializer);
+
        template.afterPropertiesSet();
        return template;
    }
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@ -8,15 +8,20 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.exception.CustomException;
 import com.ruoyi.common.exception.user.CaptchaException;
 import com.ruoyi.common.exception.user.CaptchaExpireException;
 import com.ruoyi.common.exception.user.UserPasswordNotMatchException;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.MessageUtils;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.ip.IpUtils;
 import com.ruoyi.framework.manager.AsyncManager;
 import com.ruoyi.framework.manager.factory.AsyncFactory;
+import com.ruoyi.system.service.ISysUserService;

 /**
 * 登录校验方法
@ -35,6 +40,9 @@ public class SysLoginService
    @Autowired
    private RedisCache redisCache;

+    @Autowired
+    private ISysUserService userService;
+
    /**
     * 登录验证
     *
@ -82,7 +90,18 @@ public class SysLoginService
        }
        AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
        LoginUser loginUser = (LoginUser) authentication.getPrincipal();
+        recordLoginInfo(loginUser.getUser());
        // 生成token
        return tokenService.createToken(loginUser);
    }
+
+    /**
+     * 记录登录信息
+     */
+    public void recordLoginInfo(SysUser user)
+    {
+        user.setLoginIp(IpUtils.getIpAddr(ServletUtils.getRequest()));
+        user.setLoginDate(DateUtils.getNowDate());
+        userService.updateUserProfile(user);
+    }
 }
--- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@ -108,6 +108,7 @@
          plain
          icon="el-icon-download"
          size="mini"
+		  :loading="exportLoading"
          @click="handleExport"
          v-hasPermi="['${moduleName}:${businessName}:export']"
        >导出</el-button>
@ -354,6 +355,8 @@ export default {
    return {
      // 遮罩层
      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
      // 选中数组
      ids: [],
 #if($table.sub)
@ -630,10 +633,12 @@ export default {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
-        }).then(function() {
+        }).then(() => {
+          this.exportLoading = true;
          return export${BusinessName}(queryParams);
        }).then(response => {
          this.download(response.msg);
+          this.exportLoading = false;
        })
    }
  }
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@ -23,11 +23,6 @@
            <artifactId>ruoyi-common</artifactId>
        </dependency>

-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-spring-boot-starter</artifactId>
-        </dependency>
-
    </dependencies>

 </project>
--- a/ruoyi-ui/public/html/ie.html
+++ b/ruoyi-ui/public/html/ie.html
--- a/ruoyi-ui/public/index.html
+++ b/ruoyi-ui/public/index.html
@ -7,6 +7,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
    <title><%= webpackConfig.name %></title>
+    <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 	  <style>
    html,
    body,
--- a/ruoyi-ui/src/views/monitor/job/index.vue
+++ b/ruoyi-ui/src/views/monitor/job/index.vue
@ -75,6 +75,7 @@
          plain
          icon="el-icon-download"
          size="mini"
+          :loading="exportLoading"
          @click="handleExport"
          v-hasPermi="['monitor:job:export']"
        >导出</el-button>
@ -274,6 +275,8 @@ export default {
    return {
      // 遮罩层
      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
      // 选中数组
      ids: [],
      // 非单个禁用
@ -477,10 +480,12 @@ export default {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
-        }).then(function() {
+        }).then(() => {
+          this.exportLoading = true;
          return exportJob(queryParams);
        }).then(response => {
          this.download(response.msg);
+          this.exportLoading = false;
        })
    }
  }
--- a/ruoyi-ui/src/views/monitor/job/log.vue
+++ b/ruoyi-ui/src/views/monitor/job/log.vue
@ -89,6 +89,7 @@
          plain
          icon="el-icon-download"
          size="mini"
+          :loading="exportLoading"
          @click="handleExport"
          v-hasPermi="['monitor:job:export']"
        >导出</el-button>
@ -175,6 +176,8 @@ export default {
    return {
      // 遮罩层
      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
      // 选中数组
      ids: [],
      // 非多个禁用
@ -288,10 +291,12 @@ export default {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
-        }).then(function() {
+        }).then(() => {
+          this.exportLoading = true;
          return exportJobLog(queryParams);
        }).then(response => {
          this.download(response.msg);
+          this.exportLoading = false;
        })
    }
  }
--- a/ruoyi-ui/src/views/monitor/logininfor/index.vue
+++ b/ruoyi-ui/src/views/monitor/logininfor/index.vue
@ -83,6 +83,7 @@
          plain
          icon="el-icon-download"
          size="mini"
+          :loading="exportLoading"
          @click="handleExport"
          v-hasPermi="['monitor:logininfor:export']"
        >导出</el-button>
@ -126,6 +127,8 @@ export default {
    return {
      // 遮罩层
      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
      // 选中数组
      ids: [],
      // 非多个禁用
@ -221,10 +224,12 @@ export default {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
-        }).then(function() {
+        }).then(() => {
+          this.exportLoading = true;
          return exportLogininfor(queryParams);
        }).then(response => {
          this.download(response.msg);
+          this.exportLoading = false;
        })
    }
  }
--- a/ruoyi-ui/src/views/monitor/operlog/index.vue
+++ b/ruoyi-ui/src/views/monitor/operlog/index.vue
@ -99,6 +99,7 @@
          plain
          icon="el-icon-download"
          size="mini"
+          :loading="exportLoading"
          @click="handleExport"
          v-hasPermi="['monitor:operlog:export']"
        >导出</el-button>
@ -195,6 +196,8 @@ export default {
    return {
      // 遮罩层
      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
      // 选中数组
      ids: [],
      // 非多个禁用
@ -309,10 +312,12 @@ export default {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
-        }).then(function() {
+        }).then(() => {
+          this.exportLoading = true;
          return exportOperlog(queryParams);
        }).then(response => {
          this.download(response.msg);
+          this.exportLoading = false;
        })
    }
  }
--- a/ruoyi-ui/src/views/system/config/index.vue
+++ b/ruoyi-ui/src/views/system/config/index.vue
@ -88,6 +88,7 @@
          plain
          icon="el-icon-download"
          size="mini"
+          :loading="exportLoading"
          @click="handleExport"
          v-hasPermi="['system:config:export']"
        >导出</el-button>
@ -188,6 +189,8 @@ export default {
    return {
      // 遮罩层
      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
      // 选中数组
      ids: [],
      // 非单个禁用
@ -344,10 +347,12 @@ export default {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
-        }).then(function() {
+        }).then(() => {
+          this.exportLoading = true;
          return exportConfig(queryParams);
        }).then(response => {
          this.download(response.msg);
+          this.exportLoading = false;
        })
    },
    /** 清理缓存按钮操作 */
--- a/ruoyi-ui/src/views/system/dict/data.vue
+++ b/ruoyi-ui/src/views/system/dict/data.vue
@ -75,6 +75,7 @@
          plain
          icon="el-icon-download"
          size="mini"
+          :loading="exportLoading"
          @click="handleExport"
          v-hasPermi="['system:dict:export']"
        >导出</el-button>
@ -169,6 +170,8 @@ export default {
    return {
      // 遮罩层
      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
      // 选中数组
      ids: [],
      // 非单个禁用
@ -343,10 +346,12 @@ export default {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
-        }).then(function() {
+        }).then(() => {
+          this.exportLoading = true;
          return exportData(queryParams);
        }).then(response => {
          this.download(response.msg);
+          this.exportLoading = false;
        })
    }
  }
--- a/ruoyi-ui/src/views/system/dict/index.vue
+++ b/ruoyi-ui/src/views/system/dict/index.vue
@ -94,6 +94,7 @@
          plain
          icon="el-icon-download"
          size="mini"
+          :loading="exportLoading"
          @click="handleExport"
          v-hasPermi="['system:dict:export']"
        >导出</el-button>
@ -196,6 +197,8 @@ export default {
    return {
      // 遮罩层
      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
      // 选中数组
      ids: [],
      // 非单个禁用
@ -348,10 +351,12 @@ export default {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
-        }).then(function() {
+        }).then(() => {
+          this.exportLoading = true;
          return exportType(queryParams);
        }).then(response => {
          this.download(response.msg);
+          this.exportLoading = false;
        })
    },
    /** 清理缓存按钮操作 */
--- a/ruoyi-ui/src/views/system/notice/index.vue
+++ b/ruoyi-ui/src/views/system/notice/index.vue
@ -176,7 +176,7 @@
 </template>

 <script>
-import { listNotice, getNotice, delNotice, addNotice, updateNotice, exportNotice } from "@/api/system/notice";
+import { listNotice, getNotice, delNotice, addNotice, updateNotice } from "@/api/system/notice";
 import Editor from '@/components/Editor';

 export default {
--- a/ruoyi-ui/src/views/system/post/index.vue
+++ b/ruoyi-ui/src/views/system/post/index.vue
@ -74,6 +74,7 @@
          plain
          icon="el-icon-download"
          size="mini"
+          :loading="exportLoading"
          @click="handleExport"
          v-hasPermi="['system:post:export']"
        >导出</el-button>
@ -163,6 +164,8 @@ export default {
    return {
      // 遮罩层
      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
      // 选中数组
      ids: [],
      // 非单个禁用
@ -315,10 +318,12 @@ export default {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
-        }).then(function() {
+        }).then(() => {
+          this.exportLoading = true;
          return exportPost(queryParams);
        }).then(response => {
          this.download(response.msg);
+          this.exportLoading = false;
        })
    }
  }
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@ -94,6 +94,7 @@
          plain
          icon="el-icon-download"
          size="mini"
+          :loading="exportLoading"
          @click="handleExport"
          v-hasPermi="['system:role:export']"
        >导出</el-button>
@ -258,6 +259,8 @@ export default {
    return {
      // 遮罩层
      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
      // 选中数组
      ids: [],
      // 非单个禁用
@ -599,10 +602,12 @@ export default {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
-        }).then(function() {
+        }).then(() => {
+          this.exportLoading = true;
          return exportRole(queryParams);
        }).then(response => {
          this.download(response.msg);
+          this.exportLoading = false;
        })
    }
  }
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@ -131,6 +131,7 @@
              plain
              icon="el-icon-download"
              size="mini"
+              :loading="exportLoading"
              @click="handleExport"
              v-hasPermi="['system:user:export']"
            >导出</el-button>
@ -356,6 +357,8 @@ export default {
    return {
      // 遮罩层
      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
      // 选中数组
      ids: [],
      // 非单个禁用
@ -637,10 +640,12 @@ export default {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
-        }).then(function() {
+        }).then(() => {
+          this.exportLoading = true;
          return exportUser(queryParams);
        }).then(response => {
          this.download(response.msg);
+          this.exportLoading = false;
        })
    },
    /** 导入按钮操作 */