valhalla / fw-valhalla

Commit dad14d5a399357b47634d6068f78ddc91a05ea75

Authored by 张志伟
1 parent 8090cdd6

引入kotlin的支持

Inline Side-by-side
Showing 9 changed files with 62 additions and 67 deletions
fw-valhalla-common/pom.xml
  View file @dad14d5
... ... @@ -10,6 +10,12 @@
10 10 </parent>
11 11 <modelVersion>4.0.0</modelVersion>
12 12 <packaging>jar</packaging>
  13 +
  14 + <properties>
  15 + <kotlin.version>1.8.0</kotlin.version>
  16 + </properties>
  17 +
  18 +
13 19 <artifactId>fw-valhalla-common</artifactId>
14 20  
15 21 <dependencies>
... ... @@ -53,7 +59,6 @@
53 59 <dependency>
54 60 <groupId>com.google.guava</groupId>
55 61 <artifactId>guava</artifactId>
56   - <version>27.0.1-jre</version>
57 62 <scope>compile</scope>
58 63 </dependency>
59 64 <dependency>
... ... @@ -80,19 +85,15 @@
80 85 <dependency>
81 86 <groupId>cn.hutool</groupId>
82 87 <artifactId>hutool-all</artifactId>
83   - <version>5.2.5</version>
  88 + </dependency>
  89 + <dependency>
  90 + <groupId>org.jetbrains.kotlin</groupId>
  91 + <artifactId>kotlin-reflect</artifactId>
  92 + </dependency>
  93 + <dependency>
  94 + <groupId>org.jetbrains.kotlin</groupId>
  95 + <artifactId>kotlin-stdlib-jdk8</artifactId>
84 96 </dependency>
85 97 </dependencies>
86 98  
87   - <build>
88   - <plugins>
89   - <plugin>
90   - <groupId>org.apache.maven.plugins</groupId>
91   - <artifactId>maven-deploy-plugin</artifactId>
92   - <configuration>
93   - <skip>true</skip>
94   - </configuration>
95   - </plugin>
96   - </plugins>
97   - </build>
98 99 </project>
99 100 \ No newline at end of file
... ...
fw-valhalla-dao/pom.xml
  View file @dad14d5
... ... @@ -35,15 +35,4 @@
35 35 </dependency>
36 36 </dependencies>
37 37  
38   - <build>
39   - <plugins>
40   - <plugin>
41   - <groupId>org.apache.maven.plugins</groupId>
42   - <artifactId>maven-deploy-plugin</artifactId>
43   - <configuration>
44   - <skip>true</skip>
45   - </configuration>
46   - </plugin>
47   - </plugins>
48   - </build>
49 38 </project>
50 39 \ No newline at end of file
... ...
fw-valhalla-domain/pom.xml
  View file @dad14d5
... ... @@ -35,16 +35,4 @@
35 35 <artifactId>fw-valhalla-sdk</artifactId>
36 36 </dependency>
37 37 </dependencies>
38   -
39   - <build>
40   - <plugins>
41   - <plugin>
42   - <groupId>org.apache.maven.plugins</groupId>
43   - <artifactId>maven-deploy-plugin</artifactId>
44   - <configuration>
45   - <skip>true</skip>
46   - </configuration>
47   - </plugin>
48   - </plugins>
49   - </build>
50 38 </project>
51 39 \ No newline at end of file
... ...
fw-valhalla-rpc/pom.xml
  View file @dad14d5
... ... @@ -106,4 +106,5 @@
106 106 <optional>true</optional>
107 107 </dependency>
108 108 </dependencies>
  109 +
109 110 </project>
110 111 \ No newline at end of file
... ...
fw-valhalla-server/pom.xml
  View file @dad14d5
... ... @@ -169,13 +169,6 @@
169 169 <executable>true</executable>
170 170 </configuration>
171 171 </plugin>
172   - <plugin>
173   - <groupId>org.apache.maven.plugins</groupId>
174   - <artifactId>maven-deploy-plugin</artifactId>
175   - <configuration>
176   - <skip>true</skip>
177   - </configuration>
178   - </plugin>
179 172 </plugins>
180 173 </build>
181 174  
... ...
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/app/CommonController.java
  View file @dad14d5
... ... @@ -17,7 +17,10 @@ import lombok.extern.slf4j.Slf4j;
17 17 import org.apache.commons.lang3.StringUtils;
18 18 import org.apache.commons.lang3.math.NumberUtils;
19 19 import org.springframework.validation.annotation.Validated;
20   -import org.springframework.web.bind.annotation.*;
  20 +import org.springframework.web.bind.annotation.GetMapping;
  21 +import org.springframework.web.bind.annotation.RequestMapping;
  22 +import org.springframework.web.bind.annotation.RequestParam;
  23 +import org.springframework.web.bind.annotation.RestController;
