diff --git a/upms/upms-biz/src/main/java/com/rax/RaxAdminApplication.java b/upms/upms-biz/src/main/java/com/rax/RaxAdminApplication.java index 62ffb20..f48fcc8 100644 --- a/upms/upms-biz/src/main/java/com/rax/RaxAdminApplication.java +++ b/upms/upms-biz/src/main/java/com/rax/RaxAdminApplication.java @@ -15,20 +15,18 @@ import org.springframework.scheduling.annotation.EnableScheduling; @EnableRaxDoc(value = "admin") @EnableRaxResourceServer @EnableScheduling // 开启定时任务 -> 清除日志相关内容 -// 一期下面解注 -@SpringBootApplication(exclude = MongoAutoConfiguration.class) -// 二期下面解注 -//@SpringBootApplication +// 一期下面解注, 二期注释掉 +//@SpringBootApplication(exclude = MongoAutoConfiguration.class) +@SpringBootApplication @ComponentScan( basePackages = {"com.rax"}, excludeFilters = { - @ComponentScan.Filter(type = FilterType.REGEX, pattern = "com.rax.vital.v2.*") + @ComponentScan.Filter(type = FilterType.REGEX, pattern = "com.rax.vital.v1.*") }) public class RaxAdminApplication extends SpringBootServletInitializer { public static void main(String[] args) { SpringApplication.run(RaxAdminApplication.class, args); - } /** diff --git a/upms/upms-biz/src/main/resources/application.yml b/upms/upms-biz/src/main/resources/application.yml index 30ac342..f4a1b95 100644 --- a/upms/upms-biz/src/main/resources/application.yml +++ b/upms/upms-biz/src/main/resources/application.yml @@ -116,8 +116,8 @@ spring: port: 16373 password: rax137839 connect-timeout: 5000 -# database: 0 # 二期 - database: 1 # 一期 + database: 0 # 二期 +# database: 1 # 一期 # 数据库相关配置 datasource: @@ -125,13 +125,13 @@ spring: username: root password: Xg137839 # 一期 - url: jdbc:mysql://110.41.142.124:3306/rax_backend1?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true +# url: jdbc:mysql://110.41.142.124:3306/rax_backend1?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true # 二期 - # url: jdbc:mysql://110.41.142.124:3306/rax_backend?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://110.41.142.124:3306/rax_backend?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true server: - port: 6679 #一期 -# port: 6379 #二期 +# port: 6679 #一期 + port: 6379 #二期 servlet: context-path: /admin