igor/org.ccalm.jwt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Добавил вывод дату сборки

Browse Source
This commit is contained in:
Igor I
2024-12-19 17:37:35 +05:00
parent 0e5e3f04af
commit 24bc6de374
3 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/org/ccalm/jwt/MainController.java
View File

@ -59,7 +59,12 @@ import java.time.Duration;
import java.time.Instant;
import java.util.*;
import java.util.List;
import java.util.jar.Attributes;
import java.util.jar.JarFile;
import java.util.regex.Pattern;
import java.io.InputStream;
import java.util.Properties;
import java.io.IOException;
@Controller
public class MainController implements ServletContextAware {
@ -262,10 +267,26 @@ public class MainController implements ServletContextAware {
public String index(Model model,@RequestParam(required=false,name="lng",defaultValue = "1") String language_id) {
JSONObject json = new JSONObject();
json.put("error_code",0);
json.put("error_message","Application name: "+application_name);
json.put("error_message","");
json.put("error_marker",(String)null);
json.put("active_connections",dataSource.getHikariPoolMXBean().getActiveConnections());
json.put("idle_connections",dataSource.getHikariPoolMXBean().getIdleConnections());
String buildDate="";
//String buildVersion="";
try {
InputStream inputStream = MainController.class.getClassLoader().getResourceAsStream("META-INF/build-info.properties");
if (inputStream != null) {
Properties properties = new Properties();
properties.load(inputStream);
buildDate = properties.getProperty("build.time");
//buildVersion = properties.getProperty("build.version");
}
} catch (Exception e) {
e.printStackTrace();
}
json.put("build_date",buildDate);
//json.put("build_version",buildVersion);
json.put("name",application_name);
//json.put("active_connections",dataSource.getHikariPoolMXBean().getActiveConnections());
//json.put("idle_connections",dataSource.getHikariPoolMXBean().getIdleConnections());
return json.toString();
}
/*