feat: fe version

72f402a2 · 知源笔记 · e3cebe57 · 72f402a2 · 72f402a2 · 72f402a2
4 changed file
--- a/pom.xml
+++ b/pom.xml
@@ -88,11 +88,6 @@
      <artifactId>druid</artifactId>
      <version>1.2.18</version>
    </dependency>
-    <dependency>
-      <groupId>org.mybatis</groupId>
-      <artifactId>mybatis</artifactId>
-      <version>3.5.2</version>
-    </dependency>
    <dependency>
      <groupId>org.apache.commons</groupId>
      <artifactId>commons-text</artifactId>
@@ -114,7 +109,7 @@
    </dependency>
    <dependency>
      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore</artifactId>
+      <artifactId>httpclient</artifactId>
    </dependency>
    <dependency>
      <groupId>com.alibaba</groupId>

--- a/src/main/java/org/enthusa/askdata/Application.java
+++ b/src/main/java/org/enthusa/askdata/Application.java
 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;
    }

--- 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

--- a/src/main/resources/templates/main.ftl
+++ b/src/main/resources/templates/main.ftl
@@ -11,11 +11,11 @@
    <meta name='apple-mobile-web-app-capable' content='yes'>
    <link href='//kysw-static.oss-cn-qingdao.aliyuncs.com/david.ico' rel='shortcut icon'>
    <link href='//kysw-static.oss-cn-qingdao.aliyuncs.com/david.ico' rel='apple-touch-icon'>
-    <link href='https://kysw-static.oss-cn-qingdao.aliyuncs.com/askdata-${(env)!}.css' rel='stylesheet'>
+    <link href='https://kysw-static.oss-cn-qingdao.aliyuncs.com/askdata${(version)!}.css' rel='stylesheet'>
    <title>问数</title>
 </head>
 <body ontouchstart>
 <div id='app'></div>
-<script type='text/javascript' src='https://kysw-static.oss-cn-qingdao.aliyuncs.com/askdata-${(env)!}.js'></script>
+<script type='text/javascript' src='https://kysw-static.oss-cn-qingdao.aliyuncs.com/askdata${(version)!}.js'></script>
 </body>
 </html>