Skip to content

Commit af6e2fa

Browse files
ansjsunansjsun
committed
fix rpc bug
1 parent 78793f6 commit af6e2fa

File tree

3 files changed

+48
-18
lines changed

3 files changed

+48
-18
lines changed

‎src/main/java/org/nlpcn/jcoder/controller/ApiAction.java‎

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -294,14 +294,20 @@ public void jocderRpcSdkmaven(HttpServletRequest req, HttpServletResponse rep) t
294294
rep.setContentType("application/octet-stream");
295295

296296
String pom = "<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd\">\n"
297-
+ " <modelVersion>4.0.0</modelVersion>\n" + " <groupId>org.nlpcn.jcoder</groupId>\n" + " <artifactId>jcoder-rpc-client</artifactId>\n"
298-
+ " <version>1.0</version>\n" + "\n" + "\n" + " <dependencies>\n" + "\n" + " <dependency>\n" + " <groupId>io.netty</groupId>\n"
299-
+ " <artifactId>netty-all</artifactId>\n" + " <version>4.1.2.Final</version>\n" + " <scope>compile</scope>\n" + " </dependency>\n" + "\n"
300-
+ " <dependency>\n" + " <groupId>com.dyuproject.protostuff</groupId>\n" + " <artifactId>protostuff-core</artifactId>\n" + " <version>1.0.10</version>\n"
301-
+ " <scope>compile</scope>\n" + " </dependency>\n" + "\n" + " <dependency>\n" + " <groupId>com.dyuproject.protostuff</groupId>\n"
302-
+ " <artifactId>protostuff-runtime</artifactId>\n" + " <version>1.0.10</version>\n" + " <scope>compile</scope>\n" + " </dependency>\n" + "\n"
303-
+ " <dependency>\n" + " <groupId>org.objenesis</groupId>\n" + " <artifactId>objenesis</artifactId>\n" + " <version>2.4</version>\n"
304-
+ " <scope>compile</scope>\n" + " </dependency>\n" + "\n" + " </dependencies>\n" + "</project>";
297+
+ " <modelVersion>4.0.0</modelVersion>\n" + " <groupId>org.nlpcn.jcoder</groupId>\n"
298+
+ " <artifactId>jcoder-rpc-client</artifactId>\n" + " <version>1.0</version>\n" + "\n" + "\n" + " <dependencies>\n" + "\n"
299+
+ " <dependency>\n" + " <groupId>io.netty</groupId>\n" + " <artifactId>netty-all</artifactId>\n"
300+
+ " <version>4.1.2.Final</version>\n" + " <scope>compile</scope>\n" + " </dependency>\n" + "\n"
301+
+ " <dependency>\n" + " <groupId>io.protostuff</groupId>\n"
302+
+ " <artifactId>protostuff-core</artifactId>\n" + " <version>1.4.4</version>\n"
303+
+ " <scope>compile</scope>\n" + " </dependency>\n" + "\n" + " <dependency>\n"
304+
+ " <groupId>io.protostuff</groupId>\n" + " <artifactId>protostuff-runtime</artifactId>\n"
305+
+ " <version>1.4.4</version>\n" + " <scope>compile</scope>\n" + " </dependency>\n" + "\n"
306+
+ " <dependency>\n" + " <groupId>org.objenesis</groupId>\n" + " <artifactId>objenesis</artifactId>\n"
307+
+ " <version>2.4</version>\n" + " <scope>compile</scope>\n" + " </dependency>\n" + "\n"
308+
+ " <dependency>\n" + " <groupId>org.jasypt</groupId>\n" + " <artifactId>jasypt</artifactId>\n"
309+
+ " <version>1.9.2</version>\n" + " <scope>compile</scope>\n" + " </dependency>\n" + "\n"
310+
+ " </dependencies>\n" + "</project>";
305311

306312
ServletOutputStream outputStream = rep.getOutputStream();
307313

@@ -329,6 +335,7 @@ public void jocderRpcSdkmaven(HttpServletRequest req, HttpServletResponse rep) t
329335

