This commit is contained in:
Redkale
2020-09-18 22:58:10 +08:00
parent a2fab32356
commit ef14195e71
2 changed files with 21 additions and 5 deletions

View File

@@ -188,12 +188,27 @@ public final class Rest {
return (!controller.name().isEmpty()) ? controller.name().trim() : serviceType.getSimpleName().replaceAll("Service.*$", ""); return (!controller.name().isEmpty()) ? controller.name().trim() : serviceType.getSimpleName().replaceAll("Service.*$", "");
} }
static boolean isRestDyn(HttpServlet servlet) { /**
* 判断HttpServlet是否为Rest动态生成的
*
* @param servlet 检测的HttpServlet
*
* @return 是否是动态生成的RestHttpServlet
*/
public static boolean isRestDyn(HttpServlet servlet) {
return servlet.getClass().getAnnotation(RestDyn.class) != null; return servlet.getClass().getAnnotation(RestDyn.class) != null;
} }
static Service getService(HttpServlet servlet) { /**
* 获取Rest动态生成HttpServlet里的Service对象若不是Rest动态生成的HttpServlet返回null
*
* @param servlet HttpServlet
*
* @return Service
*/
public static Service getService(HttpServlet servlet) {
if (servlet == null) return null; if (servlet == null) return null;
if (!isRestDyn(servlet)) return null;
try { try {
Field ts = servlet.getClass().getDeclaredField(REST_SERVICE_FIELD_NAME); Field ts = servlet.getClass().getDeclaredField(REST_SERVICE_FIELD_NAME);
ts.setAccessible(true); ts.setAccessible(true);

View File

@@ -47,7 +47,8 @@ public class RetResult<T> implements Serializable {
@ConvertColumn(index = 3) @ConvertColumn(index = 3)
protected T result; protected T result;
@ConvertColumn(index = 4) //success index = 4
@ConvertColumn(index = 5)
protected Map<String, String> attach; protected Map<String, String> attach;
protected Convert convert; protected Convert convert;
@@ -320,7 +321,7 @@ public class RetResult<T> implements Serializable {
* *
* @return 是否成功 * @return 是否成功
*/ */
@ConvertColumn(index = 5) @ConvertColumn(index = 4)
public boolean isSuccess() { public boolean isSuccess() {
return retcode == 0; return retcode == 0;
} }