From 8410b90001fa3d85eaaf689ab92e5a47d5c29470 Mon Sep 17 00:00:00 2001 From: tanghc Date: Tue, 25 Aug 2020 17:04:51 +0800 Subject: [PATCH 1/2] 4.0.3 --- .../java/com/gitee/sop/sopauth/controller/OAuth2Controller.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sop-auth/src/main/java/com/gitee/sop/sopauth/controller/OAuth2Controller.java b/sop-auth/src/main/java/com/gitee/sop/sopauth/controller/OAuth2Controller.java index 2989ab63..2d370ded 100644 --- a/sop-auth/src/main/java/com/gitee/sop/sopauth/controller/OAuth2Controller.java +++ b/sop-auth/src/main/java/com/gitee/sop/sopauth/controller/OAuth2Controller.java @@ -35,7 +35,7 @@ public class OAuth2Controller { private OAuth2Service oAuth2Service; // 第一步：授权URL拼装 - // https://localhost:8087/oauth2/appToAppAuth?app_id=2019032617262200001&redirect_uri=http%3a%2f%2flocalhost%3a8087%2foauth2callback + // http://localhost:8087/oauth2/appToAppAuth?app_id=2019032617262200001&redirect_uri=http%3a%2f%2flocalhost%3a8087%2foauth2callback @GetMapping("appToAppAuth") public String appToAppAuth(HttpServletRequest request, ModelMap modelMap) { String app_id = request.getParameter("app_id"); From 3f9365f5d56a56fd6cfc5907d713a84bda011e7e Mon Sep 17 00:00:00 2001 From: tanghc Date: Fri, 28 Aug 2020 11:34:36 +0800 Subject: [PATCH 2/2] 4.0.3 --- .../src/main/resources/sop-bridge.properties | 39 ------------------- .../gatewaycommon/validate/ApiValidator.java | 2 +- .../resources/META-INF/gateway.properties | 6 +-- 3 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 sop-common/sop-bridge-nacos/src/main/resources/sop-bridge.properties diff --git a/sop-common/sop-bridge-nacos/src/main/resources/sop-bridge.properties b/sop-common/sop-bridge-nacos/src/main/resources/sop-bridge.properties deleted file mode 100644 index 0535c7b5..00000000 --- a/sop-common/sop-bridge-nacos/src/main/resources/sop-bridge.properties +++ /dev/null @@ -1,39 +0,0 @@ -# 固定不变，不能改 -spring.application.name=sop-gateway -# 不用改，如果要改，请全局替换修改 -sop.secret=MZZOUSTua6LzApIWXCwEgbBmxSzpzC - -# 网关入口 -sop.gateway-index-path=/ - -# nacos cloud配置 -spring.cloud.nacos.discovery.server-addr=${register.url} - -# 数据库配置 -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://${mysql.host}/sop?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai -spring.datasource.username=${mysql.username} -spring.datasource.password=${mysql.password} - -# https://blog.csdn.net/qq_36872046/article/details/81058045 -# 路由转发超时时间，毫秒，默认值1000，详见：RibbonClientConfiguration.DEFAULT_READ_TIMEOUT。 -# 如果微服务端 处理时间过长，会导致ribbon read超时，解决办法将这个值调大一点 -ribbon.ReadTimeout=2000 -# 设置为true（默认false），则所有请求都重试，默认只支持get请求重试 -# 请谨慎设置，因为post请求大多都是写入请求，如果要支持重试，确保服务的幂等性 -ribbon.OkToRetryOnAllOperations=false - -spring.cloud.gateway.discovery.locator.lower-case-service-id=true -spring.cloud.gateway.discovery.locator.enabled=true - -# 不用改 -mybatis.fill.com.gitee.fastmybatis.core.support.DateFillInsert=gmt_create -mybatis.fill.com.gitee.fastmybatis.core.support.DateFillUpdate=gmt_modified - -# 文件上传配置 -spring.servlet.multipart.enabled=true -# 这里设置大一点没关系，真实大小由upload.max-file-size控制 -spring.servlet.multipart.max-file-size=50MB - -# 允许上传文件大小，不能超过这个值，单位：B,KB,MB -upload.max-file-size=2MB \ No newline at end of file diff --git a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/validate/ApiValidator.java b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/validate/ApiValidator.java index 50ea7c08..4f6c7549 100644 --- a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/validate/ApiValidator.java +++ b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/validate/ApiValidator.java @@ -61,7 +61,7 @@ public class ApiValidator implements Validator { /** * 单个文件大小 */ - @Value("${upload.max-file-size:10MB}") + @Value("${upload.max-file-size:${spring.servlet.multipart.max-file-size:10MB}}") private String maxFileSize; diff --git a/sop-gateway/src/main/resources/META-INF/gateway.properties b/sop-gateway/src/main/resources/META-INF/gateway.properties index 7b3f27e7..d59b5f1b 100644 --- a/sop-gateway/src/main/resources/META-INF/gateway.properties +++ b/sop-gateway/src/main/resources/META-INF/gateway.properties @@ -32,8 +32,4 @@ spring.codec.max-in-memory-size=262144 # 文件上传配置 spring.servlet.multipart.enabled=true -# 这里设置大一点没关系，真实大小由upload.max-file-size控制 -spring.servlet.multipart.max-file-size=50MB - -# 允许上传文件大小，不能超过这个值，单位：B,KB,MB -upload.max-file-size=2MB \ No newline at end of file +spring.servlet.multipart.max-file-size=10MB