Skip to content

Commit 3b5bb19

Browse files
TommyLemonTommyLemon
committed
升级 apijson-orm, fastjson, mysql-connector-java 等版本
1 parent 9074192 commit 3b5bb19

14 files changed

+96
-12
lines changed

‎APIJSON-Java-Server/APIJSONBoot/.classpath

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,5 @@
2727
<attribute name="maven.pomderived" value="true"/>
2828
</attributes>
2929
</classpathentry>
30-
<classpathentry kind="lib" path="libs/apijson-framework-4.2.0.jar"/>
31-
<classpathentry kind="lib" path="libs/apijson-orm-4.2.0.jar"/>
3230
<classpathentry kind="output" path="target/classes"/>
3331
</classpath>

‎APIJSON-Java-Server/APIJSONBoot/.project

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>apijson-boot</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
22+
</natures>
23+
</projectDescription>

‎APIJSON-Java-Server/APIJSONBoot/.settings/org.eclipse.core.resources.prefs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
eclipse.preferences.version=1
2+
encoding//src/main/java=UTF-8
3+
encoding//src/main/resources=UTF-8
4+
encoding//src/test/java=UTF-8
5+
encoding/<project>=UTF-8

‎APIJSON-Java-Server/APIJSONBoot/.settings/org.eclipse.jdt.core.prefs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
3+
org.eclipse.jdt.core.compiler.compliance=1.8
4+
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
5+
org.eclipse.jdt.core.compiler.source=1.8

‎APIJSON-Java-Server/APIJSONBoot/.settings/org.eclipse.m2e.core.prefs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
activeProfiles=
2+
eclipse.preferences.version=1
3+
resolveWorkspaceProjects=true
4+
version=1

‎APIJSON-Java-Server/APIJSONBoot/libs/apijson-framework-4.2.0.jar renamed to ‎APIJSON-Java-Server/APIJSONBoot/libs/apijson-framework-4.2.3.jar

77.6 KB
Binary file not shown.

‎APIJSON-Java-Server/APIJSONBoot/libs/apijson-orm-4.2.0.jar renamed to ‎APIJSON-Java-Server/APIJSONBoot/libs/apijson-orm-4.2.3.jar

281 KB
Binary file not shown.

‎APIJSON-Java-Server/APIJSONBoot/libs/ojdbc8.jar

-3.97 MB
Binary file not shown.

‎APIJSON-Java-Server/APIJSONBoot/pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>apijson.boot</groupId>
77
<artifactId>apijson-boot</artifactId>
8-
<version>4.1.0</version>
8+
<version>4.2.3</version>
99
<packaging>jar</packaging>
1010

1111
<name>APIJSONBoot</name>
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>com.alibaba</groupId>
3131
<artifactId>fastjson</artifactId>
32-
<version>1.2.61</version>
32+
<version>1.2.73</version>
3333
</dependency>
3434

3535
<!-- APIJSONBoot 需要用的 Spring 框架，1.4.1 以上 -->
@@ -51,7 +51,7 @@
5151
<dependency>
5252
<groupId>mysql</groupId>
5353
<artifactId>mysql-connector-java</artifactId>
54-
<version>8.0.11</version>
54+
<version>8.0.16</version>
5555
</dependency>
5656
<dependency>
5757
<groupId>org.postgresql</groupId>
@@ -70,14 +70,14 @@
7070
<version>11.5.0.0</version>
7171
</dependency>
7272

73-
<!-- 没找到合适且稳定的 Oracle 的 JDBC Maven 依赖，已在 libs 目录放了对应的 jar 包来替代 -->
74-
73+
<!-- 没找到合适且稳定的 Oracle 的 JDBC Maven 依赖，需要自行下载 jar 包 -->
74+
7575
<!-- 可使用 libs 目录的 apijson-framework.jar 和 apijson-orm.jar 本地 jar 包依赖来替代，两种方式二选一 -->
76-
<!-- <dependency>
76+
<dependency>
7777
<groupId>com.github.APIJSON</groupId>
7878
<artifactId>apijson-framework</artifactId>
79-
<version>LATEST</version>
80-
</dependency> -->
79+
<version>4.2.3</version>
80+
</dependency>
8181

8282
</dependencies>
8383

‎APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/boot/model/Privacy.java

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
import static apijson.RequestRole.OWNER;
1919
import static apijson.RequestRole.UNKNOWN;
2020

21+
import com.alibaba.fastjson.annotation.JSONField;
22+
2123
import apijson.MethodAccess;
2224
import apijson.framework.BaseModel;
2325

@@ -70,9 +72,14 @@ public Privacy setPhone(String phone) {
7072
return this;
7173
}
7274

73-
/**get_password会转为password
75+
/**fastjson >= 1.2.70 的版本时，JSON.toJSONString 后，
76+
* get__password, get_password 会分别转为 __password, password，
77+
* 不像之前(例如 1.2.61 及以下)分别转为 _password, password，
78+
* 如果 @JSONField(name="_password") 未生效，请勿使用 1.2.70-1.2.73，或调整数据库字段命名为 __password
7479
* @return
7580
*/
81+
82+
@JSONField(name="_password")
7683
public String get__password() {
7784
return password;
7885
}
@@ -81,9 +88,14 @@ public Privacy setPassword(String password) {
8188
return this;
8289
}
8390

84-
/**get_PayPassword会转为PayPassword
91+
/**fastjson >= 1.2.70 的版本时，JSON.toJSONString 后，
92+
* get__payPassword, get_payPassword 会分别转为 __payPassword, payPassword，
93+
* 不像之前(例如 1.2.61 及以下)分别转为 _payPassword, payPassword，
94+
* 如果 @JSONField(name="_payPassword") 未生效，请勿使用 1.2.70-1.2.73，或调整数据库字段命名为 __payPassword
8595
* @return
8696
*/
97+
98+
@JSONField(name="_payPassword")
8799
public String get__payPassword() {
88100
return payPassword;
89101
}

‎APIJSON-Java-Server/APIJSONBootTest/.project

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>apijson-boot-test</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
22+
</natures>
23+
</projectDescription>

‎APIJSON-Java-Server/APIJSONBootTest/.settings/org.eclipse.core.resources.prefs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
eclipse.preferences.version=1
2+
encoding//src/main/java=UTF-8
3+
encoding//src/main/resources=UTF-8
4+
encoding//src/test/java=UTF-8
5+
encoding/<project>=UTF-8

‎APIJSON-Java-Server/APIJSONBootTest/.settings/org.eclipse.jdt.core.prefs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
3+
org.eclipse.jdt.core.compiler.compliance=1.8
4+
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
5+
org.eclipse.jdt.core.compiler.source=1.8

‎APIJSON-Java-Server/APIJSONBootTest/.settings/org.eclipse.m2e.core.prefs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
activeProfiles=
2+
eclipse.preferences.version=1
3+
resolveWorkspaceProjects=true
4+
version=1

0 commit comments

Comments
 (0)