From 72f402a203dee99e9c05ef53e84b1ceb6a3f1e07 Mon Sep 17 00:00:00 2001 From: Henry He Date: Mon, 3 Jul 2023 23:13:54 +0800 Subject: [PATCH] feat: fe version --- pom.xml | 7 +------ src/main/java/org/enthusa/askdata/Application.java | 5 ++++- src/main/resources/application-dev.yml | 2 +- src/main/resources/templates/main.ftl | 4 ++-- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 9f2ca2b..8f82e2a 100644 --- a/pom.xml +++ b/pom.xml @@ -88,11 +88,6 @@ druid 1.2.18 - - org.mybatis - mybatis - 3.5.2 - org.apache.commons commons-text @@ -114,7 +109,7 @@ org.apache.httpcomponents - httpcore + httpclient com.alibaba diff --git a/src/main/java/org/enthusa/askdata/Application.java b/src/main/java/org/enthusa/askdata/Application.java index 11c78fc..45014ad 100644 --- a/src/main/java/org/enthusa/askdata/Application.java +++ b/src/main/java/org/enthusa/askdata/Application.java @@ -1,6 +1,7 @@ package org.enthusa.askdata; import org.enthusa.askdata.config.GlobalSetting; +import org.enthusa.avatar.utils.http.OkHttpUtils; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.stereotype.Controller; @@ -25,7 +26,9 @@ public class Application { @GetMapping("/") public ModelAndView home(ModelAndView model) { - model.addObject("env", globalSetting.getEnv()); + String url = String.format("http://xiyu.zhiyuanbiji.cn/api/askdata?env=%s", globalSetting.getEnv()); + String version = OkHttpUtils.get(url); + model.addObject("version", version); model.setViewName("main"); return model; } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index c56e3a3..5306917 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -6,7 +6,7 @@ settings: spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/askdata_dev?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8 + url: jdbc:mysql://127.0.0.1:3306/askdata_dev?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=GMT%2b8 username: askdata_user password: askdata624@MySQL schema: classpath:import.sql diff --git a/src/main/resources/templates/main.ftl b/src/main/resources/templates/main.ftl index e8aed21..3b6181b 100644 --- a/src/main/resources/templates/main.ftl +++ b/src/main/resources/templates/main.ftl @@ -11,11 +11,11 @@ - + 问数
- + -- GitLab