From 41793365e280b78b07946122664d40afab98491c Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Fri, 3 May 2019 23:56:31 +0800
Subject: [PATCH] Create getEnvironments api.

---
 .../app/controller/admin/api/AdminController.java   | 13 +++++++++++++
 .../run/halo/app/service/impl/AdminServiceImpl.java |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/run/halo/app/controller/admin/api/AdminController.java b/src/main/java/run/halo/app/controller/admin/api/AdminController.java
index 150d2b41b..bee9840ef 100644
--- a/src/main/java/run/halo/app/controller/admin/api/AdminController.java
+++ b/src/main/java/run/halo/app/controller/admin/api/AdminController.java
@@ -10,6 +10,10 @@ import run.halo.app.security.token.AuthToken;
 import run.halo.app.service.AdminService;
 
 import javax.validation.Valid;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Admin controller.
@@ -39,6 +43,15 @@ public class AdminController {
         return adminService.getCount();
     }
 
+    @GetMapping("environments")
+    @ApiOperation("Gets environments info")
+    public Map<String, Object> getEnvironments() {
+        Map<String, Object> result = new HashMap<>();
+        RuntimeMXBean runtimeMXBean = ManagementFactory.getRuntimeMXBean();
+        result.put("startTime", runtimeMXBean.getStartTime());
+        return result;
+    }
+
     @PostMapping("login")
     @ApiOperation("Login")
     @CacheLock(autoDelete = false)
diff --git a/src/main/java/run/halo/app/service/impl/AdminServiceImpl.java b/src/main/java/run/halo/app/service/impl/AdminServiceImpl.java
index 86e9a79cd..f09259602 100644
--- a/src/main/java/run/halo/app/service/impl/AdminServiceImpl.java
+++ b/src/main/java/run/halo/app/service/impl/AdminServiceImpl.java
@@ -85,7 +85,7 @@ public class AdminServiceImpl implements AdminService {
 
         if (!userService.passwordMatch(user, loginParam.getPassword())) {
             // If the password is mismatch
-            throw new BadRequestException("Username or password is incorrect");
+            throw new BadRequestException("用户名或者密码不正确");
         }
 
         if (SecurityContextHolder.getContext().isAuthenticated()) {