mirror of
https://github.com/Hello-hao/Tbed.git
synced 2024-04-21 12:32:10 +00:00
:rocket:优化代码
This commit is contained in:
hello-hao
-16
@@ -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"]
|
||||
@@ -1,4 +0,0 @@
|
||||
# syntax=docker/dockerfile:1
|
||||
FROM mysql:8.0.31
|
||||
#把sql文件复制到工作目录下
|
||||
COPY ./tbed_core.sql /docker-entrypoint-initdb.d
|
||||
@@ -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:
|
||||
|
||||
@@ -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"]
|
||||
@@ -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"));
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -112,17 +112,17 @@
|
||||
</appender>
|
||||
|
||||
<!--设置一个向上传递的appender,所有级别的日志都会输出-->
|
||||
<appender name="app" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
|
||||
<fileNamePattern>${log.log_dir}/app/%d{yyyy-MM-dd}/app_${log.log_name}-%i.log</fileNamePattern>
|
||||
<maxHistory>${log.maxHistory}</maxHistory>
|
||||
<MaxFileSize>${log.maxSize}</MaxFileSize>
|
||||
<cleanHistoryOnStart>true</cleanHistoryOnStart>
|
||||
</rollingPolicy>
|
||||
<encoder>
|
||||
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] %logger - %msg%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
<!-- <appender name="app" class="ch.qos.logback.core.rolling.RollingFileAppender">-->
|
||||
<!-- <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">-->
|
||||
<!-- <fileNamePattern>${log.log_dir}/app/%d{yyyy-MM-dd}/app_${log.log_name}-%i.log</fileNamePattern>-->
|
||||
<!-- <maxHistory>${log.maxHistory}</maxHistory>-->
|
||||
<!-- <MaxFileSize>${log.maxSize}</MaxFileSize>-->
|
||||
<!-- <cleanHistoryOnStart>true</cleanHistoryOnStart>-->
|
||||
<!-- </rollingPolicy>-->
|
||||
<!-- <encoder>-->
|
||||
<!-- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] %logger - %msg%n</pattern>-->
|
||||
<!-- </encoder>-->
|
||||
<!-- </appender>-->
|
||||
|
||||
<!--name包下的类的日志输出-->
|
||||
<logger name="cn.hellohao" additivity="false" level="DEBUG" >
|
||||
|
||||
Reference in New Issue
Block a user