Index: .idea/artifacts/web_war_exploded.xml
===================================================================
diff -u -r2330ab7e5451576b7edf076ca2c0fcb4ffdd5bdc -rdfba2018c887cdc75e11cd4f8021fa4657a3e339
--- .idea/artifacts/web_war_exploded.xml (.../web_war_exploded.xml) (revision 2330ab7e5451576b7edf076ca2c0fcb4ffdd5bdc)
+++ .idea/artifacts/web_war_exploded.xml (.../web_war_exploded.xml) (revision dfba2018c887cdc75e11cd4f8021fa4657a3e339)
@@ -7,7 +7,7 @@
-
+
@@ -139,15 +139,15 @@
-
-
+
+
-
-
-
+
+
+
FishEye: Tag dfba2018c887cdc75e11cd4f8021fa4657a3e339 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_apache_struts_struts2_core_2_3_32.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag dfba2018c887cdc75e11cd4f8021fa4657a3e339 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_apache_struts_struts2_dojo_plugin_2_3_32.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag dfba2018c887cdc75e11cd4f8021fa4657a3e339 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_apache_struts_struts2_json_plugin_2_3_32.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag dfba2018c887cdc75e11cd4f8021fa4657a3e339 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_apache_struts_struts2_spring_plugin_2_3_32.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag dfba2018c887cdc75e11cd4f8021fa4657a3e339 refers to a dead (removed) revision in file `.idea/libraries/Maven__org_apache_struts_xwork_xwork_core_2_3_32.xml'.
FishEye: No comparison available. Pass `N' to diff?
Index: .idea/sonarIssues.xml
===================================================================
diff -u -rf18935f8e59fb128e0c44053d72c4367332932f2 -rdfba2018c887cdc75e11cd4f8021fa4657a3e339
--- .idea/sonarIssues.xml (.../sonarIssues.xml) (revision f18935f8e59fb128e0c44053d72c4367332932f2)
+++ .idea/sonarIssues.xml (.../sonarIssues.xml) (revision dfba2018c887cdc75e11cd4f8021fa4657a3e339)
@@ -888,6 +888,11 @@
+
+
+
+
+
@@ -1948,6 +1953,11 @@
+
+
+
+
+
@@ -2028,6 +2038,11 @@
+
+
+
+
+
Index: standard/pom.xml
===================================================================
diff -u -r7e27c3dbf0efc39687b2e29939b26f6bf3cd1a99 -rdfba2018c887cdc75e11cd4f8021fa4657a3e339
--- standard/pom.xml (.../pom.xml) (revision 7e27c3dbf0efc39687b2e29939b26f6bf3cd1a99)
+++ standard/pom.xml (.../pom.xml) (revision dfba2018c887cdc75e11cd4f8021fa4657a3e339)
@@ -285,6 +285,16 @@
dashboard-maven-plugin
1.0.0-beta-1
+
+ com.soebes.maven.plugins.dmg
+ doxygen-maven-plugin
+ 1.0.1
+
+ false
+ false
+ This is a www.313.co.kr Project
+
+
Index: standard/project/web/src/main/java/egovframework/api/rivalWar/directChat/controller/AdminDirectChatController.java
===================================================================
diff -u
--- standard/project/web/src/main/java/egovframework/api/rivalWar/directChat/controller/AdminDirectChatController.java (revision 0)
+++ standard/project/web/src/main/java/egovframework/api/rivalWar/directChat/controller/AdminDirectChatController.java (revision dfba2018c887cdc75e11cd4f8021fa4657a3e339)
@@ -0,0 +1,7 @@
+package egovframework.api.rivalWar.directChat.controller;
+
+/**
+ * Created by Administrator on 2017-09-24.
+ */
+public class AdminDirectChatController {
+}
Index: standard/project/web/src/main/java/egovframework/api/rivalWar/directChat/controller/AnonymousDirectChatController.java
===================================================================
diff -u
--- standard/project/web/src/main/java/egovframework/api/rivalWar/directChat/controller/AnonymousDirectChatController.java (revision 0)
+++ standard/project/web/src/main/java/egovframework/api/rivalWar/directChat/controller/AnonymousDirectChatController.java (revision dfba2018c887cdc75e11cd4f8021fa4657a3e339)
@@ -0,0 +1,7 @@
+package egovframework.api.rivalWar.directChat.controller;
+
+/**
+ * Created by Administrator on 2017-09-24.
+ */
+public class AnonymousDirectChatController {
+}
Index: standard/project/web/src/main/java/egovframework/api/rivalWar/directChat/controller/UserDirectChatController.java
===================================================================
diff -u
--- standard/project/web/src/main/java/egovframework/api/rivalWar/directChat/controller/UserDirectChatController.java (revision 0)
+++ standard/project/web/src/main/java/egovframework/api/rivalWar/directChat/controller/UserDirectChatController.java (revision dfba2018c887cdc75e11cd4f8021fa4657a3e339)
@@ -0,0 +1,7 @@
+package egovframework.api.rivalWar.directChat.controller;
+
+/**
+ * Created by Administrator on 2017-09-24.
+ */
+public class UserDirectChatController {
+}
Index: standard/project/web/src/main/java/egovframework/api/rivalWar/directChat/vo/DirectChatDTO.java
===================================================================
diff -u -r395c2562d2dfd7900c4e263f8ddb5938785405ab -rdfba2018c887cdc75e11cd4f8021fa4657a3e339
--- standard/project/web/src/main/java/egovframework/api/rivalWar/directChat/vo/DirectChatDTO.java (.../DirectChatDTO.java) (revision 395c2562d2dfd7900c4e263f8ddb5938785405ab)
+++ standard/project/web/src/main/java/egovframework/api/rivalWar/directChat/vo/DirectChatDTO.java (.../DirectChatDTO.java) (revision dfba2018c887cdc75e11cd4f8021fa4657a3e339)
@@ -10,12 +10,12 @@
import java.io.Serializable;
@Entity
-@Table(name = "T_JSTREE_DIRECTCHAT")
+@Table(name = "T_JSTREE_DIRECT_CHAT")
@SelectBeforeUpdate(value = true)
@DynamicInsert(value = true)
@DynamicUpdate(value = true)
@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
-@SequenceGenerator(name = "JsTreeSequence", sequenceName = "S_JSTREE_DIRECTCHAT", allocationSize = 1)
+@SequenceGenerator(name = "JsTreeSequence", sequenceName = "S_JSTREE_DIRECT_CHAT", allocationSize = 1)
public class DirectChatDTO extends JsTreeHibernateSearchDTO implements Serializable {
private static final long serialVersionUID = -2826589626523340365L;
@@ -49,65 +49,18 @@
this.copyBooleanValue = copyBooleanValue;
}
- private Long c_userid;
- private String c_time;
- private Long c_likecount;
- private Long c_hatecount;
- private Long c_camp;
+ private Long user_id; //닉네임
+ private String c_time; //글쓴시간
+ private Long c_camp; //글쓴이 선택 진영
+ private String c_contents; // 글내용
+ //글해시태그
+ private Long c_likecount; //좋아요 카운트
+ private Long c_hatecount; //싫어요 카운트
- @Column(name = "C_USERID")
- public Long getC_userid() {
- return c_userid;
- }
- public void setC_userid(Long c_userid) {
- this.c_userid = c_userid;
- }
-
- @Column(name = "C_TIME")
- public String getC_time() {
- return c_time;
- }
-
- public void setC_time(String c_time) {
- this.c_time = c_time;
- }
-
- @Column(name = "C_LIKECOUNT")
- public Long getC_likecount() {
- return c_likecount;
- }
-
- public void setC_likecount(Long c_likecount) {
- this.c_likecount = c_likecount;
- }
-
- @Column(name = "C_HATECOUNT")
- public Long getC_hatecount() {
- return c_hatecount;
- }
-
- public void setC_hatecount(Long c_hatecount) {
- this.c_hatecount = c_hatecount;
- }
-
- @Column(name = "C_CAMP")
- public Long getC_camp() {
- return c_camp;
- }
-
- public void setC_camp(Long c_camp) {
- this.c_camp = c_camp;
- }
-
@Override
public void setFieldFromNewInstance(T paramInstance) {
if (paramInstance instanceof DirectChatDTO) {
- this.setC_userid(this.getC_userid());
- this.setC_time(this.getC_time());
- this.setC_likecount(this.getC_likecount());
- this.setC_hatecount(this.getC_hatecount());
- this.setC_camp(this.getC_camp());
}
}
Index: standard/project/web/src/main/java/egovframework/api/rivalWar/menu/controller/AnonymousMenuController.java
===================================================================
diff -u -r1e73c7a1c1afa311228cf65bd1dd2f8bb91b8f3d -rdfba2018c887cdc75e11cd4f8021fa4657a3e339
--- standard/project/web/src/main/java/egovframework/api/rivalWar/menu/controller/AnonymousMenuController.java (.../AnonymousMenuController.java) (revision 1e73c7a1c1afa311228cf65bd1dd2f8bb91b8f3d)
+++ standard/project/web/src/main/java/egovframework/api/rivalWar/menu/controller/AnonymousMenuController.java (.../AnonymousMenuController.java) (revision dfba2018c887cdc75e11cd4f8021fa4657a3e339)
@@ -205,6 +205,8 @@
return modelAndView;
}else{
ModelAndView modelAndView = new ModelAndView("jsonView");
+
+
modelAndView.addObject("result", "none exist childnode");
return modelAndView;
}
Index: standard/project/web/web.iml
===================================================================
diff -u -ra519d8785f296ca88790a4b8450812ef80e272c9 -rdfba2018c887cdc75e11cd4f8021fa4657a3e339
--- standard/project/web/web.iml (.../web.iml) (revision a519d8785f296ca88790a4b8450812ef80e272c9)
+++ standard/project/web/web.iml (.../web.iml) (revision dfba2018c887cdc75e11cd4f8021fa4657a3e339)
@@ -219,15 +219,15 @@
-
-
+
+
-
-
-
+
+
+