Commit 9c5c01d8e56197e227d0a0b36dbde9df5bb56129

Authored by zhangdaiscott
1 parent 15343166

开发和测试环境取消swagger文档密码

BindingResult无法使用 #2219
nacos分组配置问题 #2355
jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java
@@ -14,14 +14,16 @@ import org.jeecg.common.api.vo.Result; @@ -14,14 +14,16 @@ import org.jeecg.common.api.vo.Result;
14 import org.jeecg.common.aspect.annotation.AutoLog; 14 import org.jeecg.common.aspect.annotation.AutoLog;
15 import org.jeecg.common.constant.CommonConstant; 15 import org.jeecg.common.constant.CommonConstant;
16 import org.jeecg.common.constant.enums.ModuleType; 16 import org.jeecg.common.constant.enums.ModuleType;
17 -import org.jeecg.modules.base.service.BaseCommonService;  
18 import org.jeecg.common.system.vo.LoginUser; 17 import org.jeecg.common.system.vo.LoginUser;
19 import org.jeecg.common.util.IPUtils; 18 import org.jeecg.common.util.IPUtils;
20 import org.jeecg.common.util.SpringContextUtils; 19 import org.jeecg.common.util.SpringContextUtils;
21 import org.jeecg.common.util.oConvertUtils; 20 import org.jeecg.common.util.oConvertUtils;
  21 +import org.jeecg.modules.base.service.BaseCommonService;
22 import org.springframework.core.LocalVariableTableParameterNameDiscoverer; 22 import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
23 import org.springframework.stereotype.Component; 23 import org.springframework.stereotype.Component;
  24 +import org.springframework.validation.BindingResult;
24 import org.springframework.web.multipart.MultipartFile; 25 import org.springframework.web.multipart.MultipartFile;
  26 +
25 import javax.annotation.Resource; 27 import javax.annotation.Resource;
26 import javax.servlet.ServletRequest; 28 import javax.servlet.ServletRequest;
27 import javax.servlet.ServletResponse; 29 import javax.servlet.ServletResponse;
@@ -157,7 +159,7 @@ public class AutoLogAspect { @@ -157,7 +159,7 @@ public class AutoLogAspect {
157 // https://my.oschina.net/mengzhang6/blog/2395893 159 // https://my.oschina.net/mengzhang6/blog/2395893
158 Object[] arguments = new Object[paramsArray.length]; 160 Object[] arguments = new Object[paramsArray.length];
159 for (int i = 0; i < paramsArray.length; i++) { 161 for (int i = 0; i < paramsArray.length; i++) {
160 - if (paramsArray[i] instanceof ServletRequest || paramsArray[i] instanceof ServletResponse || paramsArray[i] instanceof MultipartFile) { 162 + if (paramsArray[i] instanceof BindingResult || paramsArray[i] instanceof ServletRequest || paramsArray[i] instanceof ServletResponse || paramsArray[i] instanceof MultipartFile) {
161 //ServletRequest不能序列化,从入参里排除,否则报异常:java.lang.IllegalStateException: It is illegal to call this method if the current request is not in asynchronous mode (i.e. isAsyncStarted() returns false) 163 //ServletRequest不能序列化,从入参里排除,否则报异常:java.lang.IllegalStateException: It is illegal to call this method if the current request is not in asynchronous mode (i.e. isAsyncStarted() returns false)
162 //ServletResponse不能序列化 从入参里排除,否则报异常:java.lang.IllegalStateException: getOutputStream() has already been called for this response 164 //ServletResponse不能序列化 从入参里排除,否则报异常:java.lang.IllegalStateException: getOutputStream() has already been called for this response
163 continue; 165 continue;
jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml
@@ -255,7 +255,7 @@ logging: @@ -255,7 +255,7 @@ logging:
255 knife4j: 255 knife4j:
256 production: false 256 production: false
257 basic: 257 basic:
258 - enable: true 258 + enable: false
259 username: jeecg 259 username: jeecg
260 password: jeecg1314 260 password: jeecg1314
261 #第三方登录 261 #第三方登录
jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml
@@ -255,7 +255,7 @@ cas: @@ -255,7 +255,7 @@ cas:
255 knife4j: 255 knife4j:
256 production: false 256 production: false
257 basic: 257 basic:
258 - enable: true 258 + enable: false
259 username: jeecg 259 username: jeecg
260 password: jeecg1314 260 password: jeecg1314
261 #第三方登录 261 #第三方登录
jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/src/main/resources/bootstrap.yml
@@ -23,8 +23,8 @@ spring: @@ -23,8 +23,8 @@ spring:
23 prefix: @prefix.name@ 23 prefix: @prefix.name@
24 # 支持多个共享 Data Id 的配置,优先级小于extension-configs,自定义 Data Id 配置 属性是个集合,内部由 Config POJO 组成。Config 有 3 个属性,分别是 dataId, group 以及 refresh 24 # 支持多个共享 Data Id 的配置,优先级小于extension-configs,自定义 Data Id 配置 属性是个集合,内部由 Config POJO 组成。Config 有 3 个属性,分别是 dataId, group 以及 refresh
25 #shared-configs[0]: 25 #shared-configs[0]:
26 - #data-id: ${prefix.name}-common.yaml # 配置文件名-Data Id  
27 - #group: ${config.group} # 默认为DEFAULT_GROUP 26 + #data-id: @prefix.name@-common.yaml # 配置文件名-Data Id
  27 + #group: @config.group@ # 默认为DEFAULT_GROUP
28 #refresh: false # 是否动态刷新,默认为false 28 #refresh: false # 是否动态刷新,默认为false
29 discovery: 29 discovery:
30 namespace: @config.namespace@ 30 namespace: @config.namespace@