合并website和api模块

Author: houko

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

@@ -838,9 +838,4 @@ public static boolean isImage(String imageName) {
                 || "png".equals(fileType) || "PNG".equals(fileType));
     }
 
-    public static void main(String args[]) throws Exception {
-        System.out.println(TimeUtil.getDateNow(TimeUtil.DATE_FORMAT_STRING));
-        System.out.println(getType("E:\\oscchina\\xiaomoBlogJava\\core\\src\\main\\java\\info\\xiaomo\\core\\constant\\GenderConst.java"));
-    }
-
 }

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

@@ -799,7 +799,7 @@ public static String null2SZero(String str) {
      * @return
      */
     public static String stringToUnicode(String text) {
-        String result = "";
+        StringBuffer result = new StringBuffer();
         int input;
         StringReader isr;
         try {
@@ -809,14 +809,14 @@ public static String stringToUnicode(String text) {
         }
         try {
             while ((input = isr.read()) != -1) {
-                result = result + "&#x" + Integer.toHexString(input) + ";";
+                result.append("&#x").append(input).append(";");
 
             }
         } catch (IOException e) {
             return "-2";
         }
         isr.close();
-        return result;
+        return result.toString();
 
     }
 
@@ -828,23 +828,21 @@ public static String gb2utf(String inStr) {
         char temChr;
         int ascInt;
         int i;
-        String result = "";
+        StringBuilder stringBuffer = new StringBuilder();
         if (inStr == null) {
             inStr = "";
         }
         for (i = 0; i < inStr.length(); i++) {
             temChr = inStr.charAt(i);
             ascInt = temChr;
-            //System.out.println("1=="+ascInt);
-            //System.out.println("1=="+Integer.toBinaryString(ascInt));
             if (Integer.toHexString(ascInt).length() > 2) {
-                result = result + "&#x" + Integer.toHexString(ascInt) + ";";
+                stringBuffer.append("&#x").append(Integer.toHexString(ascInt)).append(";");
             } else {
-                result = result + temChr;
+                stringBuffer.append(temChr);
             }
 
         }
-        return result;
+        return stringBuffer.toString();
     }
 
     /**

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

@@ -502,8 +502,6 @@ public static String getDateFromNow(int afterDay, String pattern) {
      */
     public static String getNowForFileName(int afterDay) {
         GregorianCalendar calendar = new GregorianCalendar();
-//    Date DATE = calendar.getTime();
-
         SimpleDateFormat df = new SimpleDateFormat("yyyyMMddHHmmss");
 
         calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) + afterDay);

multipleSource/src/main/java/info/xiaomo/multipleSource/MultipleSourceMain.java renamed to multipleSource/src/main/java/info/xiaomo/multiplesource/MultipleSourceMain.java

@@ -1,4 +1,4 @@
-package info.xiaomo.multipleSource;
+package info.xiaomo.multiplesource;
 
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.SpringApplication;

multipleSource/src/main/java/info/xiaomo/multipleSource/controller/MultipleSourceController.java renamed to multipleSource/src/main/java/info/xiaomo/multiplesource/controller/MultipleSourceController.java

@@ -1,7 +1,7 @@
-package info.xiaomo.multipleSource.controller;
+package info.xiaomo.multiplesource.controller;
 
 import info.xiaomo.core.base.Result;
-import info.xiaomo.multipleSource.sql.Sql;
+import info.xiaomo.multiplesource.sql.Sql;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.jdbc.core.JdbcTemplate;

multipleSource/src/main/java/info/xiaomo/multipleSource/domain/User.java renamed to multipleSource/src/main/java/info/xiaomo/multiplesource/domain/User.java

@@ -1,4 +1,4 @@
-package info.xiaomo.multipleSource.domain;
+package info.xiaomo.multiplesource.domain;
 
 
 import lombok.Data;

multipleSource/src/main/java/info/xiaomo/multipleSource/sql/Sql.java renamed to multipleSource/src/main/java/info/xiaomo/multiplesource/sql/Sql.java

@@ -1,4 +1,4 @@
-package info.xiaomo.multipleSource.sql;
+package info.xiaomo.multiplesource.sql;
 
 /**
  * 把今天最好的表现当作明天最新的起点．．～

mybatis/src/main/java/info/xiaomo/mybatis/mapper/UserMapper.java

@@ -20,16 +20,24 @@ public interface UserMapper {
 
     /**
      * 根据名字查
+     * @param name
+     * @return user
      */
     @Select("SELECT * FROM USER WHERE NAME = #{name}")
     User findByName(@Param("name") String name);
 
+    /**
+     * 插入
+     *
+     * @param name
+     * @param age
+     * @return
+     */
     @Insert("INSERT INTO USER(NAME, AGE) VALUES(#{name}, #{age})")
     int insert(@Param("name") String name, @Param("age") Integer age);
 
     /**
      * 查所有
-     *
      * @return
      */
     @Select("SELECT * FROM USER WHERE 1=1")

website/src/main/java/info/xiaomo/website/controller/LinkController.java

@@ -176,24 +176,6 @@ public Result findById(@PathVariable Long id) {
         return null;
     }
 
-
-//    /**
-//     * 返回所有 带分页
-//     *
-//     * @param start    start
-//     * @param pageSize pageSize
-//     * @return 分页数据
-//     */
-//    @RequestMapping("findAll")
-//    public Result findAll(@RequestParam(value = "start", defaultValue = "1") int start, @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
-//        Page<LinkModel> pages = service.findAll(start, pageSize);
-//        if (pages == null || pages.getSize() <= 0) {
-//            return new Result<>(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage());
-//        }
-//        return new Result<>(pages);
-//    }
-
-
     /**
      * 添加链接
      *

website/src/main/java/info/xiaomo/website/dao/AdminUserDao.java

@@ -21,13 +21,19 @@
  * @author : xiaomo
  * github: https://github.com/xiaomoinfo
  * email: xiaomo@xiaomo.info
-
+ * <p>
  * Date: 16/4/2 13:08
  * Copyright(©) 2015 by xiaomo.
  */
 @Repository
 public interface AdminUserDao extends JpaRepository<AdminModel, Long> {
 
+    /**
+     * 根据名字查用户
+     *
+     * @param s
+     * @return
+     */
     AdminModel findAdminUserByUserName(String s);
 
 }