mrbird há 6 anos atrás
pai
commit
f50bcadb2b

+ 1 - 1
febs-auth/src/main/java/cc/mrbird/febs/auth/service/impl/SocialLoginServiceImpl.java

@@ -151,7 +151,7 @@ public class SocialLoginServiceImpl implements SocialLoginService {
         if (isCurrentUser(username)) {
             this.userConnectionService.deleteByCondition(username, oauthType);
         } else {
-            throw new FebsException("绑失败,您无权解绑别人的账号");
+            throw new FebsException("绑失败,您无权解绑别人的账号");
         }
     }
 

+ 1 - 1
febs-common/src/main/java/cc/mrbird/febs/common/utils/DateUtil.java

@@ -67,7 +67,7 @@ public class DateUtil {
     public static String formatCSTTime(String date, String format) throws ParseException {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat(CST_TIME_PATTERN, Locale.US);
         Date usDate = simpleDateFormat.parse(date);
-        return DateUtil.getDateFormat(usDate, format);
+        return getDateFormat(usDate, format);
     }
 
     /**

+ 1 - 1
febs-common/src/main/java/cc/mrbird/febs/common/utils/TreeUtil.java

@@ -19,7 +19,7 @@ public class TreeUtil {
      * @param nodes nodes
      * @return <T> List<? extends Tree>
      */
-    public static <T> List<? extends Tree> build(List<? extends Tree<T>> nodes) {
+    public static <T> List<? extends Tree<?>> build(List<? extends Tree<T>> nodes) {
         if (nodes == null) {
             return null;
         }

+ 1 - 1
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java

@@ -35,7 +35,7 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
             List<Dept> depts = findDepts(dept, request);
             List<DeptTree> trees = new ArrayList<>();
             buildTrees(trees, depts);
-            List<? extends Tree> deptTree = TreeUtil.build(trees);
+            List<? extends Tree<?>> deptTree = TreeUtil.build(trees);
 
             result.put(PageConstant.ROWS, deptTree);
             result.put(PageConstant.TOTAL, depts.size());

+ 1 - 0
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/LogServiceImpl.java

@@ -98,6 +98,7 @@ public class LogServiceImpl extends ServiceImpl<LogMapper, Log> implements ILogS
         save(log);
     }
 
+    @SuppressWarnings("all")
     private StringBuilder handleParams(StringBuilder params, Object[] args, List paramNames) {
         try {
             for (int i = 0; i < args.length; i++) {

+ 1 - 1
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/MenuServiceImpl.java

@@ -51,7 +51,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
             if (StringUtils.equals(menu.getType(), Menu.TYPE_BUTTON)) {
                 result.put(PageConstant.ROWS, trees);
             } else {
-                List<? extends Tree> menuTree = TreeUtil.build(trees);
+                List<? extends Tree<?>> menuTree = TreeUtil.build(trees);
                 result.put(PageConstant.ROWS, menuTree);
             }