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

疯狂的狮子Li

2022-05-28 5ced7e05f592ba23f585fc5a2b43ea8695ac0ff8

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


 Conflicts:

	README.md

	pom.xml

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

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

	ruoyi-common/pom.xml

	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java

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

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

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

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

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

	ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java

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

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

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

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

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

	ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java

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

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

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

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

	ruoyi-ui/src/views/index.vue

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package com.ruoyi.common.annotation;



import java.lang.annotation.Documented;

import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.Target;



/**

 * åŒ¿åè®¿é—®ä¸é‰´æƒæ³¨è§£

 * 
 * @author ruoyi

 */

@Target({ ElementType.METHOD, ElementType.TYPE })

@Retention(RetentionPolicy.RUNTIME)

@Documented

public @interface Anonymous

{

}


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

@@ -108,12 +108,6 @@
    )
    private String password;

    @JsonIgnore
    @JsonProperty
    public String getPassword() {
        return password;
    }

    /**
     * å¸å·çŠ¶æ€ï¼ˆ0正常 1停用）
     */

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java

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



import java.util.ArrayList;

import java.util.List;

import java.util.Map;

import java.util.Optional;

import java.util.regex.Pattern;

import org.apache.commons.lang3.RegExUtils;

import org.springframework.beans.BeansException;

import org.springframework.beans.factory.InitializingBean;

import org.springframework.context.ApplicationContext;

import org.springframework.context.ApplicationContextAware;

import org.springframework.context.annotation.Configuration;

import org.springframework.core.annotation.AnnotationUtils;

import org.springframework.web.method.HandlerMethod;

import org.springframework.web.servlet.mvc.method.RequestMappingInfo;

import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;

import com.ruoyi.common.annotation.Anonymous;



/**

 * è®¾ç½®Anonymous注解允许匿名访问的url

 * 
 * @author ruoyi

 */

@Configuration

public class PermitAllUrlProperties implements InitializingBean, ApplicationContextAware

{

    private static final Pattern PATTERN = Pattern.compile("\\{(.*?)\\}");



    private ApplicationContext applicationContext;



    private List<String> urls = new ArrayList<>();



    public String ASTERISK = "*";



    @Override

    public void afterPropertiesSet()

    {

        RequestMappingHandlerMapping mapping = applicationContext.getBean(RequestMappingHandlerMapping.class);

        Map<RequestMappingInfo, HandlerMethod> map = mapping.getHandlerMethods();



        map.keySet().forEach(info -> {

            HandlerMethod handlerMethod = map.get(info);



            // èŽ·å–方法上边的注解 æ›¿ä»£path variable ä¸º *

            Anonymous method = AnnotationUtils.findAnnotation(handlerMethod.getMethod(), Anonymous.class);

            Optional.ofNullable(method).ifPresent(anonymous -> info.getPatternsCondition().getPatterns()

                    .forEach(url -> urls.add(RegExUtils.replaceAll(url, PATTERN, ASTERISK))));



            // èŽ·å–类上边的注解, æ›¿ä»£path variable ä¸º *

            Anonymous controller = AnnotationUtils.findAnnotation(handlerMethod.getBeanType(), Anonymous.class);

            Optional.ofNullable(controller).ifPresent(anonymous -> info.getPatternsCondition().getPatterns()

                    .forEach(url -> urls.add(RegExUtils.replaceAll(url, PATTERN, ASTERISK))));

        });

    }



    @Override

    public void setApplicationContext(ApplicationContext context) throws BeansException

    {

        this.applicationContext = context;

    }



    public List<String> getUrls()

    {

        return urls;

    }



    public void setUrls(List<String> urls)

    {

        this.urls = urls;

    }

}


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

@@ -85,7 +85,7 @@
    </sql>

    <select id="selectPageUserList" resultMap="SysUserResult">
        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex,
        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
        u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from
        sys_user u
        left join sys_dept d on u.dept_id = d.dept_id
@@ -93,7 +93,7 @@
    </select>

    <select id="selectUserList" resultMap="SysUserResult">
        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex,
        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
        u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from
        sys_user u
        left join sys_dept d on u.dept_id = d.dept_id

 ruoyi-ui/src/utils/dict/DictMeta.js

@@ -11,7 +11,7 @@
export default class DictMeta {

  constructor(options) {

    this.type = options.type

    this.request = options.request,

    this.request = options.request

    this.responseConverter = options.responseConverter

    this.labelField = options.labelField

    this.valueField = options.valueField


 ruoyi-ui/src/utils/ruoyi.js

@@ -68,7 +68,7 @@
  return search;
}

// å›žæ˜¾æ•°æ®å­—å…¸ 
// å›žæ˜¾æ•°æ®å­—å…¸
export function selectDictLabel(datas, value) {
  if (value === undefined) {
    return "";
@@ -207,10 +207,10 @@
  for (const propName of Object.keys(params)) {
    const value = params[propName];
    var part = encodeURIComponent(propName) + "=";
    if (value !== null && typeof (value) !== "undefined") {
    if (value !== null && value !== "" && typeof (value) !== "undefined") {
      if (typeof value === 'object') {
        for (const key of Object.keys(value)) {
          if (value[key] !== null && typeof (value[key]) !== 'undefined') {
          if (value[key] !== null && value !== "" && typeof (value[key]) !== 'undefined') {
            let params = propName + '[' + key + ']';
            var subPart = encodeURIComponent(params) + "=";
            result += subPart + encodeURIComponent(value[key]) + "&";
@@ -233,4 +233,4 @@
  } catch (error) {
    return true;
  }
}
}

 ruoyi-ui/src/views/tool/build/RightPanel.vue

@@ -486,7 +486,7 @@
            </el-tree>

          </template>



          <template v-if="activeData.layout === 'colFormItem'">

          <template v-if="activeData.layout === 'colFormItem' && activeData.tag !== 'el-button'">

            <el-divider>正则校验</el-divider>

            <div

              v-for="(item, index) in activeData.regList"