記事の更新履歴 #10

データのエクスポート #31 データの保存先を変更 #32 markdownのCSS #34
support-project · May 7, 2015 · 00e5910 · 00e5910
1 parent adc1d27
commit 00e5910
Show file tree

Hide file tree

Showing 84 changed files with 3,014 additions and 342 deletions.
diff --git a/document/database/knowledge.a5er b/document/database/knowledge.a5er
@@ -46,22 +46,65 @@ SqlSeparator=0
 ShowTag=1
 ShowCommonAttributes=0
 
+[Relation]
+Entity1=KNOWLEDGES
+Entity2=KNOWLEDGE_HISTORIES
+RelationType1=2
+RelationType2=3
+Fields1=KNOWLEDGE_ID
+Fields2=KNOWLEDGE_ID
+Cardinarity1=
+Cardinarity2=
+Position="MAIN",1,1504,5355,8088,R,R
+Dependence=1
+Caption=
+PName=
+LineMode=1
+Bar1=150
+Bar2=536
+Bar3=809
+TermPos1=R
+TermPos2=R
+
+[Entity]
+PName=KNOWLEDGE_HISTORIES
+LName=ナレッジ更新履歴
+Comment=
+TableOption=
+Page=MAIN
+Left=710
+Top=1570
+Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",0,"","",$FFFFFFFF,""
+Field="履歴番号","HISTORY_NO","@INT","NOT NULL",1,"","",$FFFFFFFF,""
+Field="タイトル","TITLE","@VARCHAR(1024)","NOT NULL",,"","",$FFFFFFFF,""
+Field="内容","CONTENT","text",,,"","",$FFFFFFFF,""
+Field="公開区分","PUBLIC_FLAG","@INT",,,"","",$FFFFFFFF,""
+Field="タグID一覧","TAG_IDS","@VARCHAR(1024)",,,"","",$FFFFFFFF,""
+Field="タグ名称一覧","TAG_NAMES","text",,,"","",$FFFFFFFF,""
+Field="いいね件数","LIKE_COUNT","bigint",,,"","",$FFFFFFFF,""
+Field="コメント件数","COMMENT_COUNT","@INT",,,"","",$FFFFFFFF,""
+EffectMode=None
+Color=$000000
+BkColor=$FFFFFF
+ModifiedDateTime=20150507141708
+Position="MAIN",710,1570
+
 [Entity]
 PName=NOTIFY_QUEUES
 LName=通知待ちキュー
 Comment=
 TableOption=
 Page=MAIN
-Left=120
-Top=1700
+Left=80
+Top=1460
 Field="HASH","HASH","@VARCHAR(32)","NOT NULL",0,"","",$FFFFFFFF,""
 Field="種類","TYPE","@INT","NOT NULL",,"","",$FFFFFFFF,""
 Field="通知する種類のID","ID","bigint","NOT NULL",,"","",$FFFFFFFF,""
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150331055404
-Position="MAIN",120,1700
+Position="MAIN",80,1460
 
 [Relation]
 Entity1=USERS
@@ -117,14 +160,14 @@ Fields1=COMMENT_NO
 Fields2=COMMENT_NO
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,8317,1335,4689,R,R
+Position="MAIN",0,7469,4072,5955,R,R
 Dependence=0
 Caption=
 PName=
 LineMode=0
-Bar1=832
-Bar2=134
-Bar3=469
+Bar1=747
+Bar2=407
+Bar3=596
 TermPos1=R
 TermPos2=R
 
@@ -196,16 +239,16 @@ LName=いいね
 Comment=
 TableOption=
 Page=MAIN
-Left=580
-Top=1470
+Left=570
+Top=1350
 Field="NO","NO","BIGSERIAL","NOT NULL",0,"","",$FFFFFFFF,""
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",,"","",$FFFFFFFF,""
 Index=IDX_LIKES_KNOWLEDGE_ID=0,KNOWLEDGE_ID
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150416233511
-Position="MAIN",580,1470
+Position="MAIN",570,1350
 
 [Relation]
 Entity1=KNOWLEDGES
@@ -216,14 +259,14 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,8619,2544,1724,R,R
+Position="MAIN",0,8619,5745,1724,R,R
 Dependence=1
 Caption=
 PName=
 ModifiedDateTime=20141222155941
 LineMode=0
 Bar1=862
-Bar2=254
+Bar2=574
 Bar3=172
 TermPos1=R
 TermPos2=R
@@ -234,17 +277,17 @@ LName=コメント
 Comment=
 TableOption=
 Page=MAIN
-Left=1890
-Top=1540
+Left=1990
+Top=1620
 Field="コメント番号","COMMENT_NO","BIGSERIAL","NOT NULL",0,"","",$FFFFFFFF,""
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",,"","",$FFFFFFFF,""
 Field="コメント","COMMENT","text",,,"","",$FFFFFFFF,""
 Index=IDX_COMMENTS_KNOWLEDGE_ID=0,KNOWLEDGE_ID
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
-ModifiedDateTime=20150416233710
-Position="MAIN",1890,1540
+ModifiedDateTime=20150506050206
+Position="MAIN",1990,1620
 
 [Relation]
 Entity1=KNOWLEDGES
@@ -255,13 +298,13 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,7100,4465,3064,R,R
+Position="MAIN",0,7100,6784,3064,R,R
 Dependence=0
 Caption=
 PName=
 LineMode=0
 Bar1=710
-Bar2=446
+Bar2=678
 Bar3=306
 TermPos1=R
 TermPos2=R
@@ -272,8 +315,8 @@ LName=投票
 Comment=
 TableOption=
 Page=MAIN
