From b7d8bfbe09547aa2df1366c6ff8867cea5d64fab Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 05 1월 2022 11:08:39 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/package-info.java | 4 ++
src/main/java/kr/wisestone/owl/web/controller/ApiController.java | 10 +++++
src/main/java/kr/wisestone/owl/constant/MsgConstants.java | 61 ++++++++++++++++++++++++------
pom.xml | 22 ++++++++--
4 files changed, 80 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index 569ef29..94c22f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
<!-- Logging -->
<slf4j.version>1.7.28</slf4j.version>
- <log4j.version>2.12.1</log4j.version>
+ <log4j.version>2.17.1</log4j.version>
<!-- Spring Session Redis -->
<spring.session.version>2.1.8.RELEASE</spring.session.version>
@@ -67,6 +67,9 @@
<!-- Elastic Search -->
<elastic.search.version>7.3.0</elastic.search.version>
+
+ <!-- jsoup -->
+ <jsoup.version>1.8.3</jsoup.version>
<!-- Util -->
<jackson.version>2.9.9</jackson.version>
@@ -151,6 +154,11 @@
<version>${java.mail.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.interceptor</groupId>
+ <artifactId>javax.interceptor-api</artifactId>
+ <version>1.2</version>
+ </dependency>
<!-- Excel import -->
<dependency>
<groupId>org.apache.poi</groupId>
@@ -255,6 +263,14 @@
<artifactId>commons-validator</artifactId>
<version>${common.validator.version}</version>
</dependency>
+
+ <!-- jsoup -->
+ <dependency>
+ <groupId>org.jsoup</groupId>
+ <artifactId>jsoup</artifactId>
+ <version>${jsoup.version}</version>
+ </dependency>
+
<!-- spring -->
<dependency>
@@ -545,10 +561,6 @@
<url>https://maven.java.net/content/repositories/public/</url>
</repository>
- <repository>
- <id>JBoss repository</id>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
</repositories>
<build>
diff --git a/src/main/java/kr/wisestone/owl/constant/MsgConstants.java b/src/main/java/kr/wisestone/owl/constant/MsgConstants.java
index e581672..b2f6bc2 100644
--- a/src/main/java/kr/wisestone/owl/constant/MsgConstants.java
+++ b/src/main/java/kr/wisestone/owl/constant/MsgConstants.java
@@ -1,6 +1,7 @@
package kr.wisestone.owl.constant;
/**
+ * exception �슜 硫붿꽭吏� �겢�옒�뒪
* Created by jeong on 2017-08-02.
*/
public class MsgConstants {
@@ -242,16 +243,52 @@
public static final String EMAIL_TEMPLATE_NOT_EXIST = "EMAIL_TEMPLATE_NOT_EXIST"; // �씠硫붿씪 �뀥�뵆由우쓣 李얠쓣�닔 �뾾�뒿�땲�떎.
- public static final String API_PARAMETER_ISSUE_TYPE_ERROR = "API_PARAMETER_ISSUE_TYPE_ERROR"; // api �뙆�씪誘명꽣 �삤瑜�(�씠�뒋���엯)
- public static final String API_PARAMETER_PROJECT_ERROR = "API_PARAMETER_PROJECT_ERROR"; // api �뙆�씪誘명꽣 �삤瑜�(�봽濡쒖젥�듃)
- public static final String API_PARAMETER_ERROR = "API_PARAMETER_ERROR"; // api �뙆�씪誘명꽣 �삤瑜�
- public static final String API_USER_ERROR = "API_USER_ERROR"; // api �궗�슜�옄 �삤瑜�
- public static final String API_OVERLAP_ERROR = "API_OVERLAP_ERROR"; // API 以묐났�맂 �긽�쐞 �씠�뒋媛� �뿬�윭媛쒖씪 寃쎌슦
- public static final String API_OVERLAP_SETTING_NOT_EXIST = "API_OVERLAP_SETTING_NOT_EXIST"; // API 以묐났�맂 �꽕�젙�씠 �븞�릺�뼱 �엳�쓣 寃쎌슦
- public static final String API_ISSUE_NOT_EXIST = "API_ISSUE_NOT_EXIST"; // �닔�젙�븷 �씠�뒋瑜� 李얠쓣�닔 �뾾�뒿�땲�떎.
- public static final String API_COMPLETE_ISSUE_STATUS_NOT_EXIST = "API_COMPLETE_ISSUE_STATUS_NOT_EXIST"; // �옄�룞 醫낅즺 泥섎━�븷 �긽�깭媛� �꽕�젙�릺吏� �븡�븯�뒿�땲�떎.
- public static final String API_ISSUE_STATUS_NOT_EXIST = "API_ISSUE_STATUS_NOT_EXIST"; // �씠�뒋 �긽�깭瑜� 李얠쓣�닔 �뾾�뒿�땲�떎
- public static final String API_ISSUE_STATUS_IS_NULL = "API_ISSUE_STATUS_IS_NULL"; // �씠�뒋 �긽�깭 媛믪씠 �뾾�뒿�땲�떎.
- public static final String API_CUSTOM_FIELD_NOT_EXIST = "API_CUSTOM_FIELD_NOT_EXIST"; // �궗�슜�옄 �젙�쓽 �븘�뱶瑜� 議댁옱�븯吏� �븡�뒿�땲�떎.
- public static final String API_ISSUE_STATUS_NOT_IN_WORKFLOW = "API_ISSUE_STATUS_NOT_IN_WORKFLOW"; // �씠�뒋 �긽�깭媛� �썙�겕�뵆濡쒖슦�뿉 �룷�븿�릺�뼱 �엳吏� �븡�뒿�땲�떎
+ /**
+ * api �뙆�씪誘명꽣 �삤瑜�(�씠�뒋���엯)
+ */
+ public static final String API_PARAMETER_ISSUE_TYPE_ERROR = "API_PARAMETER_ISSUE_TYPE_ERROR";
+ /**
+ * api �뙆�씪誘명꽣 �삤瑜�(�봽濡쒖젥�듃)
+ */
+ public static final String API_PARAMETER_PROJECT_ERROR = "API_PARAMETER_PROJECT_ERROR";
+ /**
+ * api �뙆�씪誘명꽣 �삤瑜�
+ */
+ public static final String API_PARAMETER_ERROR = "API_PARAMETER_ERROR";
+ /**
+ * api �궗�슜�옄 �삤瑜�
+ */
+ public static final String API_USER_ERROR = "API_USER_ERROR";
+ /**
+ * API 以묐났�맂 �긽�쐞 �씠�뒋媛� �뿬�윭媛쒖씪 寃쎌슦
+ */
+ public static final String API_OVERLAP_ERROR = "API_OVERLAP_ERROR";
+ /**
+ * API 以묐났�맂 �꽕�젙�씠 �븞�릺�뼱 �엳�쓣 寃쎌슦
+ */
+ public static final String API_OVERLAP_SETTING_NOT_EXIST = "API_OVERLAP_SETTING_NOT_EXIST";
+ /**
+ * �닔�젙�븷 �씠�뒋瑜� 李얠쓣�닔 �뾾�뒿�땲�떎.
+ */
+ public static final String API_ISSUE_NOT_EXIST = "API_ISSUE_NOT_EXIST";
+ /**
+ * �옄�룞 醫낅즺 泥섎━�븷 �긽�깭媛� �꽕�젙�릺吏� �븡�븯�뒿�땲�떎.
+ */
+ public static final String API_COMPLETE_ISSUE_STATUS_NOT_EXIST = "API_COMPLETE_ISSUE_STATUS_NOT_EXIST";
+ /**
+ * �씠�뒋 �긽�깭瑜� 李얠쓣�닔 �뾾�뒿�땲�떎
+ */
+ public static final String API_ISSUE_STATUS_NOT_EXIST = "API_ISSUE_STATUS_NOT_EXIST";
+ /**
+ * �씠�뒋 �긽�깭 媛믪씠 �뾾�뒿�땲�떎.
+ */
+ public static final String API_ISSUE_STATUS_IS_NULL = "API_ISSUE_STATUS_IS_NULL";
+ /**
+ * �궗�슜�옄 �젙�쓽 �븘�뱶瑜� 議댁옱�븯吏� �븡�뒿�땲�떎.
+ */
+ public static final String API_CUSTOM_FIELD_NOT_EXIST = "API_CUSTOM_FIELD_NOT_EXIST";
+ /**
+ * �씠�뒋 �긽�깭媛� �썙�겕�뵆濡쒖슦�뿉 �룷�븿�릺�뼱 �엳吏� �븡�뒿�땲�떎
+ */
+ public static final String API_ISSUE_STATUS_NOT_IN_WORKFLOW = "API_ISSUE_STATUS_NOT_IN_WORKFLOW";
}
diff --git a/src/main/java/kr/wisestone/owl/web/controller/ApiController.java b/src/main/java/kr/wisestone/owl/web/controller/ApiController.java
index 5c13abc..fb90cfd 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/ApiController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/ApiController.java
@@ -18,12 +18,22 @@
import java.util.List;
import java.util.Map;
+/**
+ * OWL-API 而⑦듃濡ㅻ윭
+ */
@Controller
public class ApiController extends BaseController {
@Autowired
private IssueService issueService;
+
+ /**
+ * @param request multipart/form-data 濡� �슂泥��빐�빞 �븿
+ * @return Json �쑝濡� 寃곌낵媛� �쟾�넚
+ * @throws OwlRuntimeException 二쇰줈�뙆�씪誘명꽣 �삤瑜� 泥댄겕�떆 諛쒖깮
+ * @throws CloneNotSupportedException 媛앹껜 蹂듭궗�븷 �븣 諛쒖깮
+ */
@RequestMapping(value = "api/issue", method = RequestMethod.POST)
public
@ResponseBody
diff --git a/src/main/java/package-info.java b/src/main/java/package-info.java
new file mode 100644
index 0000000..dbb8cd6
--- /dev/null
+++ b/src/main/java/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * OWL-ITS
+ */
+package kr.wisestone.owl;
\ No newline at end of file
--
Gitblit v1.8.0