7x31/SOP
1
0
Fork 0
mirror of https://gitee.com/durcframework/SOP.git synced 2025-08-11 21:57:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

2.5.3

Browse Source
This commit is contained in:
tanghc
2019-11-13 16:30:54 +08:00
parent 64cb58a9ca
commit f8ff5e7e8e
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/param/ServiceParamValidator.java
View File

@@ -29,7 +29,7 @@ public class ServiceParamValidator implements ParamValidator {
private static final String COMMA = ","; private static final String COMMA = ",";
private static Object[] EMPTY_OBJ_ARRAY = {}; private static Object[] EMPTY_OBJ_ARRAY = {};
private static final List<String> SYSTEM_PACKAGE_LIST = Arrays.asList("java.lang", "java.math"); private static final List<String> SYSTEM_PACKAGE_LIST = Arrays.asList("java.lang", "java.math", "java.util", "sun.util");
private static javax.validation.Validator validator; private static javax.validation.Validator validator;
@@ -84,8 +84,11 @@ public class ServiceParamValidator implements ParamValidator {
return false; return false;
} }
Class<?> declaringClass = field.getDeclaringClass(); Class<?> declaringClass = field.getDeclaringClass();
boolean isEnum = declaringClass == field.getType() && declaringClass.isEnum(); boolean isSame = declaringClass == fieldType;
if (isEnum) { boolean isAssignableFrom = declaringClass.isAssignableFrom(fieldType)
|| fieldType.isAssignableFrom(declaringClass);
// 如果是相同类，或者有继承关系不校验。
if (isSame || isAssignableFrom) {
return false; return false;
} }
Package aPackage = fieldType.getPackage(); Package aPackage = fieldType.getPackage();

6
sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/AlipayController.java
View File

@@ -1,6 +1,7 @@
package com.gitee.sop.storyweb.controller; package com.gitee.sop.storyweb.controller;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.gitee.sop.servercommon.annotation.ApiAbility; import com.gitee.sop.servercommon.annotation.ApiAbility;
import com.gitee.sop.servercommon.annotation.ApiMapping; import com.gitee.sop.servercommon.annotation.ApiMapping;
import com.gitee.sop.servercommon.bean.OpenContext; import com.gitee.sop.servercommon.bean.OpenContext;
@@ -17,6 +18,7 @@ import lombok.Data;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@@ -132,10 +134,10 @@ public class AlipayController {
// 遗留接口具备开放平台能力 // 遗留接口具备开放平台能力
@ApiAbility @ApiAbility
@GetMapping("getStory2") @GetMapping("getStory2")
public StoryResult getStory2_0() { public StoryResult getStory2_0(@RequestBody JSONObject param) {
StoryResult story = new StoryResult(); StoryResult story = new StoryResult();
story.setId(1L); story.setId(1L);
story.setName("海底小纵队(默认版本号)"); story.setName("海底小纵队(默认版本号),param:" + param);
return story; return story;
} }

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

@@ -3,6 +3,8 @@ spring.application.name=story-service
# nacos注册中心 # nacos注册中心
spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
# 如果有context-path，必须配下面这句
#spring.cloud.nacos.discovery.metadata.server.servlet.context-path=/story-service
# dubbo配置 # dubbo配置
dubbo.protocol.name=dubbo dubbo.protocol.name=dubbo

2
sop-test/src/test/java/com/gitee/sop/test/AlipayClientPostTest.java
View File

@@ -244,6 +244,8 @@ public class AlipayClientPostTest extends TestBase {
params.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); params.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
// 业务参数 // 业务参数
Map<String, String> bizContent = new HashMap<>(); Map<String, String> bizContent = new HashMap<>();
bizContent.put("name", "Jim");
bizContent.put("age", "2");
params.put("biz_content", JSON.toJSONString(bizContent)); params.put("biz_content", JSON.toJSONString(bizContent));