Skip to content

Commit 0298d74

Browse files
zangyilinzangyilin
committed
修改异常处理
增加status相关接口
1 parent 359cf56 commit 0298d74

17 files changed

Lines changed: 684 additions & 92 deletions

‎pom.xml‎

Lines changed: 81 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,83 @@
77
<groupId>com.javabaas</groupId>
88
<artifactId>javasdk</artifactId>
99
<version>1.0</version>
10+
<packaging>jar</packaging>
11+
<name>JavaBaas_SDK_Java</name>
12+
<description>JavaBaas_SDK_Java</description>
13+
<url>http://www.javabaas.com/</url>
14+
<licenses>
15+
<license>
16+
<name>The Apache Software License, Version 2.0</name>
17+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
18+
</license>
19+
</licenses>
20+
<developers>
21+
<developer>
22+
<name>zang</name>
23+
<email>zangyilinzw@126.com</email>
24+
</developer>
25+
</developers>
26+
<scm>
27+
<connection>scm:git:git@github.com:JavaBaas/JavaBaas_SDK_Java.git</connection>
28+
<developerConnection>scm:git:git@github.com:JavaBaas/JavaBaas_SDK_Java.git</developerConnection>
29+
<url>git@github.com:JavaBaas/JavaBaas_SDK_Java.git</url>
30+
</scm>
31+
32+
<properties>
33+
<maven.compiler.source>1.8</maven.compiler.source>
34+
<maven.compiler.target>1.8</maven.compiler.target>
35+
</properties>
1036

1137
<build>
1238
<plugins>
1339
<plugin>
1440
<groupId>org.apache.maven.plugins</groupId>
15-
<artifactId>maven-compiler-plugin</artifactId>
16-
<configuration>
17-
<source>1.8</source>
18-
<target>1.8</target>
19-
</configuration>
41+
<artifactId>maven-source-plugin</artifactId>
42+
<version>2.2.1</version>
43+
<executions>
44+
<execution>
45+
<id>attach-sources</id>
46+
<goals>
47+
<goal>jar-no-fork</goal>
48+
</goals>
49+
</execution>
50+
</executions>
51+
</plugin>
52+
<plugin>
53+
<groupId>org.apache.maven.plugins</groupId>
54+
<artifactId>maven-javadoc-plugin</artifactId>
55+
<version>2.9.1</version>
56+
<executions>
57+
<execution>
58+
<id>attach-javadocs</id>
59+
<phase>package</phase>
60+
<goals>
61+
<goal>jar</goal>
62+
</goals>
63+
<configuration>
64+
<additionalparam>-Xdoclint:none</additionalparam>
65+
</configuration>
66+
</execution>
67+
</executions>
68+
</plugin>
69+
<plugin>
70+
<groupId>org.apache.maven.plugins</groupId>
71+
<artifactId>maven-gpg-plugin</artifactId>
72+
<version>1.5</version>
73+
<executions>
74+
<execution>
75+
<id>sign-artifacts</id>
76+
<phase>verify</phase>
77+
<goals>
78+
<goal>sign</goal>
79+
</goals>
80+
</execution>
81+
</executions>
2082
</plugin>
2183
</plugins>
2284
</build>
2385

86+
2487
<dependencies>
2588
<dependency>
2689
<groupId>com.squareup.okhttp3</groupId>
@@ -33,13 +96,21 @@
3396
<version>2.8.8</version>
3497
</dependency>
3598
<dependency>
36-
<groupId>org.slf4j</groupId>
37-
<artifactId>slf4j-api</artifactId>
38-
<version>1.7.25</version>
99+
<groupId>org.apache.logging.log4j</groupId>
100+
<artifactId>log4j-api</artifactId>
101+
<version>2.7</version>
39102
</dependency>
40103
</dependencies>
41104

42-
43-
105+
<distributionManagement>
106+
<snapshotRepository>
107+
<id>oss</id>
108+
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
109+
</snapshotRepository>
110+
<repository>
111+
<id>oss</id>
112+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
113+
</repository>
114+
</distributionManagement>
44115