21 24  
22 25 import javax.validation.constraints.NotBlank;
23 26 import javax.validation.constraints.NotNull;
... ...
fw-valhalla-service/pom.xml
  View file @dad14d5
... ... @@ -129,15 +129,4 @@
129 129 <artifactId>fw-identify-sdk</artifactId>
130 130 </dependency>
131 131 </dependencies>
132   - <build>
133   - <plugins>
134   - <plugin>
135   - <groupId>org.apache.maven.plugins</groupId>
136   - <artifactId>maven-deploy-plugin</artifactId>
137   - <configuration>
138   - <skip>true</skip>
139   - </configuration>
140   - </plugin>
141   - </plugins>
142   - </build>
143 132 </project>
144 133 \ No newline at end of file
... ...
lombok.config 0 → 100644
  View file @dad14d5
  1 +config.stopBubbling = true
  2 +lombok.accessors.chain=true
... ...
... ... @@ -12,7 +12,7 @@
12 12 <parent>
13 13 <groupId>cn.fw</groupId>
14 14 <artifactId>fw-common-dependencies</artifactId>
15   - <version>3.3.0</version>
  15 + <version>3.3.1</version>
16 16 </parent>
17 17  
18 18 <modules>
... ... @@ -27,7 +27,10 @@
27 27  
28 28 <properties>
29 29 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  30 + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
30 31 <java.version>1.8</java.version>
  32 + <!-- 启用kotlin增量编译 -->
  33 + <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
31 34 <fw.valhalla.version>1.0.0</fw.valhalla.version>
32 35 <!-- util -->
33 36 <poi.version>4.1.0</poi.version>
... ... @@ -294,11 +297,30 @@
294 297 <artifactId>junit</artifactId>
295 298 <scope>test</scope>
296 299 </dependency>
  300 +
  301 + <!-- kotlin -->
  302 + <dependency>
  303 + <groupId>org.jetbrains.kotlin</groupId>
  304 + <artifactId>kotlin-reflect</artifactId>
  305 + </dependency>
  306 + <dependency>
  307 + <groupId>org.jetbrains.kotlin</groupId>
  308 + <artifactId>kotlin-stdlib-jdk8</artifactId>
  309 + </dependency>
  310 + <dependency>
  311 + <groupId>com.fasterxml.jackson.module</groupId>
  312 + <artifactId>jackson-module-kotlin</artifactId>
  313 + </dependency>
  314 +
297 315 </dependencies>
298 316  
299 317 <build>
300 318 <plugins>
301 319 <plugin>
  320 + <groupId>org.jetbrains.kotlin</groupId>
  321 + <artifactId>kotlin-maven-plugin</artifactId>
  322 + </plugin>
  323 + <plugin>
302 324 <groupId>org.apache.maven.plugins</groupId>
303 325 <artifactId>maven-compiler-plugin</artifactId>
304 326 <configuration>
... ... @@ -307,6 +329,13 @@
307 329 </configuration>
308 330 </plugin>
309 331 <plugin>
  332 + <groupId>org.apache.maven.plugins</groupId>
  333 + <artifactId>maven-deploy-plugin</artifactId>
  334 + <configuration>
  335 + <skip>true</skip>
  336 + </configuration>
  337 + </plugin>
  338 + <plugin>
310 339 <groupId>org.codehaus.mojo</groupId>
311 340 <artifactId>versions-maven-plugin</artifactId>
312 341 </plugin>
... ... @@ -315,20 +344,20 @@
315 344  
316 345 <repositories>
317 346 <repository>
318   - <id>feewee-maven-public</id>
319   - <name>feewee maven public</name>
320   - <url>https://nexus.feewee.cn/nexus/content/groups/public/</url>
321   - <releases>
322   - <enabled>true</enabled>
323   - <updatePolicy>always</updatePolicy>
324   - </releases>
325   - <snapshots>
326   - <enabled>true</enabled>
327   - <updatePolicy>always</updatePolicy>
328   - </snapshots>
  347 + <id>aliyun</id>
  348 + <name>aliyun</name>
  349 + <url>https://maven.aliyun.com/nexus/content/groups/public/</url>
329 350 </repository>
330 351 </repositories>
331 352  
  353 + <pluginRepositories>
  354 + <pluginRepository>
  355 + <id>aliyun</id>
  356 + <name>aliyun</name>
  357 + <url>https://maven.aliyun.com/nexus/content/groups/public/</url>
  358 + </pluginRepository>
  359 + </pluginRepositories>
  360 +
332 361 <distributionManagement>
333 362 <repository>
334 363 <id>feewee-maven-releases</id>
... ...