配置文件优化

sop-admin/sop-admin-server/pom.xml

@@ -103,13 +103,6 @@
 			<version>1.18.4</version>
 			<scope>provided</scope>
 		</dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-commons</artifactId>
-            <version>2.1.0.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-
 	</dependencies>
 
 	<build>

sop-admin/sop-admin-server/src/main/resources/application-dev.properties

@@ -41,7 +41,7 @@ easyopen.ignore-validate=true
 registry.eureka-server-addr=${eureka.url}
 registry.nacos-server-addr=${nacos.url}
 # 使用eureka，填：eureka，使用nacos填：nacos
-registry.name=eureka
+registry.name=nacos
 
 logging.level.com.gitee=debug
 

sop-admin/sop-admin-server/src/main/resources/application-dev.yml

@@ -1,61 +0,0 @@
-server:
-  port: 8082
-
-# token过期时间，分钟
-admin:
-  access-token:
-    timeout-minutes: 30
-
-sop:
-  # 签名方式，rsa：支付宝开放平台签名方式，md5：淘宝开放平台签名方式
-  sign-type: rsa
-
-# 不用改
-spring:
-  application:
-    name: sop-admin
-
-  cloud:
-
-    # zookeeper地址，根据实际情况修改
-    zookeeper:
-      connect-string: localhost:2181
-      baseSleepTimeMs: 3000
-      maxRetries: 3
-
-  # 数据源
-  datasource:
-    driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://localhost:3306/sop?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
-    username: root
-    password: root
-
-
-# 固定不用改
-easyopen:
-  show-doc: true
-  ignore-validate: true
-
-# 注册中心地址，根据实际情况改，这里只是参数，并不会去注册
-registry:
-  eureka-server-addr: http://localhost:1111/eureka/
-  # nacos服务器地址
-  nacos-server-addr: 127.0.0.1:8848
-  # 使用eureka，填：eureka，使用nacos填：nacos
-  name: nacos
-
-
-# 根据实际情况改
-logging:
-  level:
-    com:
-      gitee: debug
-
-# 不用改
-mybatis:
-  fill: {com.gitee.fastmybatis.core.support.DateFillInsert: gmt_create,
-         com.gitee.fastmybatis.core.support.DateFillUpdate: gmt_modified}
-
-# 不用改，如果要改，请全局替换修改
-zuul:
-  secret: MZZOUSTua6LzApIWXCwEgbBmxSzpzC

sop-admin/sop-admin-server/src/main/resources/application.yml

@@ -1,3 +0,0 @@
-spring:
-  profiles:
-    active: dev

sop-example/sop-book/sop-book-web/src/main/resources/application-dev.properties

@@ -2,10 +2,8 @@ server.port=3333
 spring.application.name=book-service
 spring.application.description=book服务
 
-# eureka注册中心，如果使用nacos注册中心，这里要注释掉
-eureka.client.serviceUrl.defaultZone=http://localhost:1111/eureka/
 # nacos注册中心
-# spring.nacos.discovery.server-addr=127.0.0.1:8848
+spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
 
 # zookeeper配置
 spring.cloud.zookeeper.connect-string=localhost:2181

sop-example/sop-book/sop-book-web/src/main/resources/application-dev.yml

@@ -1,37 +0,0 @@
-server:
-  port: 3333
-
-spring:
-  application:
-    name: book-service
-
-  cloud:
-    zookeeper:
-      # zookeeper配置
-      connect-string: localhost:2181
-
-    # nacos注册中心，和eureka只能用一个
-    nacos:
-      discovery:
-        server-addr: 127.0.0.1:8848
-
-# eureka注册中心，如果使用nacos注册中心，这里要注释掉
-#eureka:
-#  client:
-#    serviceUrl:
-#      defaultZone: http://localhost:1111/eureka/
-
-# dubbo consumer
-demo:
-  service:
-    version: 1.0.0
-dubbo:
-  application:
-    id: dubbo-consumer-demo
-    name: dubbo-consumer-demo
-  protocol:
-    id: dubbo
-    name: dubbo
-    port: 12345
-management:
-  port: 8081

sop-example/sop-book/sop-book-web/src/main/resources/application.yml

@@ -1,3 +0,0 @@
-spring:
-  profiles:
-    active: dev

sop-example/sop-story/sop-story-web/src/main/resources/application-dev.properties

@@ -2,10 +2,8 @@ server.port=2222
 spring.application.name=story-service
 spring.application.description=story服务
 
-# eureka注册中心，如果使用nacos注册中心，这里要注释掉
-eureka.client.serviceUrl.defaultZone=http://localhost:1111/eureka/
 # nacos注册中心
-# spring.nacos.discovery.server-addr=127.0.0.1:8848
+spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
 
 # zookeeper配置
 spring.cloud.zookeeper.connect-string=localhost:2181

sop-example/sop-story/sop-story-web/src/main/resources/application-dev.yml

@@ -1,32 +0,0 @@
-server:
-  port: 2222
-
-spring:
-  application:
-    name: story-service
-    description: story服务
-
-  cloud:
-    zookeeper:
-      connect-string: localhost:2181
-
-    # nacos注册中心，和eureka只能用一个
-    nacos:
-      discovery:
-        server-addr: 127.0.0.1:8848
-
-# eureka注册中心，如果使用nacos注册中心，这里要注释掉
-#eureka:
-#  client:
-#    serviceUrl:
-#      defaultZone: http://localhost:1111/eureka/
-
-# dubbo provider
-dubbo:
-  protocol:
-    name: dubbo
-    port: 12345
-  registry:
-    address: N/A
-  scan:
-    base-packages: com.gitee.sop.storyweb.service

sop-example/sop-story/sop-story-web/src/main/resources/application.yml

