From 9adfe58b0dfad2ab34b82991a180d4a3a46576f0 Mon Sep 17 00:00:00 2001 From: tanghc Date: Thu, 18 Jul 2019 15:46:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/application-dev.properties | 2 - .../src/main/resources/application-dev.yml | 61 ------------------ .../src/main/resources/application.yml | 3 - .../src/main/resources/application-dev.yml | 37 ----------- .../src/main/resources/application.yml | 3 - .../src/main/resources/application-dev.yml | 32 ---------- .../src/main/resources/application.yml | 3 - .../main/resources/application-dev.properties | 2 - .../src/main/resources/application-dev.yml | 64 ------------------- .../src/main/resources/application.yml | 3 - .../main/resources/application-dev.properties | 2 - .../src/main/resources/application-dev.yml | 17 ----- .../src/main/resources/application.yml | 3 - .../src/main/resources/application-dev.yml | 27 -------- .../src/main/resources/application.yml | 3 - 15 files changed, 262 deletions(-) delete mode 100644 sop-admin/sop-admin-server/src/main/resources/application-dev.yml delete mode 100644 sop-admin/sop-admin-server/src/main/resources/application.yml delete mode 100644 sop-example/sop-book/sop-book-web/src/main/resources/application-dev.yml delete mode 100644 sop-example/sop-book/sop-book-web/src/main/resources/application.yml delete mode 100644 sop-example/sop-story/sop-story-web/src/main/resources/application-dev.yml delete mode 100644 sop-example/sop-story/sop-story-web/src/main/resources/application.yml delete mode 100644 sop-gateway/src/main/resources/application-dev.yml delete mode 100644 sop-gateway/src/main/resources/application.yml delete mode 100644 sop-registry/src/main/resources/application-dev.yml delete mode 100644 sop-registry/src/main/resources/application.yml delete mode 100644 sop-website/website-server/src/main/resources/application-dev.yml delete mode 100644 sop-website/website-server/src/main/resources/application.yml diff --git a/sop-admin/sop-admin-server/src/main/resources/application-dev.properties b/sop-admin/sop-admin-server/src/main/resources/application-dev.properties index 68597209..f6387c6b 100644 --- a/sop-admin/sop-admin-server/src/main/resources/application-dev.properties +++ b/sop-admin/sop-admin-server/src/main/resources/application-dev.properties @@ -16,8 +16,6 @@ zookeeper.url=localhost:2181 zipkin.url=http://127.0.0.1:9411/ # ------- 需要改的配置end ------- -######### 下面的配置基本不用改 ######### - # token过期时间，分钟 admin.access-token.timeout-minutes=30 # 签名方式，rsa：支付宝开放平台签名方式，md5：淘宝开放平台签名方式 diff --git a/sop-admin/sop-admin-server/src/main/resources/application-dev.yml b/sop-admin/sop-admin-server/src/main/resources/application-dev.yml deleted file mode 100644 index 0064c80c..00000000 --- a/sop-admin/sop-admin-server/src/main/resources/application-dev.yml +++ /dev/null @@ -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: eureka - - -# 根据实际情况改 -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 \ No newline at end of file diff --git a/sop-admin/sop-admin-server/src/main/resources/application.yml b/sop-admin/sop-admin-server/src/main/resources/application.yml deleted file mode 100644 index caf4dfcd..00000000 --- a/sop-admin/sop-admin-server/src/main/resources/application.yml +++ /dev/null @@ -1,3 +0,0 @@ -spring: - profiles: - active: dev \ No newline at end of file diff --git a/sop-example/sop-book/sop-book-web/src/main/resources/application-dev.yml b/sop-example/sop-book/sop-book-web/src/main/resources/application-dev.yml deleted file mode 100644 index 649fcf39..00000000 --- a/sop-example/sop-book/sop-book-web/src/main/resources/application-dev.yml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/sop-example/sop-book/sop-book-web/src/main/resources/application.yml b/sop-example/sop-book/sop-book-web/src/main/resources/application.yml deleted file mode 100644 index caf4dfcd..00000000 --- a/sop-example/sop-book/sop-book-web/src/main/resources/application.yml +++ /dev/null @@ -1,3 +0,0 @@ -spring: - profiles: - active: dev \ No newline at end of file diff --git a/sop-example/sop-story/sop-story-web/src/main/resources/application-dev.yml b/sop-example/sop-story/sop-story-web/src/main/resources/application-dev.yml deleted file mode 100644 index 59f250ab..00000000 --- a/sop-example/sop-story/sop-story-web/src/main/resources/application-dev.yml +++ /dev/null @@ -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 diff --git a/sop-example/sop-story/sop-story-web/src/main/resources/application.yml b/sop-example/sop-story/sop-story-web/src/main/resources/application.yml deleted file mode 100644 index caf4dfcd..00000000 --- a/sop-example/sop-story/sop-story-web/src/main/resources/application.yml +++ /dev/null @@ -1,3 +0,0 @@ -spring: - profiles: - active: dev \ No newline at end of file diff --git a/sop-gateway/src/main/resources/application-dev.properties b/sop-gateway/src/main/resources/application-dev.properties index fbaf6c9d..14de0762 100644 --- a/sop-gateway/src/main/resources/application-dev.properties +++ b/sop-gateway/src/main/resources/application-dev.properties @@ -13,8 +13,6 @@ zookeeper.url=localhost:2181 zipkin.url=http://127.0.0.1:9411/ # ------- 需要改的配置end ------- -######### 下面的配置基本不用改 ######### - spring.application.name=api-gateway # 入口地址，不用改，默认是/zuul zuul.servlet-path=/api diff --git a/sop-gateway/src/main/resources/application-dev.yml b/sop-gateway/src/main/resources/application-dev.yml deleted file mode 100644 index 49b49adc..00000000 --- a/sop-gateway/src/main/resources/application-dev.yml +++ /dev/null @@ -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 diff --git a/sop-gateway/src/main/resources/application.yml b/sop-gateway/src/main/resources/application.yml deleted file mode 100644 index caf4dfcd..00000000 --- a/sop-gateway/src/main/resources/application.yml +++ /dev/null @@ -1,3 +0,0 @@ -spring: - profiles: - active: dev \ No newline at end of file diff --git a/sop-registry/src/main/resources/application-dev.properties b/sop-registry/src/main/resources/application-dev.properties index 5a62ba39..c79c2cec 100644 --- a/sop-registry/src/main/resources/application-dev.properties +++ b/sop-registry/src/main/resources/application-dev.properties @@ -7,8 +7,6 @@ spring.application.name=sop-registry eureka.url=http://localhost:1111/eureka/ # ------- 需要改的配置end ------- -######### 下面的配置基本不用改 ######### - eureka.client.fetch-registry=false eureka.client.register-with-eureka=false eureka.client.serviceUrl.defaultZone=${eureka.url} diff --git a/sop-registry/src/main/resources/application-dev.yml b/sop-registry/src/main/resources/application-dev.yml deleted file mode 100644 index 41d0ffad..00000000 --- a/sop-registry/src/main/resources/application-dev.yml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/sop-registry/src/main/resources/application.yml b/sop-registry/src/main/resources/application.yml deleted file mode 100644 index caf4dfcd..00000000 --- a/sop-registry/src/main/resources/application.yml +++ /dev/null @@ -1,3 +0,0 @@ -spring: - profiles: - active: dev \ No newline at end of file diff --git a/sop-website/website-server/src/main/resources/application-dev.yml b/sop-website/website-server/src/main/resources/application-dev.yml deleted file mode 100644 index 79f736b6..00000000 --- a/sop-website/website-server/src/main/resources/application-dev.yml +++ /dev/null @@ -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: eureka - -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 \ No newline at end of file diff --git a/sop-website/website-server/src/main/resources/application.yml b/sop-website/website-server/src/main/resources/application.yml deleted file mode 100644 index caf4dfcd..00000000 --- a/sop-website/website-server/src/main/resources/application.yml +++ /dev/null @@ -1,3 +0,0 @@ -spring: - profiles: - active: dev \ No newline at end of file