45116
</project>

‎src/main/java/com/javabaas/javasdk/JBApp.java‎

Lines changed: 39 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,12 @@ public static void importDataInBackground(String data, JBImportCallback callback
360360

361361
private static void importDataToJavabaas(final boolean sync, final String data, final JBImportCallback callback) {
362362
String path = JBHttpClient.getAdminPath("import");
363-
Map<String, Object> body = JBUtils.readValue(data, Map.class);
363+
Map<String, Object> body;
364+
try {
365+
body = JBUtils.readValue(data, Map.class);
366+
} catch (JBException e) {
367+
body = null;
368+
}
364369
JBHttpClient.INSTANCE().sendRequest(path, JBHttpMethod.POST, null, body, sync, new JBObjectCallback() {
365370
@Override
366371
public void onSuccess(JBResult result) {
@@ -488,9 +493,14 @@ private static JBHttpParams getParamsFromApiStat(JBApiStat apiStat) {
488493
}
489494

490495
private static JBAppExport getAppExportFromMap(Map<String, Object> map) {
491-
String exportStr = JBUtils.writeValueAsString(map);
492-
JBAppExport appExport = JBUtils.readValue(exportStr, JBAppExport.class);
493-
return appExport;
496+
try {
497+
String exportStr = JBUtils.writeValueAsString(map);
498+
JBAppExport appExport = JBUtils.readValue(exportStr, JBAppExport.class);
499+
return appExport;
500+
} catch (JBException e) {
501+
return null;
502+
}
503+
494504
}
495505

496506
private static List<JBApp> getAppListFromMap(LinkedHashMap<String, Object> map) {
@@ -504,22 +514,29 @@ private static List<JBApp> getAppListFromMap(LinkedHashMap<String, Object> map)
504514
}
505515

506516
private void copyAppFromMap(Map<String, Object> map) {
507-
String appStr = JBUtils.writeValueAsString(map);
508-
JBApp app = JBUtils.readValue(appStr, JBApp.class);
509-
if (app != null) {
510-
setId(app.id);
511-
setName(app.name);
512-
setKey(app.key);
513-
setMasterKey(app.masterKey);
514-
setAppAccounts(app.appAccounts);
515-
setCloudSetting(app.cloudSetting);
516-
}
517+
try {
518+
String appStr = JBUtils.writeValueAsString(map);
519+
JBApp app = JBUtils.readValue(appStr, JBApp.class);
520+
if (app != null) {
521+
setId(app.id);
522+
setName(app.name);
523+
setKey(app.key);
524+
setMasterKey(app.masterKey);
525+
setAppAccounts(app.appAccounts);
526+
setCloudSetting(app.cloudSetting);
527+
}
528+
} catch (JBException e) {}
529+
517530
}
518531

519532
private static JBApp getAppFromMap(Map<String, Object> map) {
520-
String appStr = JBUtils.writeValueAsString(map);
521-
JBApp app = JBUtils.readValue(appStr, JBApp.class);
522-
return app;
533+
try {
534+
String appStr = JBUtils.writeValueAsString(map);
535+
JBApp app = JBUtils.readValue(appStr, JBApp.class);
536+
return app;
537+
} catch (JBException e) {
538+
return null;
539+
}
523540
}
524541

525542
private Map<String, Object> getAppMap() {
@@ -547,7 +564,11 @@ private Map<String, Object> getAppMap() {
547564

548565
@Override
549566
public String toString() {
550-
return JBUtils.writeValueAsString(this);
567+
try {
568+
return JBUtils.writeValueAsString(this);
569+
} catch (JBException e) {
570+
return "";
571+
}
551572
}
552573

553574
public static class CloudSetting {

‎src/main/java/com/javabaas/javasdk/JBClazz.java‎

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,11 @@ public static void importDataInBackground(String data, JBImportCallback callback
360360

361361
private static void importDataToJavabaas(final boolean sync, final String data, final JBImportCallback callback) {
362362
String path = JBHttpClient.getClazzPath("import");
363-
Map<String, Object> body = JBUtils.readValue(data, Map.class);
363+
Map<String, Object> body = null;
364+
try {
365+
body = JBUtils.readValue(data, Map.class);
366+
} catch (JBException e) {
367+
}
364368
JBHttpClient.INSTANCE().sendRequest(path, JBHttpMethod.POST, null, body, sync, new JBObjectCallback() {
365369
@Override
366370
public void onSuccess(JBResult result) {
@@ -380,9 +384,13 @@ public void onFailure(JBException error) {
380384
}
381385

382386
private static JBClazzExport getClazzExportFromMap(Map<String, Object> map) {
383-
String exportStr = JBUtils.writeValueAsString(map);
384-
JBClazzExport clazzExport = JBUtils.readValue(exportStr, JBClazzExport.class);
385-
return clazzExport;
387+
try {
388+
String exportStr = JBUtils.writeValueAsString(map);
389+
JBClazzExport clazzExport = JBUtils.readValue(exportStr, JBClazzExport.class);
390+
return clazzExport;
391+
} catch (JBException e) {
392+
return null;
393+
}
386394
}
387395

388396
private static List<JBClazz> getClazzListFromMap(LinkedHashMap<String, Object> map) {
@@ -402,9 +410,14 @@ private static JBClazz copyClazzFromResultData(Map<String, Object> map) {
402410

403411
private static JBClazz copyClazzFromMap(Map<String, Object> map) {
404412
if (map == null) {return null;}
405-
String clazzStr = JBUtils.writeValueAsString(map);
406-
JBClazz clazz = JBUtils.readValue(clazzStr, JBClazz.class);
407-
return clazz;
413+
try {
414+
String clazzStr = JBUtils.writeValueAsString(map);
415+
JBClazz clazz = JBUtils.readValue(clazzStr, JBClazz.class);
416+
return clazz;
417+
} catch (JBException e) {
418+
return null;
419+
}
420+
408421
}
409422

410423
public static class JBClazzAcl extends LinkedHashMap<String, Object> {
@@ -456,7 +469,11 @@ private Map<String, Boolean> getAccessMap(String name) {
456469

457470
@Override
458471
public String toString() {
459-
return JBUtils.writeValueAsString(this);
472+
try {
473+
return JBUtils.writeValueAsString(this);
474+
} catch (JBException e) {
475+
return "";
476+
}
460477
}
461478
}
462479

‎src/main/java/com/javabaas/javasdk/JBCode.java‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
public enum JBCode {
88
SUCCESS(0, "成功"),
9-
OTHER_HTTP_ERROR(-1, "请求错误"),
9+
OTHER_HTTP_ERROR(-1, "网络请求错误，请检查"),
1010
NOT_FOUND(404, "无效地址"),
1111
INTERNAL_ERROR(500, "服务器内部错误"),
1212
INTERNAL_JSON_ERROR(501, "JSON处理失败"),
@@ -91,22 +91,7 @@ public enum JBCode {
9191
SMS_SEND_INTERVAL_LIMIT(7002, "禁止连续发送"),
9292
SMS_HANDLER_NOT_DEFINE(7002, "短信处理器为定义"),
9393
SMS_HANDLER_NOT_FOUND(7003, "短信处理器未找到"),
94-
// 云方法相关
95-
// todo 有时间整理
96-
DEVICE_WRONG_IDENTIFICATION(10001, "设备信息错误"),
97-
DISCUSSION_INFO_WRONG(10002, "会议内容错误"),
98-
GET_TOKEN_FAILED(10003, "获取七牛token失败"),
99-
PAGE_STATUS_FINISHED(10004, "已结束的会议，内容不允许修改"),
100-
PAGE_VERSION_WRONG(10005, "版本号小于当前版本号，不允许修改"),
101-
DEVICE_NOT_EXIST(10006, "设备未激活或信息错误"),
102-
PAGE_NOT_EXIST(10007, "Page不存在"),
103-
DISCUSSION_NOT_EXIST(10008, "会议不存在"),
104-
DISCUSSION_STATUS_FINISHED(10009, "会议已经结束，不能修改"),
105-
CLOUD_NAME_WRONG(10010, "无效的方法名"),
106-
USER_NOT_LOGIN(10011, "用户未登录"),
107-
HOOK_APPID_WRONG(10012, "AppId错误"),
108-
HOOK_NOT_EXIST(10013, "hook不存在"),
109-
PAGE_INFO_WRONG(10014, "Page 内容错误");
94+
USER_NOT_LOGIN(10011, "用户未登录");
11095

11196
private int code;
11297
private String message;

‎src/main/java/com/javabaas/javasdk/JBConfig.java‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,26 @@
11
package com.javabaas.javasdk;
22

3+
import com.javabaas.javasdk.log.JBLogUtil;
4+
import com.javabaas.javasdk.log.JBLogger;
5+
6+
import java.util.Date;
7+
import java.util.Map;
8+
39
/**
410
* Created by zangyilin on 2017/8/10.
511
*/
612
public class JBConfig {
7-
813
boolean finishInit;
914
String remote;
1015
String appId;
1116
String key;
1217
String masterKey;
1318
String adminKey;
19+
long adjustTime;
1420

1521
public static void init(String remote, String appId, String key) {
1622
JBConfig.getInstance().initConfig(remote, appId, key, null, null);
23+
JBConfig.getInstance().updateAdjustTime();
1724
}
1825

1926
public static void initAdmin(String remote, String adminKey) {
@@ -29,9 +36,14 @@ public static void useApp(JBApp app) {
2936
JBConfig.getInstance().removeAppConfig();
3037
} else {
3138
JBConfig.getInstance().initConfig(null, app.getId(), app.getKey(), app.getMasterKey(), null);
39+
JBConfig.getInstance().updateAdjustTime();
3240
}
3341
}
3442

43+
public static void setDebugLogEnabled(boolean enable) {
44+
JBLogger.instance().setDebugEnabled(enable);
45+
}
46+
3547
public void removeAppConfig() {
3648
this.masterKey = null;
3749
this.key = null;
@@ -64,4 +76,21 @@ private void initConfig(String remote, String appId, String key, String masterKe
6476
}
6577
this.finishInit = true;
6678
}
79+
80+
private void updateAdjustTime() {
81+
long timestamp = new Date().getTime();
82+
83+
try {
84+
Map<String, Object> map = JBStatus.getStatus();
85+
if (map.get("time") != null) {
86+
long serverTime = (long) map.get("time");
87+
if (serverTime > 0) {
88+
this.adjustTime = timestamp - serverTime;
89+
}
90+
} else {
91+
}
92+
} catch (JBException e) {
93+
JBLogUtil.log.w("服务器连接失败，请检查。");
94+
}
95+
}
6796
}

‎src/main/java/com/javabaas/javasdk/JBException.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,29 @@
33
/**
44
* Created by Staryet on 15/6/18.
55
*/
6-
public class JBException extends RuntimeException {
6+
public class JBException extends Exception {
77

88
private int code;
99
private String message;
1010

11-
public static void e(JBCode simpleCode) {
12-
throw new JBException(simpleCode);
13-
}
11+
// public static void e(JBCode simpleCode) {
12+
// throw new JBException(simpleCode);
13+
// }
1414

1515
public JBException(JBCode simpleCode) {
16+
super(simpleCode.getMessage());
1617
code = simpleCode.getCode();
1718
message = simpleCode.getMessage();
1819
}
1920

2021
public JBException(int code) {
22+
super();
2123
this.code = code;
2224
this.message = "";
2325
}
2426

2527
public JBException(int code, String message) {
28+
super(message);
2629
this.code = code;
2730
this.message = message;
2831
}

0 commit comments

Comments
 (0)