diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index bb29585..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM openjdk:8
-
-# Add the service itself
-ARG JAR_FILE
-#ADD target/${JAR_FILE} /usr/share/docker-springboot-demo.jar
-ADD web.tar /web.tar
-
-#COPY web/webapps/hellohao/config.json /HellohaoData/web/config/config.json
-COPY application.properties /application.properties
-#COPY hellohao /hellohao
-COPY Tbed.jar /Tbed.jar
-#CMD ["/bin/bash","/web/start.sh"]
-EXPOSE 10088
-EXPOSE 10089
-ENTRYPOINT["/start.sh"]
-#ENTRYPOINT ["java","-jar", "./Tbed.jar"]
\ No newline at end of file
diff --git a/Dockerfile-mysql b/Dockerfile-mysql
deleted file mode 100644
index d34d1a1..0000000
--- a/Dockerfile-mysql
+++ /dev/null
@@ -1,4 +0,0 @@
-# syntax=docker/dockerfile:1
-FROM mysql:8.0.31
-#把sql文件复制到工作目录下
-COPY ./tbed_core.sql /docker-entrypoint-initdb.d
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 20dd6ba..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-version: "3"
-
-services:
- hellohao-tbed:
- build:
- # dockerfile存放路径
- context: .
- # 配置启动参数
- args:
- JAR_FILE: tbed.jar
- dockerfile: Dockerfile-tbed
- ports:
- - "10088:10088"
- - "10089:10089"
- volumes:
- - /HellohaoData/web:/hellohaotbed/webapps
- - /HellohaoData/:/HellohaoData/
- environment:
- # 环境变量, 在application.yml中读取
- MYSQL_URL: jdbc:mysql://hellohaodb/tbed?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
- MYSQL_PASS: 923453645
- HELLOHAO_SERVER_HOST: http://152.32.134.33:10088
- HELLOHAO_WEB_HOST: http://152.32.134.33:10089
- hellohaodb:
- image: mysql:8.0.31
- command:
- - --default-authentication-plugin=mysql_native_password
- - --character-set-server=utf8mb4
- - --collation-server=utf8mb4_general_ci
- - --explicit_defaults_for_timestamp=true
- # container_name: tbed
- build:
- context: .
- dockerfile: Dockerfile-mysql
- ports:
- - "3306:3306"
- volumes:
- - /HellohaoData/mysql:/var/lib/mysql
- environment:
- MYSQL_ROOT_PASSWORD: 923453645
-
-# docker-compose中需要声明named volumes
-volumes:
- sb-10-docker-mysql-data:
-
diff --git a/docker/Dockerfile-tbed b/docker/Dockerfile-tbed
new file mode 100644
index 0000000..d1cc0a0
--- /dev/null
+++ b/docker/Dockerfile-tbed
@@ -0,0 +1,20 @@
+FROM openjdk:8
+
+MAINTAINER 923453645@qq.com
+
+ARG JAR_FILE
+#ADD target/${JAR_FILE} /usr/share/docker-springboot.jar
+
+ADD hellohaotbed/ /hellohaotbed
+COPY appstart.sh /appstart.sh
+
+COPY application.properties /application.properties
+#COPY hellohao /hellohao
+COPY Tbed.jar /Tbed.jar
+
+EXPOSE 10088
+EXPOSE 10089
+
+CMD ["/bin/bash","/appstart.sh"]
+#ENTRYPOINT["/start.sh"]
+#ENTRYPOINT ["java","-jar", "./Tbed.jar"]
\ No newline at end of file
diff --git a/src/main/java/cn/hellohao/TbedApplication.java b/src/main/java/cn/hellohao/TbedApplication.java
index 99f9108..15bb4ba 100644
--- a/src/main/java/cn/hellohao/TbedApplication.java
+++ b/src/main/java/cn/hellohao/TbedApplication.java
@@ -41,21 +41,17 @@ public static void main(String[] args) {
@Bean
public static BeanFactoryPostProcessor dependsOnPostProcessor() {
return bf -> {
- try{
- // Let beans that need the database depend on the DatabaseStartupValidator
- // like the JPA EntityManagerFactory or Flyway
- String[] flyway = bf.getBeanNamesForType(FirstRun.class);
- Stream.of(flyway)
- .map(bf::getBeanDefinition)
- .forEach(it -> it.setDependsOn("databaseStartupValidator"));
+ // Let beans that need the database depend on the DatabaseStartupValidator
+ // like the JPA EntityManagerFactory or Flyway
+ String[] flyway = bf.getBeanNamesForType(FirstRun.class);
+ Stream.of(flyway)
+ .map(bf::getBeanDefinition)
+ .forEach(it -> it.setDependsOn("databaseStartupValidator"));
- String[] jpa = bf.getBeanNamesForType(KeysMapper.class);
- Stream.of(jpa)
- .map(bf::getBeanDefinition)
- .forEach(it -> it.setDependsOn("databaseStartupValidator"));
- }catch (Exception e){
- System.out.println("错错错");
- }
+ String[] jpa = bf.getBeanNamesForType(KeysMapper.class);
+ Stream.of(jpa)
+ .map(bf::getBeanDefinition)
+ .forEach(it -> it.setDependsOn("databaseStartupValidator"));
};
}
diff --git a/src/main/java/cn/hellohao/controller/IndexController.java b/src/main/java/cn/hellohao/controller/IndexController.java
index 4c5f517..00b7630 100644
--- a/src/main/java/cn/hellohao/controller/IndexController.java
+++ b/src/main/java/cn/hellohao/controller/IndexController.java
@@ -43,7 +43,7 @@ public class IndexController {
@RequestMapping(value = "/")
public String Welcome(Model model, HttpServletRequest httpServletRequest) {
model.addAttribute("name", "服务端程序(开源版)");
- model.addAttribute("version", "20230318");
+ model.addAttribute("version", "20230320");
model.addAttribute("ip", GetIPS.getIpAddr(httpServletRequest));
model.addAttribute("links", "https://github.com/Hello-hao/tbed");
return "welcome";
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index b873407..89e1022 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -112,17 +112,17 @@
-
-
- ${log.log_dir}/app/%d{yyyy-MM-dd}/app_${log.log_name}-%i.log
- ${log.maxHistory}
- ${log.maxSize}
- true
-
-
- %d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] %logger - %msg%n
-
-
+
+
+
+
+
+
+
+
+
+
+