330336
/**
331337
* 编译class类到jar中
338+
*
332339
* @return
333340
* @throws IOException
334341
*/
@@ -394,6 +401,7 @@ private byte[] makeRpcClientJar() throws IOException {
394401

395402
/**
396403
* 编译class类到jar中
404+
*
397405
* @return
398406
* @throws IOException
399407
*/
@@ -434,6 +442,7 @@ private byte[] toSHA1(byte[] bytes) {
434442

435443
/**
436444
* 执行测试用户的api
445+
*
437446
* @param jsonTask
438447
* @return
439448
*/
@@ -506,14 +515,21 @@ public Object stopApi(@Param("json") String jsonTask) {
506515

507516
public static void main(String[] args) {
508517
String pom = "<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd\">\n"
509-
+ " <modelVersion>4.0.0</modelVersion>\n" + " <groupId>org.nlpcn.jcoder</groupId>\n" + " <artifactId>jcoder-rpc-client</artifactId>\n"
510-
+ " <version>1.0</version>\n" + "\n" + "\n" + " <dependencies>\n" + "\n" + " <dependency>\n" + " <groupId>io.netty</groupId>\n"
511-
+ " <artifactId>netty-all</artifactId>\n" + " <version>4.1.2.Final</version>\n" + " <scope>compile</scope>\n" + " </dependency>\n" + "\n"
512-
+ " <dependency>\n" + " <groupId>com.dyuproject.protostuff</groupId>\n" + " <artifactId>protostuff-core</artifactId>\n" + " <version>1.0.10</version>\n"
513-
+ " <scope>compile</scope>\n" + " </dependency>\n" + "\n" + " <dependency>\n" + " <groupId>com.dyuproject.protostuff</groupId>\n"
514-
+ " <artifactId>protostuff-runtime</artifactId>\n" + " <version>1.0.10</version>\n" + " <scope>compile</scope>\n" + " </dependency>\n" + "\n"
515-
+ " <dependency>\n" + " <groupId>org.objenesis</groupId>\n" + " <artifactId>objenesis</artifactId>\n" + " <version>2.4</version>\n"
516-
+ " <scope>compile</scope>\n" + " </dependency>\n" + "\n" + " </dependencies>\n" + "</project>";
518+
+ " <modelVersion>4.0.0</modelVersion>\n" + " <groupId>org.nlpcn.jcoder</groupId>\n"
519+
+ " <artifactId>jcoder-rpc-client</artifactId>\n" + " <version>1.0</version>\n" + "\n" + "\n" + " <dependencies>\n" + "\n"
520+
+ " <dependency>\n" + " <groupId>io.netty</groupId>\n" + " <artifactId>netty-all</artifactId>\n"
521+
+ " <version>4.1.2.Final</version>\n" + " <scope>compile</scope>\n" + " </dependency>\n" + "\n"
522+
+ " <dependency>\n" + " <groupId>io.protostuff</groupId>\n"
523+
+ " <artifactId>protostuff-core</artifactId>\n" + " <version>1.4.4</version>\n"
524+
+ " <scope>compile</scope>\n" + " </dependency>\n" + "\n" + " <dependency>\n"
525+
+ " <groupId>io.protostuff</groupId>\n" + " <artifactId>protostuff-runtime</artifactId>\n"
526+
+ " <version>1.4.4</version>\n" + " <scope>compile</scope>\n" + " </dependency>\n" + "\n"
527+
+ " <dependency>\n" + " <groupId>org.objenesis</groupId>\n" + " <artifactId>objenesis</artifactId>\n"
528+
+ " <version>2.4</version>\n" + " <scope>compile</scope>\n" + " </dependency>\n" + "\n"
529+
+ " <dependency>\n" + " <groupId>org.jasypt</groupId>\n" + " <artifactId>jasypt</artifactId>\n"
530+
+ " <version>1.9.2</version>\n" + " <scope>compile</scope>\n" + " </dependency>\n" + "\n"
531+
+ " </dependencies>\n" + "</project>";
532+
517533
System.out.println(pom);
518534
}
519535
}

‎src/main/java/org/nlpcn/jcoder/util/JavaSource2RpcUtil.java‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ public class JavaSource2RpcUtil {
4040
+ " this.__JCODER__timeout = timeout;\n" + " }\n" + "\n" + " private boolean __JCODER__syn = true;\n" + "\n" + " private long __JCODER__timeout = 60000L;\n" + "\n"
4141
+ " public void set__JCODER__syn(boolean syn) {\n" + " this.__JCODER__syn = syn;\n" + " }\n" + "\n" + " public void set__JCODER__timeout(long timeout) {\n"
4242
+ " this.__JCODER__timeout = timeout;\n" + " }\n";
43+
44+
45+
public static void main(String[] args) {
46+
System.out.println(METHOD_TEMPLATE);
47+
}
4348

4449
public static String makeRpcSource(Task task) throws Exception {
4550
if (task.codeInfo().getClassz() == null) {
@@ -140,8 +145,17 @@ private static String explainMethod(MethodDeclaration method) {
140145
args = Joiner.on(" , ").join(parameters);
141146
argsName = Joiner.on(" , ").join(parameters.stream().map(p -> p.getId()).collect(Collectors.toList()));
142147
}
148+
149+
String returnType = method.getType().toString() ;
150+
151+
152+
if("void".equals(returnType)){
153+
methodCode = methodCode.replace("return ([RETURN]) ", "");
154+
}
155+
156+
methodCode = methodCode.replace("[RETURN]", returnType) ;
143157

144-
return methodCode.replace("[RETURN]", method.getType().toString()).replace("[METHOD_NAME]", method.getName()).replace("[ARGS]", args).replace("[ARGS_NAME]", argsName);
158+
return methodCode.replace("[METHOD_NAME]", method.getName()).replace("[ARGS]", args).replace("[ARGS_NAME]", argsName);
145159

146160
}
147161

‎src/main/resources/jcoder.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=1.6_201608081436
1+
version=1.7_201608081622

0 commit comments

Comments
 (0)