소스 검색

不知道改了什么东西

tuonina 5 년 전
부모
커밋
c769d4bccf

+ 0 - 2
build.gradle

@@ -85,8 +85,6 @@ subprojects {
         // SpringBoot Starter
         compile 'org.springframework.cloud:spring-cloud-starter-bus-amqp'
         compile('org.springframework.boot:spring-boot-starter-webflux')
-     
-        compile('org.springframework.boot:spring-boot-starter-thymeleaf')
 
         compile('org.springframework.cloud:spring-cloud-config-server')
         compile('org.springframework.cloud:spring-cloud-config-monitor')

+ 6 - 1
eureka-web/src/main/resources/application-dev.yml

@@ -19,5 +19,10 @@ spring:
 
 
 
-
+eureka:
+  instance:
+    ip-address: 192.168.42.12
+  client:
+    service-url:
+      defaultZone: http://${eureka.instance.ip-address}:${server.port}/eureka/
 

+ 0 - 23
eureka-web/src/main/resources/application-prod.yml

@@ -1,23 +0,0 @@
-spring:
-  datasource:
-    username: root
-    password: tuonq520
-    url: jdbc:mysql://192.168.42.1:5201/tuonq_config?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull
-
-  session:
-    store-type: redis
-    redis:
-      host: 192.168.42.1
-      port: 6379
-      database: 0
-      password:
-
-  rabbitmq:
-    username: tuonq
-    password: tuonq520
-    host: 192.168.42.1
-    port: 5672
-  redis:
-    sentinel:
-      master: tuonq
-      nodes: tuonq_sentinel:26379

+ 0 - 10
eureka-web/src/main/resources/application.yml

@@ -1,6 +1,5 @@
 # 服务设置
 server:
-  port: 11111
   undertow:
     io-threads: 2
     worker-threads: 10
@@ -27,12 +26,6 @@ spring:
       context-path: /admin
   main:
     allow-bean-definition-overriding: true
-  thymeleaf:
-    prefix: classpath:/html/
-    cache: false
-    encoding: utf-8
-    servlet:
-      content-type: text/html
 
 mybatis-plus:
   mapper-locations: classpath*:mapper/**/*.xml
@@ -61,12 +54,9 @@ eureka:
     metadata-map:
       startup: ${random.int}
       tags: config
-    ip-address: 127.0.0.1
   client:
     register-with-eureka: true
     fetch-registry: true
-    service-url:
-      defaultZone: http://${eureka.instance.ip-address}:${server.port}/eureka/
     registry-fetch-interval-seconds: 5
     instance-info-replication-interval-seconds: 20
     initial-instance-info-replication-interval-seconds: 45

+ 1 - 1
eureka-web/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # 服务端口号
 server:
-  port: 11111
+  port: 12121
 
 spring:
   application: