diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/select2/select2.js b/ruoyi-admin/src/main/resources/static/ajax/libs/select2/select2.js index ecd9a97..587130f 100644 --- a/ruoyi-admin/src/main/resources/static/ajax/libs/select2/select2.js +++ b/ruoyi-admin/src/main/resources/static/ajax/libs/select2/select2.js @@ -4614,7 +4614,7 @@ S2.define('select2/i18n/en',[],function () { return '载入更多结果…'; }, maximumSelected: function (args) { - var message = '最多只能选择' + args.maximum + '个项目'; + var message = '最多只能' + args.maximum + '个选项'; if (args.maximum != 1) { message += 's'; diff --git a/ruoyi-admin/src/main/resources/templates/system/user/add.html b/ruoyi-admin/src/main/resources/templates/system/user/add.html index d616476..93bc518 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/add.html @@ -248,7 +248,7 @@ $(function() { $('#post').select2({ - placeholder:"请选择岗位", + placeholder: "请选择岗位", allowClear: true }); }) diff --git a/ruoyi-admin/src/main/resources/templates/system/user/edit.html b/ruoyi-admin/src/main/resources/templates/system/user/edit.html index 0b499f5..1e55c49 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/edit.html @@ -219,7 +219,7 @@ $(function() { $('#post').select2({ - placeholder:"请选择岗位", + placeholder: "请选择岗位", allowClear: true }); }) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionFactory.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionFactory.java index f59c5bf..9b1e3a2 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionFactory.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionFactory.java @@ -8,7 +8,6 @@ import org.apache.shiro.web.session.mgt.WebSessionContext; import org.springframework.stereotype.Component; import com.ruoyi.common.utils.IpUtils; import com.ruoyi.common.utils.ServletUtils; - import eu.bitwalker.useragentutils.UserAgent; /** diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/util/ShiroUtils.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/util/ShiroUtils.java index ae05677..98f9bb3 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/util/ShiroUtils.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/util/ShiroUtils.java @@ -7,7 +7,6 @@ import org.apache.shiro.session.Session; import org.apache.shiro.subject.Subject; import org.apache.shiro.subject.PrincipalCollection; import org.apache.shiro.subject.SimplePrincipalCollection; - import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.bean.BeanUtils; import com.ruoyi.framework.shiro.realm.UserRealm;