kotlin

Author: houko

api/src/main/java/info/xiaomo/api/dao/base/CommonDao.java

@@ -18,13 +18,13 @@
  * @author : xiaomo
  * github: https://github.com/xiaomoinfo
  * email: [email protected]
-
+ * <p>
  * Date: 2016/4/1 20:46
  * Description: 公共dao层
  * Copyright(©) 2015 by xiaomo.
  **/
 @Repository
-@Transactional
+@Transactional(rollbackFor = {})
 public class CommonDao {
 
     @PersistenceContext

api/src/main/java/info/xiaomo/api/service/UserService.java

@@ -4,9 +4,6 @@
 import info.xiaomo.api.model.UserModel;
 import info.xiaomo.core.exception.UserNotFoundException;
 import org.springframework.data.domain.Page;
-import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -25,19 +22,56 @@
  **/
 public interface UserService {
 
+    /**
+     * 根据id查用户
+     *
+     * @param id id
+     * @return UserModel
+     */
     UserModel findUserById(Long id);
 
-    @Transactional(isolation = Isolation.DEFAULT, propagation = Propagation.REQUIRED)
+    /**
+     * 根据邮件查用户
+     * @param email email
+     * @return UserModel
+     */
     UserModel findUserByEmail(String email);
 
+    /**
+     * 添加用户
+     * @param  model model
+     * @return UserModel
+     */
     UserModel addUser(UserModel model);
 
+    /**
+     * 更新用户
+     * @param model model
+     * @return UserModel
+     * @throws UserNotFoundException UserNotFoundException
+     */
     UserModel updateUser(UserModel model) throws UserNotFoundException;
 
+    /**
+     * 查找所有 带分页
+     * @param start start
+     * @param  pageSize pageSize
+     * @return Page
+     */
     Page<UserModel> findAll(int start, int pageSize);
 
+    /**
+     * 查找所有 不带分页
+     * @return List
+     */
     List<UserModel> findAll();
 
+    /**
+     * 删除用户
+     * @param id id
+     * @return UserModel
+     * @throws UserNotFoundException
+     */
     UserModel deleteUserById(Long id) throws UserNotFoundException;
 
 }

core/src/main/java/info/xiaomo/core/untils/FileUtil.java

@@ -641,7 +641,7 @@ private static void list(List<File> list, File file,
             }
         }
         if (file.isDirectory()) {
-            File files[] = file.listFiles();
+            File[] files = file.listFiles();
             for (File file1 : files != null ? files : new File[0]) {
                 list(list, file1, filter);
             }

core/src/main/java/info/xiaomo/core/untils/HtmlUtil.java

@@ -9,6 +9,7 @@
  * Today the best performance  as tomorrow newest starter!
  * Created by IntelliJ IDEA.
  * <p>
+ *
  * @author : xiaomo
  * github: https://github.com/syoubaku
  * email: [email protected]
@@ -27,7 +28,7 @@ public class HtmlUtil {
      * @return 是否包含html标签
      */
     public static boolean containsHTMLTag(String str) {
-        if (StringUtil.Companion.isBlank(str)) {
+        if (StringUtil.isBlank(str)) {
             return false;
         }
 

core/src/main/java/info/xiaomo/core/untils/SqlUtil.java

@@ -42,7 +42,7 @@ public static String sqlHolder(int size) {
      */
     public static String sql4DB(String sql, String dbtype) {
         if (!"oracle".equalsIgnoreCase(dbtype)) {
-            sql = StringUtil.Companion.toISO(sql);
+            sql = StringUtil.toISO(sql);
         }
         return sql;
     }