Skip to content

Commit 5df0d07

Browse files
committed
升级依赖
1 parent 3d3e52e commit 5df0d07

File tree

3 files changed

+26
-31
lines changed

3 files changed

+26
-31
lines changed

pom.xml

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,9 @@
1111
<java.version>1.8</java.version>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313
<project.main.class>com.networknt.server.Server</project.main.class>
14-
<version.light-4j>1.6.17</version.light-4j>
15-
<version.jose4j>0.6.3</version.jose4j>
14+
<version.light-4j>1.6.28</version.light-4j>
1615
<version.logback>1.2.3</version.logback>
17-
<version.junit>4.12</version.junit>
18-
<version.undertow>2.0.22.Final</version.undertow>
16+
<version.junit>4.13.1</version.junit>
1917
<version.fastscanner>2.18.1</version.fastscanner>
2018
<versions.maven-version>2.4</versions.maven-version>
2119
<version.lombok>1.16.18</version.lombok>
@@ -36,17 +34,16 @@
3634
<version.zxing>3.2.1</version.zxing>
3735
<version.vcard>0.10.0</version.vcard>
3836
<version.easyexcel>1.1.2-beta5</version.easyexcel>
39-
<version.mysql>5.1.43</version.mysql>
4037
<version.hikaricp>3.1.0</version.hikaricp>
4138
<version.dbutils>1.7</version.dbutils>
4239
<version.commons-io>2.6</version.commons-io>
43-
<version.hutool>5.3.9</version.hutool>
40+
<version.hutool>5.4.6</version.hutool>
4441
<version.shiro>1.3.2</version.shiro>
4542
<version.ip2region>1.7.2</version.ip2region>
4643
<version.bouncycastle>1.64</version.bouncycastle>
4744
<version.beetlsql>2.12.28.RELEASE</version.beetlsql>
4845
<version.antlr4>4.7.2</version.antlr4>
49-
<version.apijson>4.1.0</version.apijson>
46+
<version.apijson>4.2.3</version.apijson>
5047
<version.log4jdbc>1.2</version.log4jdbc>
5148
</properties>
5249

@@ -202,11 +199,6 @@
202199
<artifactId>easyexcel</artifactId>
203200
<version>${version.easyexcel}</version>
204201
</dependency>
205-
<dependency>
206-
<groupId>mysql</groupId>
207-
<artifactId>mysql-connector-java</artifactId>
208-
<version>${version.mysql}</version>
209-
</dependency>
210202
<dependency>
211203
<groupId>com.zaxxer</groupId>
212204
<artifactId>HikariCP</artifactId>
@@ -262,15 +254,13 @@
262254
<artifactId>antlr4-runtime</artifactId>
263255
<version>${version.antlr4}</version>
264256
</dependency>
265-
<!-- http://t.xlongwei.com/windows/apijson-orm-4.1.0.jar -->
266257
<dependency>
267-
<groupId>apijson.orm</groupId>
258+
<groupId>com.github.APIJSON</groupId>
268259
<artifactId>apijson-orm</artifactId>
269260
<version>${version.apijson}</version>
270261
</dependency>
271-
<!-- http://t.xlongwei.com/windows/apijson-framework-4.1.0.jar -->
272262
<dependency>
273-
<groupId>apijson.framework</groupId>
263+
<groupId>com.github.APIJSON</groupId>
274264
<artifactId>apijson-framework</artifactId>
275265
<version>${version.apijson}</version>
276266
</dependency>
@@ -396,6 +386,16 @@
396386
</plugins>
397387
</build>
398388
</profile>
389+
<profile>
390+
<id>mysql5</id>
391+
<dependencies>
392+
<dependency>
393+
<groupId>mysql</groupId>
394+
<artifactId>mysql-connector-java</artifactId>
395+
<version>5.1.43</version>
396+
</dependency>
397+
</dependencies>
398+
</profile>
399399
</profiles>
400400

401401
<build>
@@ -520,15 +520,8 @@
520520

521521
<repositories>
522522
<repository>
523-
<id>sonatype-snapshots</id>
524-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
525-
<snapshots>
526-
<enabled>true</enabled>
527-
</snapshots>
523+
<id>jitpack.io</id>
524+
<url>https://jitpack.io</url>
528525
</repository>
529-
<repository>
530-
<id>codelds</id>
531-
<url>https://code.lds.org/nexus/content/groups/main-repo</url>
532-
</repository>
533526
</repositories>
534527
</project>

src/main/java/com/xlongwei/light4j/apijson/DemoApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626
@Slf4j
2727
public class DemoApplication {
28-
public static final boolean apijsonEnabled = NumberUtil.parseBoolean(System.getProperty("apijson.enabled"), true);
28+
public static final boolean apijsonEnabled = NumberUtil.parseBoolean(System.getProperty("apijson.enabled"), false);
2929
public static final DemoController apijson = new DemoController();
3030

3131
public static void start() {

start.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22

33
daemon=true
44
appname=light4j
5+
#profile="-P mysql5"
56
jarfile=target/light4j.jar
67
[ ! -e "$jarfile" ] && jarfile=light4j.jar
7-
#JVM_OPS="-Xmx336m -Xms336m -XX:NewSize=80m -XX:MaxNewSize=80m -Xss228k"
8-
JVM_OPS="-Djava.compiler=none -Xmx84m -Xms84m -XX:NewSize=20m -XX:MaxNewSize=20m -Xss228k"
8+
Survivor=2 Old=64 NewSize=$[Survivor*10] Xmx=$[NewSize+Old] #NewSize=Survivor*(1+1+8) Xmx=NewSize+Old
9+
JVM_OPS="-Djava.compiler=none -Xmx${Xmx}m -Xms${Xmx}m -XX:NewSize=${NewSize}m -XX:MaxNewSize=${NewSize}m -XX:SurvivorRatio=8 -Xss228k"
910
JVM_OPS="$JVM_OPS -Dlogserver -DcontextName=light4j"
11+
#JVM_OPS="$JVM_OPS -Dapijson.enabled=true -Dapijson.debug=false -Dapijson.test=false"
1012
#ENV_OPS="PATH=/usr/java/jdk1.8.0_161/bin:$PATH"
1113
JVM_OPS="$JVM_OPS -Dlight4j.directory=/soft/softwares/library/"
1214
#JVM_OPS="$JVM_OPS -Dredis.configDb=xlongwei:6379:1"
@@ -69,15 +71,15 @@ clean(){
6971
}
7072

7173
jar(){
72-
mvn compile jar:jar
74+
mvn $profile compile jar:jar
7375
}
7476

7577
jars(){
76-
mvn dependency:copy-dependencies -DoutputDirectory=target
78+
mvn $profile dependency:copy-dependencies -DoutputDirectory=target
7779
}
7880

7981
deploy(){
80-
mvn package -Prelease -Dmaven.test.skip=true -Dmaven.javadoc.skip=true
82+
mvn package -Prelease $profile -Dmaven.test.skip=true -Dmaven.javadoc.skip=true
8183
}
8284

8385
start(){

0 commit comments

Comments
 (0)