update code

houko · houko · commit 191614f47206 · 2017-11-06T15:16:18.000+08:00
diff --git a/core/src/main/java/info/xiaomo/core/untils/CastUtil.kt b/core/src/main/java/info/xiaomo/core/untils/CastUtil.kt
@@ -41,16 +41,16 @@ class CastUtil {
         }
 
         fun toLong(number: Any?): Long {
-            if (number == null) {
-                return 0L
+            return if (number == null) {
+                0L
             } else if (number is Number) {
-                return number.toLong()
+                number.toLong()
             } else if (number is String) {
                 val str = number as String?
                 val isNumber = isNumeric(str)
-                return if (isNumber == 1) java.lang.Long.parseLong(str!!) else if (isNumber == 2) java.lang.Double.valueOf(str!!).toLong() else 0L
+                if (isNumber == 1) java.lang.Long.parseLong(str!!) else if (isNumber == 2) java.lang.Double.valueOf(str!!).toLong() else 0L
             } else {
-                return 0L
+                0L
             }
         }
 
diff --git a/core/src/main/java/info/xiaomo/core/untils/LunarCalendarUtil.kt b/core/src/main/java/info/xiaomo/core/untils/LunarCalendarUtil.kt
@@ -11,11 +11,11 @@ object LunarCalendarUtil {
     /**
      * 支持转换的最小农历年份
      */
-    val MIN_YEAR = 1900
+    private val MIN_YEAR = 1900
     /**
      * 支持转换的最大农历年份
      */
-    val MAX_YEAR = 2099
+    private val MAX_YEAR = 2099
 
     /**
      * 公历每月前的天数
@@ -352,10 +352,3 @@ object LunarCalendarUtil {
     }
 
 }
-/**
- * 传回农历year年month月的总天数
- *
- * @param year  要计算的年份
- * @param month 要计算的月
- * @return 传回天数
- */
diff --git a/core/src/main/java/info/xiaomo/core/untils/MailUtil.kt b/core/src/main/java/info/xiaomo/core/untils/MailUtil.kt
@@ -33,8 +33,8 @@ object MailUtil {
         get() {
             val props = Properties()
             val dir = System.getProperty("user.dir")
-            val `is` = FileInputStream(dir + "/website/src/main/resources/config/application.properties")
-            props.load(`is`)
+            val fileInputStream = FileInputStream(dir + "/website/src/main/resources/config/application.properties")
+            props.load(fileInputStream)
             USERNAME = props["mail.username"].toString()
             PASSWORD = props["mail.password"].toString()
             val authenticator = object : Authenticator() {
diff --git a/core/src/main/java/info/xiaomo/core/untils/Md5Util.kt b/core/src/main/java/info/xiaomo/core/untils/Md5Util.kt
@@ -57,7 +57,7 @@ object Md5Util {
     private fun byteToHexString(b: Byte): String {
         var n = b.toInt()
         if (n < 0) {
-            n = 256 + n
+            n += 256
         }
         val d1 = n / 16
         val d2 = n % 16
diff --git a/core/src/main/java/info/xiaomo/core/untils/RandomUtil.kt b/core/src/main/java/info/xiaomo/core/untils/RandomUtil.kt
@@ -141,14 +141,10 @@ object RandomUtil {
      * @return -1失败or随机的索引
      */
     fun randomIndexByProb(array: IntArray?): Int {
-        if (array == null || array.size == 0) {
+        if (array == null || array.isEmpty()) {
             throw IllegalArgumentException("元素数组不能为空！")
         }
-        val list: MutableList<Int>
-        list = ArrayList()
-        for (i in array) {
-            list.add(i)
-        }
+        val list: MutableList<Int> = array.toMutableList()
         return randomIndexByProb(list)
     }
 
diff --git a/website/src/main/java/info/xiaomo/website/controller/AdminUserController.kt b/website/src/main/java/info/xiaomo/website/controller/AdminUserController.kt
@@ -47,16 +47,15 @@ constructor(private val service: AdminUserService) {
      *
      * @return 不分页
      */
-    val all: Result<*>
-        @RequestMapping(value = "findAll", method = arrayOf(RequestMethod.GET))
-        @ApiOperation(value = "返回所有用户信息", notes = "不分页", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-        @ApiResponses(value = *arrayOf(ApiResponse(code = 404, message = "Not Found"), ApiResponse(code = 400, message = "No Name Provided")))
-        get() {
-            val pages = service.getAdminUsers()
-            return if (pages.isEmpty()) {
-                Result(pages)
-            } else Result(pages)
-        }
+    @RequestMapping(value = "findAll", method = arrayOf(RequestMethod.GET))
+    @ApiOperation(value = "返回所有用户信息", notes = "不分页", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @ApiResponses(value = *arrayOf(ApiResponse(code = 404, message = "Not Found"), ApiResponse(code = 400, message = "No Name Provided")))
+    fun findAll(): Result<List<AdminModel>> {
+        val pages = service.getAdminUsers()
+        return if (pages.isEmpty()) {
+            Result(pages)
+        } else Result(pages)
+    }
 
     /**
      * 后台账户登录
@@ -192,8 +191,7 @@ constructor(private val service: AdminUserService) {
     @ApiResponses(value = *arrayOf(ApiResponse(code = 404, message = "Not Found"), ApiResponse(code = 400, message = "No Name Provided")))
     @Throws(UserNotFoundException::class)
     fun forbid(@PathVariable("id") id: Long?): Result<*> {
-        var model: AdminModel?
-        model = service.forbidAdminUserById(id)
+        val model: AdminModel? = service.forbidAdminUserById(id)
         return Result(model)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ object Md5Util {`
`57`	`57`	`private fun byteToHexString(b: Byte): String {`
`58`	`58`	`var n = b.toInt()`
`59`	`59`	`if (n < 0) {`
`60`		`- n = 256 + n`
	`60`	`+ n += 256`
`61`	`61`	`}`
`62`	`62`	`val d1 = n / 16`
`63`	`63`	`val d2 = n % 16`