From b92553420da5ffe384000b9f41a4c280f93c2050 Mon Sep 17 00:00:00 2001
From: Peng <Peng@fanruan.com>
Date: Fri, 27 Sep 2019 22:06:29 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B?=
=?UTF-8?q?=E5=AF=BC=E8=87=B4IDEA=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index e749752..80cc069 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,8 +8,9 @@
<properties>
<common-version>10.0-FEATURE-SNAPSHOT</common-version>
<maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
- <build-version>${version}</build-version>
+ <build-version>${project.version}</build-version>
<build-no>${maven.build.timestamp}</build-no>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<!-- core包 -->
@@ -129,9 +130,10 @@
</dependency>
</dependencies>
<build>
- <finalName>${project.artifactId}-${version}-${maven.build.timestamp}</finalName>
+ <finalName>${project.artifactId}-${project.version}-${maven.build.timestamp}</finalName>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
@@ -141,17 +143,10 @@
<proc>none</proc>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>8</source>
- <target>8</target>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>3.1.2</version>
<configuration>
<archive>
<manifest>
@@ -167,6 +162,7 @@
<configuration>
<reportOutputDirectory>target</reportOutputDirectory>
<destDir>javadocs</destDir>
+ <additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
</plugins>
From ec3ec37130ef39642b204261fa4c9753ee05086e Mon Sep 17 00:00:00 2001
From: Peng <Peng@fanruan.com>
Date: Fri, 27 Sep 2019 22:55:29 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E9=80=9A?=
=?UTF-8?q?=E8=BF=87=E9=82=AE=E7=AE=B1=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7?=
=?UTF-8?q?=E5=90=8D=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/fanruan/api/decision/user/UserKit.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/src/main/java/com/fanruan/api/decision/user/UserKit.java b/src/main/java/com/fanruan/api/decision/user/UserKit.java
index eeb1429..6375a0e 100644
--- a/src/main/java/com/fanruan/api/decision/user/UserKit.java
+++ b/src/main/java/com/fanruan/api/decision/user/UserKit.java
@@ -7,6 +7,7 @@ import com.fr.decision.webservice.utils.user.source.UserSource;
import com.fr.decision.webservice.v10.user.UserService;
import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author richie
@@ -63,4 +64,15 @@ public class UserKit {
public static void add(OpenUser user) throws Exception {
AuthorityContext.getInstance().getUserController().update(user.select());
}
+
+ /**
+ * 通过邮箱获取用户名数组
+ *
+ * @param email 邮箱
+ * @return 用户名数组
+ * @throws Exception 如果邮箱不存在则抛出此异常
+ */
+ public static List<String> getUserNamesFromEmail(String email) throws Exception {
+ return UserService.getInstance().getUserNamesFromEmail(email);
+ }
}
From a6e44bee46feb02c1909309aa1af3daa94a81e35 Mon Sep 17 00:00:00 2001
From: Peng <Peng@fanruan.com>
Date: Fri, 27 Sep 2019 23:04:09 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=BA=86doclint=E7=9B=B8?=
=?UTF-8?q?=E5=85=B3=E7=9A=84=E9=82=A3=E4=B8=AA=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 80cc069..099c654 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,7 +162,6 @@
<configuration>
<reportOutputDirectory>target</reportOutputDirectory>
<destDir>javadocs</destDir>
- <additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
</plugins>