From abee95ff7de4b3514022b758044e77793f74896f Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 12 Jun 2020 08:52:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml | 6 ++++++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysFeedbackController.java | 2 +-
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysFeedbackController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysFeedbackController.java
index 47c775f..84ac4be 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysFeedbackController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysFeedbackController.java
@@ -82,7 +82,7 @@
*/
@ApiOperation(value = "保存")
@PostMapping
- public ResultBody save(@Valid @RequestBody SysFeedback sysFeedback, BindingResult bindingResult, @LoginUser SysUser sysUser) {
+ public ResultBody save( @RequestBody SysFeedback sysFeedback, BindingResult bindingResult, @LoginUser SysUser sysUser) {
List<String> errMsg = new ArrayList<>();
if (bindingResult.hasErrors()) {
for (ObjectError error : bindingResult.getAllErrors()) {
diff --git a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
index 334f2eb..9ddc5fa 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
+++ b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
@@ -97,6 +97,12 @@
strip-prefix: true
sensitive-headers: '*'
custom-sensitive-headers: true
+ record-bicenter:
+ path: /api-bicenter/**
+ service-id: bicenter-server
+ strip-prefix: true
+ sensitive-headers: '*'
+ custom-sensitive-headers: true
log:
path: /api-log/**
service-id: logcenter-server
--
Gitblit v1.8.0