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.6

Browse Source
This commit is contained in:
tanghc
2019-11-26 17:26:50 +08:00
parent ef2cb5ccdd
commit 6818ed062d
5 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/bean/ServiceContext.java
View File

@@ -13,6 +13,7 @@ public class ServiceContext extends ConcurrentHashMap<String, Object> {
public static final String REQUEST_KEY = "request";
public static final String RESPONSE_KEY = "response";
public static final String OPEN_CONTEXT_KEY = "openContext";
public static final String SOP_MVC = "sop.mvc";
public static final String RESTFUL_KEY = "sop-restful";

5
sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/configuration/SpringMvcServiceConfiguration.java
View File

@@ -1,6 +1,7 @@
package com.gitee.sop.servercommon.configuration;
import com.gitee.sop.servercommon.bean.ServiceConfig;
import com.gitee.sop.servercommon.bean.ServiceContext;
import com.gitee.sop.servercommon.manager.EnvironmentContext;
import com.gitee.sop.servercommon.manager.ServiceRouteController;
import com.gitee.sop.servercommon.mapping.ApiMappingHandlerMapping;
@@ -22,6 +23,10 @@ import javax.annotation.PostConstruct;
@Slf4j
public class SpringMvcServiceConfiguration {
static {
System.setProperty(ServiceContext.SOP_MVC, "true");
}
public SpringMvcServiceConfiguration() {
ServiceConfig.getInstance().getI18nModules().add("i18n/isp/bizerror");
}

9
sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/mapping/ApiMappingHandlerMapping.java
View File

@@ -3,6 +3,7 @@ package com.gitee.sop.servercommon.mapping;
import com.gitee.sop.servercommon.annotation.ApiAbility;
import com.gitee.sop.servercommon.annotation.ApiMapping;
import com.gitee.sop.servercommon.bean.ServiceConfig;
import com.gitee.sop.servercommon.bean.ServiceContext;
import org.springframework.core.PriorityOrdered;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.util.StringValueResolver;
@@ -18,13 +19,17 @@ import java.lang.reflect.Method;
public class ApiMappingHandlerMapping extends RequestMappingHandlerMapping implements PriorityOrdered {
private static StringValueResolver stringValueResolver = new ApiMappingStringValueResolver();
private static StringValueResolver stringValueResolverMVC = new ApiMappingStringValueResolverMVC();
@Override
protected RequestMappingInfo getMappingForMethod(Method method, Class<?> handlerType) {
String sopMvc = System.getProperty(ServiceContext.SOP_MVC);
boolean isMvc = sopMvc != null;
ApiMapping apiMapping = method.getAnnotation(ApiMapping.class);
ApiAbility apiAbility = method.getAnnotation(ApiAbility.class);
StringValueResolver valueResolver = null;
if (apiMapping != null) {
valueResolver = stringValueResolver;
if (apiMapping != null || apiAbility != null) {
valueResolver = isMvc ? stringValueResolverMVC : stringValueResolver;
}
this.setEmbeddedValueResolver(valueResolver);
return super.getMappingForMethod(method, handlerType);

7
sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/mapping/ApiMappingStringValueResolver.java
View File

@@ -7,8 +7,13 @@ import org.springframework.util.StringValueResolver;
*/
public class ApiMappingStringValueResolver implements StringValueResolver {
private static final String END = "/";
@Override
public String resolveStringValue(String strVal) {
return strVal;
if (strVal == null) {
return null;
}
return strVal + END;
}
}

14
sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/mapping/ApiMappingStringValueResolverMVC.java Normal file
View File

@@ -0,0 +1,14 @@
package com.gitee.sop.servercommon.mapping;
import org.springframework.util.StringValueResolver;
/**
* @author tanghc
*/
public class ApiMappingStringValueResolverMVC implements StringValueResolver {
@Override
public String resolveStringValue(String strVal) {
return strVal;
}
}