@@ -1,3 +0,0 @@
-spring:
-  profiles:
-    active: dev

sop-gateway/src/main/resources/application-dev.properties

@@ -9,6 +9,8 @@ mysql.password=root
 eureka.url=http://localhost:1111/eureka/
 # zookeeper地址
 zookeeper.url=localhost:2181
+# nacos地址
+nacos.url=127.0.0.1:8848
 # zipkin服务监控地址，没有开启不用改
 zipkin.url=http://127.0.0.1:9411/
 # ------- 需要改的配置end -------
@@ -32,10 +34,12 @@ ribbon.ReadTimeout=2000
 # 请谨慎设置，因为post请求大多都是写入请求，如果要支持重试，确保服务的幂等性
 ribbon.OkToRetryOnAllOperations=false
 
-eureka.client.serviceUrl.defaultZone=${eureka.url}
+# nacos注册中心配置
+spring.cloud.nacos.discovery.server-addr=${nacos.url}
+
+# zookeeper配置
 spring.cloud.zookeeper.connect-string=${zookeeper.url}
-#spring.cloud.gateway.discovery.locator.lower-case-service-id=true
+
-#spring.cloud.gateway.discovery.locator.enabled=true
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.url=jdbc:mysql://localhost:3306/sop?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=${mysql.username}

sop-gateway/src/main/resources/application-dev.yml

@@ -1,64 +0,0 @@
-server:
-  port: 8081
-
-zuul:
-  # 入口地址，不用改，默认是/zuul
-  servlet-path: /api
-  # 禁用默认的过滤器，不能删，不用改
-  FormBodyWrapperFilter:
-    pre:
-      disable: true
-  Servlet30WrapperFilter:
-    pre:
-      disable: true
-  # 不用改，如果要改，请全局替换修改
-  secret: MZZOUSTua6LzApIWXCwEgbBmxSzpzC
-
-ribbon:
-  # https://blog.csdn.net/qq_36872046/article/details/81058045
-  # 路由转发超时时间，毫秒，默认值1000，详见：RibbonClientConfiguration.DEFAULT_READ_TIMEOUT。
-  # 如果微服务端 处理时间过长，会导致ribbon read超时，解决办法将这个值调大一点
-  ReadTimeout: 2000
-  # 设置为true（默认false），则所有请求都重试，默认只支持get请求重试
-  # 请谨慎设置，因为post请求大多都是写入请求，如果要支持重试，确保服务的幂等性
-  OkToRetryOnAllOperations: false
-
-# eureka注册中心，如果使用nacos注册中心，这里要注释掉
-#eureka:
-#  client:
-#    serviceUrl:
-#      defaultZone: http://localhost:1111/eureka/
-
-spring:
-  application:
-    name: api-gateway
-  # zookeeper，根据实际情况修改
-  cloud:
-    zookeeper:
-      connect-string: localhost:2181
-
-    # Spring Cloud Gateway配置，如果用了zuul，这段配置没有效果，不用改
-    gateway:
-      discovery:
-        locator:
-          lower-case-service-id: true
-          enabled: true
-
-    # nacos注册中心，和eureka只能用一个
-    nacos:
-      discovery:
-        server-addr: 127.0.0.1:8848
-
-  # 数据源，根据实际情况修改
-  datasource:
-    driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://localhost:3306/sop?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
-    username: root
-    password: root
-
-  # 上传文件配置，根据实际情况修改
-  servlet:
-    multipart:
-      enabled: true
-      max-file-size: 20MB # 上传文件最大20MB，默认1MB
-      max-request-size: 20MB

sop-gateway/src/main/resources/application.yml

@@ -1,3 +0,0 @@
-spring:
-  profiles:
-    active: dev

sop-registry/src/main/resources/application-dev.yml

@@ -1,17 +0,0 @@
-eureka:
-  client:
-    fetch-registry: false
-    # 不注册自己
-    register-with-eureka: false
-    serviceUrl:
-      defaultZone: http://${eureka.host}:${eureka.port}/eureka/
-  # 注册中心地址
-  host: localhost
-  port: 1111
-
-server:
-  port: 1111
-
-spring:
-  application:
-    name: sop-registry

sop-registry/src/main/resources/application.yml

@@ -1,3 +0,0 @@
-spring:
-  profiles:
-    active: dev

sop-website/website-server/src/main/resources/application-dev.properties

@@ -17,7 +17,7 @@ registry.eureka-server-addr=${eureka.url}
 # nacos服务器地址
 registry.nacos-server-addr=${nacos.url}
 # 使用eureka，填：eureka，使用nacos填：nacos
-registry.name=eureka
+registry.name=nacos
 
 spring.cloud.zookeeper.connect-string=${zookeeper.url}
 

sop-website/website-server/src/main/resources/application-dev.yml

@@ -1,27 +0,0 @@
-server:
-  port: 8083
-
-# 注册中心地址，根据实际情况改，这里只是参数，并不会去注册
-registry:
-  eureka-server-addr: http://localhost:1111/eureka/
-  # nacos服务器地址
-  nacos-server-addr: 127.0.0.1:8848
-  # 使用eureka，填：eureka，使用nacos填：nacos
-  name: nacos
-
-spring:
-  application:
-    name: website-server
-
-  cloud:
-    zookeeper:
-      connect-string: localhost:2181
-
-api:
-  # 测试地址
-  url-test: http://api-test.yourdomain.com/api
-  # 沙箱环境
-  url-sandbox: http://localhost:8081/api
-  # 正式地址
-  url-prod: http://open.yourdomain.com/api
-  pwd: doc#123

sop-website/website-server/src/main/resources/application.yml

@@ -1,3 +0,0 @@
-spring:
-  profiles:
-    active: dev