diff --git a/pom.xml b/pom.xml
index 89c4050..ab43541 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
org.springframework.boot
spring-boot-starter-parent
- 3.0.6
+ 3.0.11
com.flagnote
@@ -19,7 +19,7 @@
17
17
17
- 2022.0.2
+ 2022.0.4
registry.openif.com:5000
flagnote
@@ -52,6 +52,10 @@
org.springframework.boot
spring-boot-starter-web
+
+ org.springframework.boot
+ spring-boot-starter-freemarker
+
org.springframework.boot
spring-boot-starter-aop
diff --git a/src/main/docker/dockerfile b/src/main/docker/dockerfile
index 312ed36..92600ea 100644
--- a/src/main/docker/dockerfile
+++ b/src/main/docker/dockerfile
@@ -1,8 +1,6 @@
-FROM openjdk:17-slim
+FROM registry.openif.com:5000/flagnote/flagnote-docker-image:0.0.1
VOLUME /tmp
ADD flagnote-service-0.0.1.jar app.jar
RUN sh -c 'touch /app.jar'
-RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
-RUN apt-get update && apt-get install -y curl
ENV JAVA_OPTS=""
ENTRYPOINT [ "sh", "-c", "exec java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /app.jar" ]
\ No newline at end of file
diff --git a/src/main/java/com/flagnote/note/controller/HtmlController.java b/src/main/java/com/flagnote/note/controller/HtmlController.java
new file mode 100644
index 0000000..32a920d
--- /dev/null
+++ b/src/main/java/com/flagnote/note/controller/HtmlController.java
@@ -0,0 +1,36 @@
+package com.flagnote.note.controller;
+
+import java.util.Date;
+import java.util.Map;
+
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.flagnote.note.entity.KeyMeta;
+import com.flagnote.note.utils.BizKeyUtils;
+import com.flagnote.note.utils.JsonUtils;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Controller
+@RequestMapping("/html")
+public class HtmlController {
+
+ @RequestMapping(value = "/redirect", method = RequestMethod.GET, produces = MediaType.TEXT_HTML_VALUE)
+ public String redirect(Map map) {
+ KeyMeta c = new KeyMeta();
+ String key = BizKeyUtils.getKey();
+ c.setKey(key);
+ c.setServerTime(new Date().getTime());
+ c.setCipher(BizKeyUtils.getCipher(key, c.getServerTime().toString()));
+ c.setSecretKey(BizKeyUtils.getSecretKey(key));
+
+ map.put("keyMeta", JsonUtils.toJson(c));
+
+ return "redirect";
+ }
+
+}
diff --git a/src/main/resources/templates/redirect.ftl b/src/main/resources/templates/redirect.ftl
new file mode 100644
index 0000000..3468400
--- /dev/null
+++ b/src/main/resources/templates/redirect.ftl
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ flagnote.com
+
+
+
+
+
+
+
+
\ No newline at end of file