Skip to content

Commit 3fac6a0

Browse files
author
Javen
committed
Big refactor:
Change package structure Change API definition Refine code
1 parent 2820b30 commit 3fac6a0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1073
-1765
lines changed

.classpath

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,29 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="src"/>
4-
<classpathentry kind="src" path="test"/>
5-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
3+
<classpathentry kind="src" output="target/classes" path="src">
4+
<attributes>
5+
<attribute name="optional" value="true"/>
6+
<attribute name="maven.pomderived" value="true"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry kind="src" path="resources"/>
10+
<classpathentry kind="src" output="target/test-classes" path="test">
11+
<attributes>
12+
<attribute name="optional" value="true"/>
13+
<attribute name="maven.pomderived" value="true"/>
14+
</attributes>
15+
</classpathentry>
16+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
17+
<attributes>
18+
<attribute name="maven.pomderived" value="true"/>
19+
</attributes>
20+
</classpathentry>
621
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
722
<classpathentry kind="lib" path="lib/gson-2.2.2.jar"/>
8-
<classpathentry kind="output" path="bin"/>
23+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
24+
<attributes>
25+
<attribute name="maven.pomderived" value="true"/>
26+
</attributes>
27+
</classpathentry>
28+
<classpathentry kind="output" path="target/classes"/>
929
</classpath>

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ test-output/
1111
*.war
1212
*.ear
1313

14+
/target

.project

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,14 @@
1010
<arguments>
1111
</arguments>
1212
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
1318
</buildSpec>
1419
<natures>
20+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
1521
<nature>org.eclipse.jdt.core.javanature</nature>
1622
</natures>
1723
</projectDescription>

pom.xml

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
<distribution>repo</distribution>
99
</license>
1010
</licenses>
11-
<parent>
12-
<groupId>org.sonatype.oss</groupId>
13-
<artifactId>oss-parent</artifactId>
14-
<version>7</version>
15-
</parent>
11+
<parent>
12+
<groupId>org.sonatype.oss</groupId>
13+
<artifactId>oss-parent</artifactId>
14+
<version>7</version>
15+
</parent>
1616
<groupId>cn.jpush.api</groupId>
1717
<artifactId>jpush-client</artifactId>
18-
<version>2.2-SNAPSHOT</version>
18+
<version>2.2-SNAPSHOT</version>
1919
<packaging>jar</packaging>
2020
<name>JPush API Java Client</name>
2121
<description>JPush's officially supported Java client library for accessing JPush APIs.</description>
@@ -33,6 +33,22 @@
3333
<version>4.11</version>
3434
<scope>test</scope>
3535
</dependency>
36+
<dependency>
37+
<groupId>org.slf4j</groupId>
38+
<artifactId>slf4j-api</artifactId>
39+
<version>1.7.5</version>
40+
</dependency>
41+
<dependency>
42+
<groupId>ch.qos.logback</groupId>
43+
<artifactId>logback-core</artifactId>
44+
<version>1.0.13</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>ch.qos.logback</groupId>
48+
<artifactId>logback-classic</artifactId>
49+
<version>1.0.13</version>
50+
</dependency>
51+
3652
</dependencies>
3753
<build>
3854
<sourceDirectory>src</sourceDirectory>

resources/jpush-api.conf

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
# This app is only used for API Test. Please don't modify it.
3+
username=jpush_api_client
4+
password=654321
5+
appKey=dd1066407b044738b6479275
6+
masterSecret=2b38ce69b1de2a7fa95706ea
7+
8+
alias=alias_api
9+
tag=tag_api

src/cn/jpush/api/BaseResult.java

Lines changed: 0 additions & 49 deletions
This file was deleted.

src/cn/jpush/api/HttpClient.java

Lines changed: 0 additions & 214 deletions
This file was deleted.

0 commit comments

Comments
 (0)