解决无法启动的问题

liachuan · Oct 11, 2022 · 7ee626e · 7ee626e
1 parent 71e2bf0
commit 7ee626e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/doc/docker/docker-compose.yml b/doc/docker/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.6'
 services:
   frostmourne-monitor:
-    image: registry.cn-hangzhou.aliyuncs.com/kechangqing/frostmourne:0.9.1
+    image: registry.cn-hangzhou.aliyuncs.com/kechangqing/frostmourne:1.0
     container_name: frostmourne-monitor
     environment:
       datasource_frostmourne_url: jdbc:mysql://host.docker.internal:3306/frostmourne?useSSL=false&verifyServerCertificate=false&useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&serverTimezone=GMT%2B8

diff --git a/frostmourne-monitor/src/assembly/config/application.properties b/frostmourne-monitor/src/assembly/config/application.properties
@@ -33,3 +33,7 @@ your.email.sender.password=
 your.wechat.corpid=
 your.wechat.agentid=
 your.wechat.secret=
+
+### encryption
+encrypt_key:EX31$@*^ac1
+encrypt_sensitives:username,password
diff --git a/frostmourne-monitor/src/assembly/scripts/startup.sh b/frostmourne-monitor/src/assembly/scripts/startup.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
-source /etc/profile
+
+#source /etc/profile
 SERVICE_NAME=frostmourne-monitor
 
 SCRIPTS_DIR=$(cd "$(dirname "$0")";pwd)

diff --git a/...tor/src/main/java/com/autohome/frostmourne/monitor/dao/prometheus/impl/PrometheusDao.java b/...tor/src/main/java/com/autohome/frostmourne/monitor/dao/prometheus/impl/PrometheusDao.java
@@ -25,8 +25,6 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Repository;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
 @Repository