diff --git a/disruptor_nmc/pom.xml b/disruptor_nmc/pom.xml index d223e2c..b01a2f0 100644 --- a/disruptor_nmc/pom.xml +++ b/disruptor_nmc/pom.xml @@ -26,6 +26,10 @@ org.springframework.boot spring-boot-starter-web + + org.springframework.boot + spring-boot-starter-thymeleaf + org.springframework.boot diff --git a/disruptor_nmc/src/main/java/com/rehome/disruptor_nmc/service/ScheduledService.java b/disruptor_nmc/src/main/java/com/rehome/disruptor_nmc/service/ScheduledService.java index 3aa5c17..7e20565 100644 --- a/disruptor_nmc/src/main/java/com/rehome/disruptor_nmc/service/ScheduledService.java +++ b/disruptor_nmc/src/main/java/com/rehome/disruptor_nmc/service/ScheduledService.java @@ -134,7 +134,7 @@ public class ScheduledService { * @description: 从中央气象台获取天气数据 * @Param: null */ - @Scheduled(cron = "0 15 * * * *") + //@Scheduled(cron = "0 15 * * * *") public void getNmcNowWeather() { System.out.println("scheduledGetWeather"); System.out.println("=====>>>>>使用cron:" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); diff --git a/disruptor_nmc/src/main/resources/application.yml b/disruptor_nmc/src/main/resources/application.yml index 810ca57..2fab41d 100644 --- a/disruptor_nmc/src/main/resources/application.yml +++ b/disruptor_nmc/src/main/resources/application.yml @@ -1,6 +1,6 @@ #1.项目启动的端口 server: - port: 18080 + port: 8080 spring: datasource: @@ -10,7 +10,7 @@ spring: # url: jdbc:mysql://localhost:3306/head_office_data_center?characterEncoding=utf-8&serverTimezone=UTC&autoReconnect=true # url: jdbc:mysql://127.0.0.1:3306/head_office_data_center?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true # url: jdbc:mysql://localhost:3306/head_office_data_center?useUnicode=true&characterEncoding=utf-8&useSSL=true&nullCatalogMeansCurrent=true&serverTimezone=UTC - url: jdbc:mysql://192.168.2.38:3306/disruptor_nmc?useUnicode=true&characterEncoding=utf-8&useSSL=false + url: jdbc:mysql://192.168.2.18:3306/disruptor_nmc?useUnicode=true&characterEncoding=utf-8&useSSL=false username: root password: Skyinno251, # driverClassName: oracle.jdbc.driver.OracleDriver @@ -36,6 +36,13 @@ spring: open-in-view: true hibernate: ddl-auto: update # 第一次建表create 后面用update,要不然每次重启都会新建表 +thymeleaf: + enabled: true #开启thymeleaf视图解析 + encoding: utf-8 #编码 + prefix: classpath:/templates/ #前缀 + cache: false #是否使用缓存 + mode: HTML #严格的HTML语法模式 + suffix: .html #后缀名 rehome: resources-path: /home/admin/storage # 外部资源文件存储路径 \ No newline at end of file diff --git a/visit/src/main/resources/application.yml b/visit/src/main/resources/application.yml index 5dfc4a2..41f3b5f 100644 --- a/visit/src/main/resources/application.yml +++ b/visit/src/main/resources/application.yml @@ -19,13 +19,13 @@ spring: master: driver-class-name: com.mysql.jdbc.Driver #com.mysql.jdbc.Driver # 8.0 com.mysql.cj.jdbc.Driver #url: jdbc:mysql://127.0.0.1:3306/storm?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false - url: jdbc:mysql://127.0.0.1:3306/storm?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true + url: jdbc:mysql://192.168.2.18:3306/storm?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true username: root password: Skyinno251, slave: driver-class-name: com.mysql.jdbc.Driver #com.mysql.jdbc.Driver # 8.0 com.mysql.cj.jdbc.Driver #url: jdbc:mysql://124.156.183.8:3306/storm?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true - url: jdbc:mysql://127.0.0.1:3306/storm?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true + url: jdbc:mysql://192.168.2.18:3306/storm?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true username: root password: Skyinno251, # 数据源配置