diff --git a/pom.xml b/pom.xml
index 9f2ca2b627edb7e8d2dc80abec8f9ce0c06487fb..8f82e2a56fe7d22b739044f435a650e47804155f 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 11c78fca6ac5aa4db53b517d2bc1e095ea83fb62..45014adee4e17ff27bd081068a6b38b1b40fb7cf 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 c56e3a31282e891158799e84aea6b857440199a9..5306917133bf5ff0db2afc7b8aa56e7d3a69657d 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 e8aed218920053b5d2695c231118603e229bc832..3b6181b64ffdf760ca2f3d7db561863af7740a47 100644
--- a/src/main/resources/templates/main.ftl
+++ b/src/main/resources/templates/main.ftl
@@ -11,11 +11,11 @@
-
+
问数
-
+