-Left=1890
-Top=1390
+Left=1980
+Top=1380
 Field="VOTE_NO","VOTE_NO","BIGSERIAL","NOT NULL",0,"","",$FFFFFFFF,""
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",,"","",$FFFFFFFF,""
 Field="投票区分","VOTE_KIND","@INT","NOT NULL",,"","",$FFFFFFFF,""
@@ -282,7 +325,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150416233659
-Position="MAIN",1890,1390,435,89
+Position="MAIN",1980,1380,435,89
 
 [Relation]
 Entity1=KNOWLEDGES
@@ -332,14 +375,14 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,5645,5725,3590,R,R
+Position="MAIN",0,5645,5725,5124,R,R
 Dependence=1
 Caption=
 PName=
 LineMode=0
 Bar1=564
 Bar2=572
-Bar3=359
+Bar3=512
 TermPos1=R
 TermPos2=R
 
@@ -349,7 +392,7 @@ LName=ストックしたナレッジ
 Comment=
 TableOption=
 Page=MAIN
-Left=1890
+Left=1940
 Top=1240
 Field="USER_ID","USER_ID","@INT","NOT NULL",0,"","",$FFFFFFFF,""
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",1,"","",$FFFFFFFF,""
@@ -358,7 +401,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20141222154849
-Position="MAIN",1890,1240
+Position="MAIN",1940,1240
 
 [Relation]
 Entity1=KNOWLEDGES
@@ -479,15 +522,15 @@ LName=ナレッジが持つタグ
 Comment=
 TableOption=
 Page=MAIN
-Left=580
-Top=1310
+Left=570
+Top=1240
 Field="ナレッジID","KNOWLEDGE_ID","bigint","NOT NULL",0,"","",$FFFFFFFF,""
 Field="タグ_ID","TAG_ID","@INT","NOT NULL",1,"","",$FFFFFFFF,""
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20141222154737
-Position="MAIN",580,1310
+Position="MAIN",570,1240
 
 [Entity]
 PName=TAGS
@@ -496,14 +539,14 @@ Comment=
 TableOption=
 Page=MAIN
 Left=70
-Top=1310
+Top=1240
 Field="タグ_ID","TAG_ID","SERIAL","NOT NULL",0,"","",$FFFFFFFF,""
 Field="タグ名称","TAG_NAME","@VARCHAR(128)","NOT NULL",,"","",$FFFFFFFF,""
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150416233544
-Position="MAIN",70,1310
+Position="MAIN",70,1240
 
 [Relation]
 Entity1=KNOWLEDGES
@@ -514,15 +557,15 @@ Fields1=KNOWLEDGE_ID
 Fields2=KNOWLEDGE_ID
 Cardinarity1=
 Cardinarity2=
-Position="MAIN",0,4350,5662,4751,R,R
+Position="MAIN",0,7158,5662,5114,R,R
 Dependence=1
 Caption=
 PName=
 ModifiedDateTime=20141222154815
 LineMode=0
-Bar1=435
+Bar1=716
 Bar2=566
-Bar3=475
+Bar3=511
 TermPos1=R
 TermPos2=R
 
@@ -532,8 +575,8 @@ LName=添付ファイル
 Comment=
 TableOption=
 Page=MAIN
-Left=1140
-Top=1520
+Left=1280
+Top=1590
 Field="添付ファイル番号","FILE_NO","BIGSERIAL","NOT NULL",0,"","",$FFFFFFFF,""
 Field="ナレッジID","KNOWLEDGE_ID","bigint",,,"","",$FFFFFFFF,""
 Field="コメント番号","COMMENT_NO","bigint",,,"","",$FFFFFFFF,""
@@ -546,7 +589,7 @@ EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
 ModifiedDateTime=20150416234328
-Position="MAIN",1140,1520
+Position="MAIN",1280,1590
 
 [Entity]
 PName=KNOWLEDGES
@@ -567,7 +610,7 @@ Field="コメント件数","COMMENT_COUNT","@INT",,,"","",$FFFFFFFF,""
 EffectMode=None
 Color=$000000
 BkColor=$FFFFFF
-ModifiedDateTime=20150416233526
+ModifiedDateTime=20150506050220
 Position="MAIN",1160,1150
 
 [Comment]

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>org.support-project</groupId>
 	<artifactId>knowledge</artifactId>
 	<packaging>war</packaging>
-	<version>0.5.0</version>
+	<version>0.5.1-SNAPSHOT</version>
 	<name>webapp for knowledge</name>
 	<url>https://support-project.org/</url>
 
@@ -16,7 +16,7 @@
 		<dependency>
 			<groupId>org.support-project</groupId>
 			<artifactId>web</artifactId>
-			<version>0.5.0</version>
+			<version>0.5.1-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
@@ -86,13 +86,19 @@
 			<artifactId>mail</artifactId>
 			<version>1.4.7</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
 			<version>9.3-1103-jdbc41</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.googlecode.java-diff-utils</groupId>
+			<artifactId>diffutils</artifactId>
+			<version>1.2.1</version>
+		</dependency>
+
 	</dependencies>
 
 	<repositories>

diff --git a/src/main/java/org/support/project/knowledge/bat/AbstractBat.java b/src/main/java/org/support/project/knowledge/bat/AbstractBat.java
@@ -10,5 +10,8 @@ public void dbInit() {
 		DBConnenctionLogic.get().connectCustomConnection();
 	}
 
-
+	protected void send(String msg) {
+		System.out.println("[SEND]" + msg);
+	}
+
 }